-
Notifications
You must be signed in to change notification settings - Fork 17
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Enchanced TA validation + CLI auth in docker deployment #197
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,3 +36,5 @@ tags | |
|
|
||
| .ipynb_checkpoints | ||
|
|
||
| # generated by build-test-vector scripts | ||
| scheme/**/*Comid*.cbor | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,7 +57,7 @@ RUN go mod download &&\ | |
| go install google.golang.org/protobuf/cmd/[email protected] &&\ | ||
| go install google.golang.org/grpc/cmd/[email protected] &&\ | ||
| go install github.com/mitchellh/[email protected] &&\ | ||
| go install github.com/veraison/corim/cocli@latest &&\ | ||
| go install github.com/veraison/corim/cocli@eeb7bd48 &&\ | ||
| go install github.com/veraison/evcli/v2@latest &&\ | ||
| go install github.com/veraison/pocli@latest &&\ | ||
| go install github.com/go-delve/delve/cmd/dlv@latest | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| api_server: http://provisioning-service:${PROVISIONING_PORT}/endorsement-provisioning/v1/submit | ||
| auth: oauth2 | ||
| username: veraison-provisioner | ||
| password: veraison | ||
| client_id: veraison-client | ||
| client_secret: YifmabB4cVSPPtFLAmHfq7wKaEHQn10Z | ||
| token_url: http://keycloak-service:${KEYCLOAK_PORT}/realms/veraison/protocol/openid-connect/token | ||
| # vim: set ft=yaml: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,5 +38,5 @@ po-agent: | |
| auth: | ||
| backend: keycloak | ||
| host: keycloak-service | ||
| port: 11111 | ||
| port: ${KEYCLOAK_PORT} | ||
| # vim: set ft=yaml: | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| host: management-service | ||
| port: ${MANAGEMENT_PORT} | ||
| auth: oauth2 | ||
| username: veraison-provisioner | ||
| password: veraison | ||
| client_id: veraison-client | ||
| client_secret: YifmabB4cVSPPtFLAmHfq7wKaEHQn10Z | ||
| token_url: http://keycloak-service:${KEYCLOAK_PORT}/realms/veraison/protocol/openid-connect/token | ||
| # vim: set ft=yaml: |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| #!/bin/bash | ||
| set -e | ||
|
|
||
| TEMP_DIR=/tmp/veraison-end-to-end | ||
| SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) | ||
|
|
||
| mkdir -p $TEMP_DIR | ||
|
|
||
| for scheme in psa cca; do | ||
| cocli comid create --template ${SCRIPT_DIR}/comid-${scheme}-ta.json \ | ||
| --template ${SCRIPT_DIR}/comid-${scheme}-refval.json \ | ||
| --output-dir $TEMP_DIR | ||
| cocli corim create --template ${SCRIPT_DIR}/corim-${scheme}.json \ | ||
| --comid ${TEMP_DIR}/comid-${scheme}-refval.cbor \ | ||
| --comid ${TEMP_DIR}/comid-${scheme}-ta.cbor \ | ||
| --output ${SCRIPT_DIR}/../${scheme}-endorsements.cbor | ||
| done | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| { | ||
| "lang": "en-GB", | ||
| "tag-identity": { | ||
| "id": "43BBE37F-2E61-4B33-AED3-53CFF1428B16", | ||
| "version": 0 | ||
| }, | ||
| "entities": [ | ||
| { | ||
| "name": "ACME Ltd.", | ||
| "regid": "https://acme.example", | ||
| "roles": [ | ||
| "tagCreator", | ||
| "creator", | ||
| "maintainer" | ||
| ] | ||
| } | ||
| ], | ||
| "triples": { | ||
| "reference-values": [ | ||
| { | ||
| "environment": { | ||
| "class": { | ||
| "id": { | ||
| "type": "psa.impl-id", | ||
| "value": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" | ||
| }, | ||
| "vendor": "ACME", | ||
| "model": "RoadRunner" | ||
| } | ||
| }, | ||
| "measurements": [ | ||
| { | ||
| "key": { | ||
| "type": "psa.refval-id", | ||
| "value": { | ||
| "label": "BL", | ||
| "version": "3.4.2", | ||
| "signer-id": "BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=" | ||
| } | ||
| }, | ||
| "value": { | ||
| "digests": [ | ||
| "sha-256;BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "key": { | ||
| "type": "psa.refval-id", | ||
| "value": { | ||
| "label": "M1", | ||
| "version": "1.2.0", | ||
| "signer-id": "BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=" | ||
| } | ||
| }, | ||
| "value": { | ||
| "digests": [ | ||
| "sha-256;CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "key": { | ||
| "type": "psa.refval-id", | ||
| "value": { | ||
| "label": "M2", | ||
| "version": "1.2.3", | ||
| "signer-id": "BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=" | ||
| } | ||
| }, | ||
| "value": { | ||
| "digests": [ | ||
| "sha-256;DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "key": { | ||
| "type": "psa.refval-id", | ||
| "value": { | ||
| "label": "M3", | ||
| "version": "1.0.0", | ||
| "signer-id": "BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=" | ||
| } | ||
| }, | ||
| "value": { | ||
| "digests": [ | ||
| "sha-256;EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "key": { | ||
| "type": "cca.platform-config-id", | ||
| "value": "cfg v1.0.0" | ||
| }, | ||
| "value": { | ||
| "raw-value": { | ||
| "type": "bytes", | ||
| "value": "cmF3dmFsdWUKcmF3dmFsdWUK" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| { | ||
| "lang": "en-GB", | ||
| "tag-identity": { | ||
| "id": "366D0A0A-5988-45ED-8488-2F2A544F6242", | ||
| "version": 0 | ||
| }, | ||
| "entities": [ | ||
| { | ||
| "name": "ACME Ltd.", | ||
| "regid": "https://acme.example", | ||
| "roles": [ | ||
| "tagCreator", | ||
| "creator", | ||
| "maintainer" | ||
| ] | ||
| } | ||
| ], | ||
| "triples": { | ||
| "attester-verification-keys": [ | ||
| { | ||
| "environment": { | ||
| "class": { | ||
| "id": { | ||
| "type": "psa.impl-id", | ||
| "value": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" | ||
| }, | ||
| "vendor": "ACME", | ||
| "model": "RoadRunner" | ||
| }, | ||
| "instance": { | ||
| "type": "ueid", | ||
| "value": "AQICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC" | ||
| } | ||
| }, | ||
| "verification-keys": [ | ||
| { | ||
| "type": "pkix-base64-key", | ||
| "value": "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEMKBCTNIcKUSDii11ySs3526iDZ8A\niTo7Tu6KPAqv7D7gS2XpJFbZiItSs3m9+9Ue6GnvHw/GW2ZZaVtszggXIw==\n-----END PUBLIC KEY-----" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| { | ||
| "lang": "en-GB", | ||
| "tag-identity": { | ||
| "id": "43BBE37F-2E61-4B33-AED3-53CFF1428B16", | ||
| "version": 0 | ||
| }, | ||
| "entities": [ | ||
| { | ||
| "name": "ACME Ltd.", | ||
| "regid": "https://acme.example", | ||
| "roles": [ | ||
| "tagCreator", | ||
| "creator", | ||
| "maintainer" | ||
| ] | ||
| } | ||
| ], | ||
| "triples": { | ||
| "reference-values": [ | ||
| { | ||
| "environment": { | ||
| "class": { | ||
| "id": { | ||
| "type": "psa.impl-id", | ||
| "value": "YWNtZS1pbXBsZW1lbnRhdGlvbi1pZC0wMDAwMDAwMDE=" | ||
| }, | ||
| "vendor": "ACME", | ||
| "model": "RoadRunner" | ||
| } | ||
| }, | ||
| "measurements": [ | ||
| { | ||
| "key": { | ||
| "type": "psa.refval-id", | ||
| "value": { | ||
| "label": "BL", | ||
| "version": "2.1.0", | ||
| "signer-id": "rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs=" | ||
| } | ||
| }, | ||
| "value": { | ||
| "digests": [ | ||
| "sha-256;h0KPxSKAPTEGXnvOPPA/5HUJZjHl4Hu9eg/eYMTPJcc=" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "key": { | ||
| "type": "psa.refval-id", | ||
| "value": { | ||
| "label": "PRoT", | ||
| "version": "1.3.5", | ||
| "signer-id": "rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs=" | ||
| } | ||
| }, | ||
| "value": { | ||
| "digests": [ | ||
| "sha-256;AmOCmYm2/ZVPcrqvL8ZLwuLwHWktTecphuqAj26ZgT8=" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "key": { | ||
| "type": "psa.refval-id", | ||
| "value": { | ||
| "label": "ARoT", | ||
| "version": "0.1.4", | ||
| "signer-id": "rLsRx+TaIXIFUjzkzhokWuGiOa48a/2eeHH35di66Gs=" | ||
| } | ||
| }, | ||
| "value": { | ||
| "digests": [ | ||
| "sha-256;o6XnFfDMV0pzw/m+u2vCTzL/1bZ7OHJEwskJ2neaFHg=" | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| { | ||
| "lang": "en-GB", | ||
| "tag-identity": { | ||
| "id": "366D0A0A-5988-45ED-8488-2F2A544F6242", | ||
| "version": 0 | ||
| }, | ||
| "entities": [ | ||
| { | ||
| "name": "ACME Ltd.", | ||
| "regid": "https://acme.example", | ||
| "roles": [ | ||
| "tagCreator", | ||
| "creator", | ||
| "maintainer" | ||
| ] | ||
| } | ||
| ], | ||
| "triples": { | ||
| "attester-verification-keys": [ | ||
| { | ||
| "environment": { | ||
| "class": { | ||
| "id": { | ||
| "type": "psa.impl-id", | ||
| "value": "YWNtZS1pbXBsZW1lbnRhdGlvbi1pZC0wMDAwMDAwMDE=" | ||
| }, | ||
| "vendor": "ACME", | ||
| "model": "RoadRunner" | ||
| }, | ||
| "instance": { | ||
| "type": "ueid", | ||
| "value": "Ac7rrnuJJ6MiflMDz14PH3s0u1Qq1yUKwD+83jbsLxUI" | ||
| } | ||
| }, | ||
| "verification-keys": [ | ||
| { | ||
| "type": "pkix-base64-key", | ||
| "value": "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEMKBCTNIcKUSDii11ySs3526iDZ8A\niTo7Tu6KPAqv7D7gS2XpJFbZiItSs3m9+9Ue6GnvHw/GW2ZZaVtszggXIw==\n-----END PUBLIC KEY-----" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought we strongly enforce revisions now?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That hash is assocated with a v2.0.0rc0 tag, however because it's a v2 tag for a modules without a
/v2, using it won't work. (conversely, moving to/v2without publishing a release won't work either), it's a catch22 in the go module versioning system, it seems. So have to use the hash here.