diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7106ce44..6f8fe1d3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -263,9 +263,9 @@ jobs: - cli - web-app - scripts - - backend-roundtrip - platform-roundtrip - platform-xtest + # - backend-roundtrip runs-on: ubuntu-latest timeout-minutes: 5 # To publish from a release or feature branch, remove the ref == condition below diff --git a/lib/tdf3/src/models/key-access.ts b/lib/tdf3/src/models/key-access.ts index 27e9282c..951c7ddf 100644 --- a/lib/tdf3/src/models/key-access.ts +++ b/lib/tdf3/src/models/key-access.ts @@ -43,7 +43,10 @@ export class Wrapped { protocol: 'kas', wrappedKey: base64.encode(wrappedKeyBinary.asString()), encryptedMetadata: base64.encode(encryptedMetadataStr), - policyBinding: base64.encode(policyBinding), + policyBinding: { + alg: 'HS256', + hash: base64.encode(policyBinding), + }, }; if (this.kid) { this.keyAccessObject.kid = this.kid; @@ -91,7 +94,10 @@ export class Remote { protocol: 'kas', wrappedKey: this.wrappedKey, encryptedMetadata: base64.encode(encryptedMetadataStr), - policyBinding: base64.encode(policyBinding), + policyBinding: { + alg: 'HS256', + hash: base64.encode(policyBinding), + }, }; if (this.kid) { this.keyAccessObject.kid = this.kid; @@ -108,6 +114,9 @@ export type KeyAccessObject = { kid?: string; protocol: 'kas'; wrappedKey?: string; - policyBinding?: string; + policyBinding?: { + alg: string; + hash: string; + }; encryptedMetadata?: string; }; diff --git a/lib/tests/mocks/client/default_manifest.json b/lib/tests/mocks/client/default_manifest.json index 067f0480..7c42a01c 100644 --- a/lib/tests/mocks/client/default_manifest.json +++ b/lib/tests/mocks/client/default_manifest.json @@ -13,7 +13,10 @@ "url": "http://kas.gsk.com:5000", "protocol": "kas", "wrappedKey": "OqnOETpwyGE3PVpUpwwWZoJTNW24UMhnXIif0mSnqLVCUPKAAhrjeue11uAXWpb9sD7ZDsmrc9ylmnSKP9vWel8ST68tv6PeVO+CPYUND7cqG2NhUHCLv5Ouys3Klurykvy8/O3cCLDYl6RDISosxFKqnd7LYD7VnxsYqUns4AW5/odXJrwIhNO3szZV0JgoBXs+U9bul4tSGNxmYuPOj0RE0HEX5yF5lWlt2vHNCqPlmSBV6+jePf7tOBBsqDq35GxCSHhFZhqCgA3MvnBLmKzVPArtJ1lqg3WUdnWV+o6BUzhDpOIyXzeKn4cK2mCxOXGMP2ck2C1a0sECyB82uw==", - "policyBinding": "BzmgoIxZzMmIF42qzbdD4Rw30GtdaRSQL2Xlfms1OPs=", + "policyBinding": { + "alg": "HS256", + "hash": "BzmgoIxZzMmIF42qzbdD4Rw30GtdaRSQL2Xlfms1OPs=" + }, "encryptedMetadata": "ZoJTNW24UMhnXIif0mSnqLVCU=" } ], diff --git a/lib/tests/mocks/tdf/0.manifest.json b/lib/tests/mocks/tdf/0.manifest.json index 5740cb0c..80f1d9a0 100644 --- a/lib/tests/mocks/tdf/0.manifest.json +++ b/lib/tests/mocks/tdf/0.manifest.json @@ -11,7 +11,10 @@ "url": "http://127.0.0.1:4000", "protocol": "kas", "wrappedKey": "x8lk9Nxhx+zv+DVpCz89XLbMwbeeoNMhWIRO7CKdTNEWRWI9T+Ubkdvvi+SgrTJLQeEFBJspLQdombPI8Li1SVGD3pyfMNGXQ/FDoYIp2JHfyVKETfksU4q4gnNU3G63bTvCdQ41FeJJP26DIm63dKbF8BJQ/iSpXIPFalvMy/E9lR6kEv7ShKrwCKThFzynsg37ProbSmaYtTab+8J1/37oxm39PAUUfOOta9JA0mn8dz7f7a3nMVcXcyqrCTZSYbWKqhTowPeK2QiIfGJ1+K4F0V2UXMVuxIw6SEVbNL2hRkZ6+OSQd+kWMZTuneXtZeOHfBuOFRRzVzIEawagdA==", - "policyBinding": "fNPuURQu6ZpZk26TglgJxG1E7HiOynaFoyajj+8V1xg=" + "policyBinding": { + "alg": "HS256", + "hash": "fNPuURQu6ZpZk26TglgJxG1E7HiOynaFoyajj+8V1xg=" + } } ] ]