Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Move to v2 APIs #4837

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Move to v2 APIs #4837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/kra-oaep-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@ jobs:
- name: Verify CAInfo
run: |
docker exec pki curl -k https://pki.example.com:8443/ca/v2/info | python -m json.tool > info
echo -n '{"ArchivalMechanism":"keywrap","EncryptionAlgorithm":"AES/CBC/PKCS5Padding","KeyWrapAlgorithm":"AES KeyWrap/Padding","RsaPublicKeyWrapAlgorithm":"RSA_OAEP","CaRsaPublicKeyWrapAlgorithm":"RSA_OAEP","Attributes":{"Attribute":[]}}' | python -m json.tool > expectedInfo
echo -n '{"ArchivalMechanism":"keywrap","EncryptionAlgorithm":"AES/CBC/PKCS5Padding","KeyWrapAlgorithm":"AES KeyWrap/Padding","RsaPublicKeyWrapAlgorithm":"RSA_OAEP","CaRsaPublicKeyWrapAlgorithm":"RSA_OAEP","Attributes":{"Attribute":[]}}' | python -m json.tool > expectedInfo
diff expectedInfo info

- name: Verify KRAInfo
run: |
docker exec pki curl -k https://pki.example.com:8443/kra/rest/info > info
echo -n '{"ArchivalMechanism":"keywrap","RecoveryMechanism":"keywrap","EncryptionAlgorithm":"AES/CBC/PKCS5Padding","WrapAlgorithm":"AES KeyWrap/Padding","RsaPublicKeyWrapAlgorithm":"RSA_OAEP","Attributes":{"Attribute":[]}}' > expectedInfo
docker exec pki curl -k https://pki.example.com:8443/kra/rest/info | python -m json.tool > info
echo -n '{"ArchivalMechanism":"keywrap","RecoveryMechanism":"keywrap","EncryptionAlgorithm":"AES/CBC/PKCS5Padding","WrapAlgorithm":"AES KeyWrap/Padding","RsaPublicKeyWrapAlgorithm":"RSA_OAEP","Attributes":{"Attribute":[]}}' | python -m json.tool > expectedInfo
diff expectedInfo info

- name: Run PKI healthcheck
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kra-standalone-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
> >(tee stdout) 2> >(tee stderr >&2) || true

# REST API should not return security domain info
echo "PKIException: Not Found" > expected
echo "ResourceNotFoundException: Security domain not available" > expected
diff expected stderr

- name: Check CA admin
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ocsp-standalone-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
> >(tee stdout) 2> >(tee stderr >&2) || true

# REST API should not return security domain info
echo "PKIException: Not Found" > expected
echo "ResourceNotFoundException: Security domain not available" > expected
diff expected stderr

- name: Check CA admin
Expand Down
2 changes: 1 addition & 1 deletion base/tomcat-9.0/conf/Catalina/localhost/rewrite.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ RewriteRule ^/acme/revoke-cert$ /acme/v1/revoke-cert
RewriteRule ^/.well-known/est/(.*)$ /est/v1/$1

# REST APIs
RewriteRule ^/(pki|ca|tps|tks|ocsp|kra)/rest/(.*)$ /$1/v1/$2
RewriteRule ^/(pki|ca|tps|tks|ocsp|kra)/rest/(.*)$ /$1/v2/$2
Loading