Update CA DS connection test to use pki ca-cert-issue

dogtagpki · Oct 3, 2024 · c91e062 · c91e062
1 parent a310a54
commit c91e062
Showing 1 changed file with 51 additions and 21 deletions.
diff --git a/.github/workflows/ca-ds-connection-test.yml b/.github/workflows/ca-ds-connection-test.yml
@@ -101,39 +101,58 @@ jobs:
 
           docker exec pki pki info
 
-      - name: Create csr requesst
+          docker exec pki pki pkcs12-import \
+              --pkcs12 /root/.dogtag/pki-tomcat/ca_admin_cert.p12 \
+              --pkcs12-password Secret.123
+
+          docker exec pki pki -n caadmin ca-user-show caadmin
+
+      - name: Create cert request
         run: |
           docker exec pki pki nss-cert-request --subject "CN=$HOSTNAME" --ext /usr/share/pki/server/certs/sslserver.conf  --csr sslserver.csr
 
       - name: Test request enrollment
         run: |
           # enrollment should work
-          docker exec pki pki ca-cert-request-submit --profile caServerCert --csr-file sslserver.csr  | tee output
-          grep "Reason:" output | wc -l > actual
-          echo "0" > expected
-          diff expected actual
+          docker exec pki pki \
+              -n caadmin \
+              ca-cert-issue \
+              --profile caServerCert \
+              --csr-file sslserver.csr \
+              --output-file sslserver.crt
           
       - name: Stop the DS
         run: |
           docker stop ds
           sleep 10
 
           # enrollment should fail
-          docker exec pki pki ca-cert-request-submit --profile caServerCert --csr-file sslserver.csr  | tee output
-          grep "Reason:" output | wc -l > actual
-          echo "1" > expected
-          diff expected actual
+          docker exec pki pki \
+              -n caadmin \
+              ca-cert-issue \
+              --profile caServerCert \
+              --csr-file sslserver.csr \
+              --output-file sslserver.crt \
+              > >(tee stdout) 2> >(tee stderr >&2) || true
+
+          cat > expected << EOF
+          PKIException: Unauthorized
+          EOF
+
+          diff expected stderr
 
       - name: Restart the DS
         run: |
           docker start ds
           sleep 20
 
           # enrollment should work
-          docker exec pki pki ca-cert-request-submit --profile caServerCert --csr-file sslserver.csr  | tee output
-          grep "Reason:" output | wc -l > actual
-          echo "0" > expected
-          diff expected actual
+          docker exec pki pki \
+              -n caadmin \
+              ca-cert-issue \
+              --profile caServerCert \
+              --csr-file sslserver.csr \
+              --output-file sslserver.crt
 
       - name: Start without the DS
         run: |
@@ -144,21 +163,32 @@ jobs:
           docker exec pki curl -s http://pki.example.com:8080/ca/admin/ca/getStatus
 
           # enrollment should fail
-          docker exec pki pki ca-cert-request-submit --profile caServerCert --csr-file sslserver.csr | tee output
-          grep "Reason:" output | wc -l > actual
-          echo "1" > expected
-          diff expected actual
+          docker exec pki pki \
+              -n caadmin \
+              ca-cert-issue \
+              --profile caServerCert \
+              --csr-file sslserver.csr \
+              --output-file sslserver.crt \
+              > >(tee stdout) 2> >(tee stderr >&2) || true
+
+          cat > expected << EOF
+          PKIException: Unauthorized
+          EOF
+
+          diff expected stderr
   
       - name: Start the DS with running CA
         run: |
           docker start ds
           sleep 60
 
           # enrollment should work
-          docker exec pki pki ca-cert-request-submit --profile caServerCert --csr-file sslserver.csr | tee output
-          grep "Reason:" output | wc -l > actual
-          echo "0" > expected
-          diff expected actual
+          docker exec pki pki \
+              -n caadmin \
+              ca-cert-issue \
+              --profile caServerCert \
+              --csr-file sslserver.csr \
+              --output-file sslserver.crt
 
       - name: Remove CA
         run: docker exec pki pkidestroy -s CA -v