Commit 4be4a6dc authored by Dmitriy Rudko's avatar Dmitriy Rudko 💬 Committed by David Diederich
Browse files

Merge branch 'fix-gsa-challenge' into 'master'

GCP release/0.5 - fix GSA Challenge (GONRG-1796)

See merge request !67

(cherry picked from commit 8823f3f5)

ee2e2cd3 GONRG-1035 Docs update
79949d4c Merge branch 'feature/GONRG-1035-Fix-docs' into 'integration-master'
972e3bc9 GONRG-1059
dd0daf8f Merge branch 'feature/GONRG-1059_poms' into 'integration-master'
f2fcf0f2 GONRG-1069 Fix datastore exception resolving
3879a216 GONRG-1069 update README.md
a1a7218f Merge branch 'bugfix/GONRG-1069-fix-datastore-exception-resolving' into 'integration-master'
4eb722ba Merge branch 'master' into integration-master
c92aa926 Merge branch 'feature/GONRG-Update-from-community-master' into 'integration-master'
bc168792 GONRG-1110 Optionally encrypted credentials from file or content for...
d6b45581 Merge branch 'feature/GONRG-1110' into 'integration-master'
cbce3631 Merge branch 'integration-master' into 'master'
a67c6191 Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
becde17d Merge branch 'master' into 'integration-master'
ecbad659 Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
9b2765d1 Auto commit when pipeline succeeds
3219f737 Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
92f8b943 Auto commit when pipeline succeeds
b470f3de Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
3738127c Auto commit when pipeline succeeds
0962f151 Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
4248163f Auto commit when pipeline succeeds
556fea5a Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
b62de5c4 Auto commit when pipeline succeeds
e0fa2d72 Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
215a34e7 Auto commit when pipeline succeeds
f32149af Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
337f0df2 Auto commit when pipeline succeeds
0fe847be Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
012bec1f Auto commit when pipeline succeeds
b2616d01 GONRG-1370 Fixed Sonar Comments
2c8dcbe3 Merge branch 'feature/GONRG-1370_Fix_Sonar_Comments' into 'integration-master'
3348b8d4 Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
dffc9e4e Auto commit when pipeline succeeds
3579b1ee Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
ec330774 Auto commit when pipeline succeeds
32213d23 Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
b46c9d2f Auto commit when pipeline succeeds
cbcce545 Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
733519bb Auto commit when pipeline succeeds
6f37d0ed Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
161e6bb9 Auto commit when pipeline succeeds
ae06f57a Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
f570b03b Auto commit when pipeline succeeds
09b68bef Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
edb5373b Auto commit when pipeline succeeds
95f8abc0 Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
e7436b1d Auto commit when pipeline succeeds
58aff352 Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
bbfbad5b Auto commit when pipeline succeeds
0152edd2 Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
de6dbd6f Auto commit when pipeline succeeds
2e25b110 Update README.md
0657b104 Update README.md
33baebd2 Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
c73115e5 Auto commit when pipeline succeeds
7a5e03f7 Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
cbd8472a Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register
e6352753 Auto commit when pipeline succeeds
10cf56b4 Bugfix: GONRG-1796: Int tests for Notification service failed in DEV
1de0f699 Merge branch...
parent f6126e03
Pipeline #26280 failed with stages
in 2 minutes and 9 seconds
......@@ -188,9 +188,9 @@ Create king ring and key in the ***master project***
--purpose encryption
```
Add **Cloud KMS CryptoKey Encrypter/Decrypter** role to the **App Engine default service account** of the master project through IAM - Role tab
Add **Cloud KMS CryptoKey Encrypter/Decrypter** role to the **App Engine default service account** of the ***master project*** through IAM - Role tab
Add "Cloud KMS Encrypt/Decrypt" role to the "App Engine default service account" of ***master project***
Add **Cloud KMS Encrypt/Decrypt** role to the **App Engine default service account** of ***master project***
## Licence
Copyright © Google LLC
......
......@@ -44,7 +44,7 @@ public class GsaSubscriberListenerApi {
throw new ValidationException("Authorization signature validation Failed");
}
logger.info("Token verified and sending response");
return new ChallengeResponse(HashingUtil.hashString(crc, this.serviceConfig.getSubscriberSecret()));
return new ChallengeResponse(HashingUtil.hashString(crc, this.serviceConfig.getSubscriberPrivateKeyId()));
}
@PostMapping("/gsa-challenge/{count}")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment