From 335046c3a66f1eaad159ab60b6731a81ad67946a Mon Sep 17 00:00:00 2001 From: Roshni Pattath Date: Fri, 5 Dec 2014 12:15:55 -0500 Subject: Changed the CA Host parameter --- .../pki-group-cli/pki-group-cli-group-del-kra.sh | 3 +- .../pki-group-cli/pki-group-cli-group-find-kra.sh | 3 +- .../pki-group-cli-group-member-add-kra.sh | 3 +- .../pki-group-cli-group-member-del-kra.sh | 3 +- .../pki-group-cli-group-member-show-kra.sh | 3 +- .../pki-group-cli/pki-group-cli-group-show-kra.sh | 3 +- .../pki-kra-group-cli-kra-group-del.sh | 3 +- .../pki-kra-group-cli-kra-group-find.sh | 3 +- .../pki-kra-group-cli-kra-group-member-add.sh | 3 +- .../pki-kra-group-cli-kra-group-member-del.sh | 3 +- .../pki-kra-group-cli-kra-group-member-find.sh | 3 +- .../pki-kra-group-cli-kra-group-member-show.sh | 3 +- .../pki-kra-group-cli-kra-group-show.sh | 3 +- .../pki-kra-user-cli-kra-user-cert-add.sh | 3 +- .../pki-kra-user-cli-kra-user-cert-delete.sh | 542 +-------------------- .../pki-kra-user-cli-kra-user-cert-find.sh | 3 +- .../pki-kra-user-cli-kra-user-cert-show.sh | 3 +- .../kra/pki-user-cli-user-cert-add-kra.sh | 3 +- .../kra/pki-user-cli-user-cert-delete-kra.sh | 3 +- .../kra/pki-user-cli-user-cert-find-kra.sh | 3 +- .../kra/pki-user-cli-user-cert-show-kra.sh | 3 +- 21 files changed, 28 insertions(+), 574 deletions(-) (limited to 'tests/dogtag') diff --git a/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-del-kra.sh b/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-del-kra.sh index 9b6bcfbb0..697fe6dbd 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-del-kra.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-del-kra.sh @@ -54,11 +54,10 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) -CA_HOST=$(eval echo \$${caHost}) eval ${subsystemId}_adminV_user=${subsystemId}_adminV eval ${subsystemId}_adminR_user=${subsystemId}_adminR eval ${subsystemId}_adminE_user=${subsystemId}_adminE diff --git a/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-find-kra.sh b/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-find-kra.sh index eb4fc8ae0..75e0066ad 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-find-kra.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-find-kra.sh @@ -48,11 +48,10 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) -CA_HOST=$(eval echo \$${caHost}) eval ${subsystemId}_adminV_user=${subsystemId}_adminV eval ${subsystemId}_adminR_user=${subsystemId}_adminR eval ${subsystemId}_adminE_user=${subsystemId}_adminE diff --git a/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-member-add-kra.sh b/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-member-add-kra.sh index 8f3c8f9f4..42f5fd8e8 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-member-add-kra.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-member-add-kra.sh @@ -64,11 +64,10 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) -CA_HOST=$(eval echo \$${caHost}) eval ${subsystemId}_adminV_user=${subsystemId}_adminV eval ${subsystemId}_adminR_user=${subsystemId}_adminR eval ${subsystemId}_adminE_user=${subsystemId}_adminE diff --git a/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-member-del-kra.sh b/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-member-del-kra.sh index 906bffd49..35e28a58d 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-member-del-kra.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-member-del-kra.sh @@ -61,11 +61,10 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) -CA_HOST=$(eval echo \$${caHost}) eval ${subsystemId}_adminV_user=${subsystemId}_adminV eval ${subsystemId}_adminR_user=${subsystemId}_adminR eval ${subsystemId}_adminE_user=${subsystemId}_adminE diff --git a/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-member-show-kra.sh b/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-member-show-kra.sh index 46a731676..9976b16af 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-member-show-kra.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-member-show-kra.sh @@ -64,11 +64,10 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) -CA_HOST=$(eval echo \$${caHost}) eval ${subsystemId}_adminV_user=${subsystemId}_adminV eval ${subsystemId}_adminR_user=${subsystemId}_adminR eval ${subsystemId}_adminE_user=${subsystemId}_adminE diff --git a/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-show-kra.sh b/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-show-kra.sh index 792aae1c9..57fe3549e 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-show-kra.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-show-kra.sh @@ -58,11 +58,10 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) -CA_HOST=$(eval echo \$${caHost}) eval ${subsystemId}_adminV_user=${subsystemId}_adminV eval ${subsystemId}_adminR_user=${subsystemId}_adminR eval ${subsystemId}_adminE_user=${subsystemId}_adminE diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-del.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-del.sh index b7d14adfc..ee475459e 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-del.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-del.sh @@ -54,11 +54,10 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) -CA_HOST=$(eval echo \$${caHost}) eval ${subsystemId}_adminV_user=${subsystemId}_adminV eval ${subsystemId}_adminR_user=${subsystemId}_adminR eval ${subsystemId}_adminE_user=${subsystemId}_adminE diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-find.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-find.sh index 2d7439818..498d95496 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-find.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-find.sh @@ -48,11 +48,10 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) -CA_HOST=$(eval echo \$${caHost}) eval ${subsystemId}_adminV_user=${subsystemId}_adminV eval ${subsystemId}_adminR_user=${subsystemId}_adminR eval ${subsystemId}_adminE_user=${subsystemId}_adminE diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-add.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-add.sh index fc2bfd924..5a96f28e6 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-add.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-add.sh @@ -64,12 +64,11 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) -CA_HOST=$(eval echo \$${caHost}) eval ${subsystemId}_adminV_user=${subsystemId}_adminV eval ${subsystemId}_adminR_user=${subsystemId}_adminR eval ${subsystemId}_adminE_user=${subsystemId}_adminE diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-del.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-del.sh index 737b7c94c..661633726 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-del.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-del.sh @@ -61,11 +61,10 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) -CA_HOST=$(eval echo \$${caHost}) eval ${subsystemId}_adminV_user=${subsystemId}_adminV eval ${subsystemId}_adminR_user=${subsystemId}_adminR eval ${subsystemId}_adminE_user=${subsystemId}_adminE diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-find.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-find.sh index c95a1f5e6..79c930a5f 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-find.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-find.sh @@ -66,11 +66,10 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) -CA_HOST=$(eval echo \$${caHost}) eval ${subsystemId}_adminV_user=${subsystemId}_adminV eval ${subsystemId}_adminR_user=${subsystemId}_adminR eval ${subsystemId}_adminE_user=${subsystemId}_adminE diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-show.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-show.sh index d4fbd113e..7100a29ed 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-show.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-show.sh @@ -64,11 +64,10 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) -CA_HOST=$(eval echo \$${caHost}) eval ${subsystemId}_adminV_user=${subsystemId}_adminV eval ${subsystemId}_adminR_user=${subsystemId}_adminR eval ${subsystemId}_adminE_user=${subsystemId}_adminE diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-show.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-show.sh index 361e2767f..5c7cfd330 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-show.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-show.sh @@ -58,11 +58,10 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) -CA_HOST=$(eval echo \$${caHost}) eval ${subsystemId}_adminV_user=${subsystemId}_adminV eval ${subsystemId}_adminR_user=${subsystemId}_adminR eval ${subsystemId}_adminE_user=${subsystemId}_adminE diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-add.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-add.sh index abd5e5b67..383feda89 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-add.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-add.sh @@ -54,12 +54,11 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) -CA_HOST=$(eval echo \$${caHost}) ##### Create a temporary directory to save output files and initializing host/port variables ##### rlPhaseStartSetup "pki_user_cli_user_cert-add-kra-startup: Create temporary directory and initializing host/port variables" rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-delete.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-delete.sh index a62468007..4d13f18d7 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-delete.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-delete.sh @@ -54,11 +54,11 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) -CA_HOST=$(eval echo \$${caHost}) + ##### Create temporary directory to save output files##### rlPhaseStartSetup "pki_kra_user_cli_kra_user_cert-del-startup: Create temporary directory" rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" @@ -86,534 +86,6 @@ eval ${subsystemId}_auditV_user=${subsystemId}_auditV eval ${subsystemId}_operatorV_user=${subsystemId}_operatorV ca_signing_cert_subj_name=$(eval echo \$${caId}_SIGNING_CERT_SUBJECT_NAME) ROOTCA_agent_user=${caId}_agentV - ##### pki_kra_user_cli_kra_user_cert_delete-configtest #### - rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-del-configtest-001: pki kra-user-cert-del configuration test" - rlRun "pki kra-user-cert-del --help > $TmpDir/pki_kra_user_cert_del_cfg.out 2>&1" \ - 0 \ - "User cert delete configuration" - rlAssertGrep "usage: kra-user-cert-del " "$TmpDir/pki_kra_user_cert_del_cfg.out" - rlAssertNotGrep "Error: Unrecognized option: --help" "$TmpDir/pki_kra_user_cert_del_cfg.out" - rlLog "FAIL:https://fedorahosted.org/pki/ticket/843" - rlPhaseEnd - - ##### Tests to delete certs assigned to KRA users #### - - ##### Delete certs asigned to a user - valid Cert ID and User ID ##### - - rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-del-002-tier1: Delete cert assigned to a user - valid UserID and CertID" - i=0 - rlRun "pki -d $CERTDB_DIR \ - -n $(eval echo \$${subsystemId}_adminV_user) \ - -c $CERTDB_DIR_PASSWORD \ - -h $KRA_HOST \ - -p $KRA_PORT \ - kra-user-add --fullName=\"$user1fullname\" $user1" - while [ $i -lt 4 ] ; do - rlRun "generate_new_cert tmp_nss_db:$TEMP_NSS_DB tmp_nss_db_pwd:$TEMP_NSS_DB_PASSWD request_type:pkcs10 \ - algo:rsa key_size:2048 subject_cn:\"$user1fullname$(($i+1))\" subject_uid:$user1$(($i+1)) subject_email:$user1$(($i+1))@example.org \ - organizationalunit:Engineering organization:Example.Inc country:US archive:false req_profile:caUserCert \ - target_host:$CA_HOST protocol: port:$CA_PORT cert_db_dir:$CERTDB_DIR cert_db_pwd:$CERTDB_DIR_PASSWORD \ - certdb_nick:\"$ROOTCA_agent_user\" cert_info:$cert_info" - local valid_pkcs10_serialNumber=$(cat $cert_info| grep cert_serialNumber | cut -d- -f2) - local valid_decimal_pkcs10_serialNumber=$(cat $cert_info| grep decimal_valid_serialNumber | cut -d- -f2) - local STRIP_HEX_PKCS10=$(echo $valid_pkcs10_serialNumber | cut -dx -f2) - local CONV_UPP_VAL_PKCS10=${STRIP_HEX_PKCS10^^} - serialhexpkcs10user1[$i]=$valid_pkcs10_serialNumber - serialdecimalpkcs10user1[$i]=$valid_decimal_pkcs10_serialNumber - rlRun "pki -h $CA_HOST -p $CA_PORT cert-show $valid_pkcs10_serialNumber --encoded > $TmpDir/pki_kra_user_cert_del_encoded_002pkcs10$i.out" 0 "Executing pki cert-show $valid_pkcs10_serialNumber" - rlRun "sed -n '/-----BEGIN CERTIFICATE-----/,/-----END CERTIFICATE-----/p' $TmpDir/pki_kra_user_cert_del_encoded_002pkcs10$i.out > $TmpDir/pki_kra_user_cert_del_validcert_002pkcs10$i.pem" - - rlRun "generate_new_cert tmp_nss_db:$TEMP_NSS_DB tmp_nss_db_pwd:$TEMP_NSS_DB_PASSWD request_type:crmf \ - algo:rsa key_size:2048 subject_cn:\"$user1fullname$(($i+1))\" subject_uid:$user1$(($i+1)) subject_email:$user1$(($i+1))@example.org \ - organizationalunit:Engineering organization:Example.Inc country:US archive:false req_profile:caUserCert \ - target_host:$CA_HOST protocol: port:$CA_PORT cert_db_dir:$CERTDB_DIR cert_db_pwd:$CERTDB_DIR_PASSWORD \ - certdb_nick:\"$ROOTCA_agent_user\" cert_info:$cert_info" - local valid_crmf_serialNumber=$(cat $cert_info| grep cert_serialNumber | cut -d- -f2) - local valid_decimal_crmf_serialNumber=$(cat $cert_info| grep decimal_valid_serialNumber | cut -d- -f2) - local STRIP_HEX_CRMF=$(echo $valid_crmf_serialNumber | cut -dx -f2) - local CONV_UPP_VAL_CRMF=${STRIP_HEX_CRMF^^} - serialhexcrmfuser1[$i]=$valid_crmf_serialNumber - serialdecimalcrmfuser1[$i]=$valid_decimal_crmf_serialNumber - rlRun "pki -h $CA_HOST -p $CA_PORT cert-show $valid_crmf_serialNumber --encoded > $TmpDir/pki_kra_user_cert_del_encoded_002crmf$i.out" 0 "Executing pki cert-show $valid_crmf_serialNumber" - rlRun "sed -n '/-----BEGIN CERTIFICATE-----/,/-----END CERTIFICATE-----/p' $TmpDir/pki_kra_user_cert_del_encoded_002crmf$i.out > $TmpDir/pki_kra_user_cert_del_validcert_002crmf$i.pem" - - - rlRun "pki -d $CERTDB_DIR/ \ - -n $(eval echo \$${subsystemId}_adminV_user) \ - -c $CERTDB_DIR_PASSWORD \ - -h $KRA_HOST \ - -p $KRA_PORT \ - kra-user-cert-add $user1 --input $TmpDir/pki_kra_user_cert_del_validcert_002pkcs10$i.pem > $TmpDir/pki_kra_user_cert_del_useraddcert_pkcs10_002$i.out" \ - 0 \ - "Cert is added to the user $user1" - - rlRun "pki -d $CERTDB_DIR/ \ - -n $(eval echo \$${subsystemId}_adminV_user) \ - -c $CERTDB_DIR_PASSWORD \ - -h $KRA_HOST \ - -p $KRA_PORT \ - kra-user-cert-add $user1 --input $TmpDir/pki_kra_user_cert_del_validcert_002crmf$i.pem > $TmpDir/pki_kra_user_cert_del_useraddcert_crmf_002$i.out" \ - 0 \ - "Cert is added to the user $user1" - let i=$i+1 - done - i=0 - rlLog "Executing pki -d $CERTDB_DIR/ \ - -n $(eval echo \$${subsystemId}_adminV_user) \ - -c $CERTDB_DIR_PASSWORD \ - -h $KRA_HOST \ - -p $KRA_PORT \ - kra-user-cert-del $user1 \"2;${serialdecimalpkcs10user1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))$@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US\"" - rlRun "pki -d $CERTDB_DIR/ \ - -n $(eval echo \$${subsystemId}_adminV_user) \ - -c $CERTDB_DIR_PASSWORD \ - -h $KRA_HOST \ - -p $KRA_PORT \ - kra-user-cert-del $user1 \"2;${serialdecimalpkcs10user1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US\" > $TmpDir/pki_kra_user_cert_del_002pkcs10.out" \ - 0 \ - "Delete cert assigned to $user1" - rlAssertGrep "Deleted certificate \"2;${serialdecimalpkcs10user1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US\"" "$TmpDir/pki_kra_user_cert_del_002pkcs10.out" - - rlLog "Executing pki -d $CERTDB_DIR/ \ - -n $(eval echo \$${subsystemId}_adminV_user) \ - -c $CERTDB_DIR_PASSWORD \ - -h $KRA_HOST \ - -p $KRA_PORT \ - kra-user-cert-del $user1 \"2;${serialdecimalcrmfuser1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))$@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US\"" - rlRun "pki -d $CERTDB_DIR/ \ - -n $(eval echo \$${subsystemId}_adminV_user) \ - -c $CERTDB_DIR_PASSWORD \ - -h $KRA_HOST \ - -p $KRA_PORT \ - kra-user-cert-del $user1 \"2;${serialdecimalcrmfuser1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US\" > $TmpDir/pki_kra_user_cert_del_002crmf.out" \ - 0 \ - "Delete cert assigned to $user1" - rlAssertGrep "Deleted certificate \"2;${serialdecimalcrmfuser1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US\"" "$TmpDir/pki_kra_user_cert_del_002crmf.out" - - rlRun "pki -d $CERTDB_DIR \ - -n $(eval echo \$${subsystemId}_adminV_user) \ - -c $CERTDB_DIR_PASSWORD \ - -h $KRA_HOST \ - -p $KRA_PORT \ - kra-user-del $user1" - rlPhaseEnd - - ##### Delete certs asigned to a user - invalid Cert ID ##### - - rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-del-003: pki kra-user-cert-del should fail if an invalid Cert ID is provided" - i=0 - rlRun "pki -d $CERTDB_DIR \ - -n $(eval echo \$${subsystemId}_adminV_user) \ - -c $CERTDB_DIR_PASSWORD \ - -h $KRA_HOST \ - -p $KRA_PORT \ - kra-user-add --fullName=\"$user1fullname\" $user1" - while [ $i -lt 4 ] ; do - rlRun "generate_new_cert tmp_nss_db:$TEMP_NSS_DB tmp_nss_db_pwd:$TEMP_NSS_DB_PASSWD request_type:pkcs10 \ - algo:rsa key_size:2048 subject_cn:\"$user1fullname$(($i+1))\" subject_uid:$user1$(($i+1)) subject_email:$user1$(($i+1))@example.org \ - organizationalunit:Engineering organization:Example.Inc country:US archive:false req_profile:caUserCert \ - target_host:$CA_HOST protocol: port:$CA_PORT cert_db_dir:$CERTDB_DIR cert_db_pwd:$CERTDB_DIR_PASSWORD \ - certdb_nick:\"$ROOTCA_agent_user\" cert_info:$cert_info" - local valid_pkcs10_serialNumber=$(cat $cert_info| grep cert_serialNumber | cut -d- -f2) - local valid_decimal_pkcs10_serialNumber=$(cat $cert_info| grep decimal_valid_serialNumber | cut -d- -f2) - local STRIP_HEX_PKCS10=$(echo $valid_pkcs10_serialNumber | cut -dx -f2) - local CONV_UPP_VAL_PKCS10=${STRIP_HEX_PKCS10^^} - serialhexpkcs10user1[$i]=$valid_pkcs10_serialNumber - serialdecimalpkcs10user1[$i]=$valid_decimal_pkcs10_serialNumber - rlRun "pki -h $CA_HOST -p $CA_PORT cert-show $valid_pkcs10_serialNumber --encoded > $TmpDir/pki_kra_user_cert_del_encoded_002pkcs10$i.out" 0 "Executing pki cert-show $valid_pkcs10_serialNumber" - rlRun "sed -n '/-----BEGIN CERTIFICATE-----/,/-----END CERTIFICATE-----/p' $TmpDir/pki_kra_user_cert_del_encoded_002pkcs10$i.out > $TmpDir/pki_kra_user_cert_del_validcert_002pkcs10$i.pem" - - rlRun "generate_new_cert tmp_nss_db:$TEMP_NSS_DB tmp_nss_db_pwd:$TEMP_NSS_DB_PASSWD request_type:crmf \ - algo:rsa key_size:2048 subject_cn:\"$user1fullname$(($i+1))\" subject_uid:$user1$(($i+1)) subject_email:$user1$(($i+1))@example.org \ - organizationalunit:Engineering organization:Example.Inc country:US archive:false req_profile:caUserCert \ - target_host:$CA_HOST protocol: port:$CA_PORT cert_db_dir:$CERTDB_DIR cert_db_pwd:$CERTDB_DIR_PASSWORD \ - certdb_nick:\"$ROOTCA_agent_user\" cert_info:$cert_info" - local valid_crmf_serialNumber=$(cat $cert_info| grep cert_serialNumber | cut -d- -f2) - local valid_decimal_crmf_serialNumber=$(cat $cert_info| grep decimal_valid_serialNumber | cut -d- -f2) - local STRIP_HEX_CRMF=$(echo $valid_crmf_serialNumber | cut -dx -f2) - local CONV_UPP_VAL_CRMF=${STRIP_HEX_CRMF^^} - serialhexcrmfuser1[$i]=$valid_crmf_serialNumber - serialdecimalcrmfuser1[$i]=$valid_decimal_crmf_serialNumber - rlRun "pki -h $KRA_HOST -p $KRA_PORT cert-show $valid_crmf_serialNumber --encoded > $TmpDir/pki_kra_user_cert_del_encoded_002crmf$i.out" 0 "Executing pki cert-show $valid_crmf_serialNumber" - rlRun "sed -n '/-----BEGIN CERTIFICATE-----/,/-----END CERTIFICATE-----/p' $TmpDir/pki_kra_user_cert_del_encoded_002crmf$i.out > $TmpDir/pki_kra_user_cert_del_validcert_002crmf$i.pem" - - - rlRun "pki -d $CERTDB_DIR/ \ - -n $(eval echo \$${subsystemId}_adminV_user) \ - -c $CERTDB_DIR_PASSWORD \ - -h $KRA_HOST \ - -p $KRA_PORT \ - kra-user-cert-add $user1 --input $TmpDir/pki_kra_user_cert_del_validcert_002pkcs10$i.pem > $TmpDir/pki_kra_user_cert_del_useraddcert_pkcs10_002$i.out" \ - 0 \ - "Cert is added to the user $user1" - - rlRun "pki -d $CERTDB_DIR/ \ - -n $(eval echo \$${subsystemId}_adminV_user) \ - -c $CERTDB_DIR_PASSWORD \ - -h $KRA_HOST \ - -p $KRA_PORT \ - kra-user-cert-add $user1 --input $TmpDir/pki_kra_user_cert_del_validcert_002crmf$i.pem > $TmpDir/pki_kra_user_cert_del_useraddcert_crmf_002$i.out" \ - 0 \ - "Cert is added to the user $user1" - let i=$i+1 - done - i=0 - - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '3;1000;CN=ROOTCA Signing Cert,O=redhat domain;UID=$user1,E=$user1@example.org,CN=$user1fullname,OU=Eng,O=Example,C=UK'" - rlLog "Executing: $command" - errmsg="PKIException: Failed to modify user." - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if Invalid Cert ID is provided" - - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '3;1000;CN=ROOTCA Signing Cert,O=redhat domain;UID=$user1,E=$user1@example.org,CN=$user1fullname,OU=Eng,O=Example,C=UK'" - rlLog "Executing: $command" - errmsg="PKIException: Failed to modify user." - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if Invalid Cert ID is provided" - - rlPhaseEnd - - ##### Delete certs asigned to a user - User does not exist ##### - - rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-del-004: pki kra-user-cert-del should fail if a non-existing User ID is provided" - i=1 - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del testuser4 '2;${serialdecimalpkcs10user1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="ResourceNotFoundException: User not found" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if a non-existing User ID is provided" - - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del testuser4 '2;${serialdecimalcrmfuser1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="ResourceNotFoundException: User not found" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if a non-existing User ID is provided" - rlPhaseEnd - - ##### Delete certs asigned to a user - User ID and Cert ID mismatch ##### - - rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-del-005: pki kra-user-cert-del should fail is there is a mismatch of User ID and Cert ID" - i=1 - rlRun "pki -d $CERTDB_DIR \ - -n $(eval echo \$${subsystemId}_adminV_user) \ - -c $CERTDB_DIR_PASSWORD \ - -h $KRA_HOST \ - -p $KRA_PORT \ - kra-user-add --fullName=\"$user2fullname\" $user2" - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user2 '2;${serialdecimalpkcs10user1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="ResourceNotFoundException: Certificate not found" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if there is a Cert ID and User ID mismatch" - - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user2 '2;${serialdecimalcrmfuser1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="ResourceNotFoundException: Certificate not found" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if there is a Cert ID and User ID mismatch" - rlPhaseEnd - - ##### Delete certs asigned to a user - no User ID ##### - - rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-del-006-tier1: pki kra-user-cert-del should fail if User ID is not provided" - i=1 - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del '2;${serialdecimalpkcs10user1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="Error: Incorrect number of arguments specified." - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if User ID is not provided" - - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del '2;${serialdecimalcrmfuser1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="Error: Incorrect number of arguments specified." - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if User ID is not provided" - rlPhaseEnd - - ##### Delete certs asigned to a user - no Cert ID ##### - - rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-del-007-tier1: pki kra-user-cert-del should fail if Cert ID is not provided" - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1" - rlLog "Executing: $command" - errmsg="Error: Incorrect number of arguments specified." - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if Cert ID is not provided" - rlPhaseEnd - - ##### Delete certs asigned to a user - as KRA_agentV ##### - - rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-del-008: Delete certs assigned to a user - as KRA_agentV should fail" - i=1 - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_agentV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '2;${serialdecimalpkcs10user1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="ForbiddenException: Authorization Error" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if authenticating using a valid agent cert" - - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_agentV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '2;${serialdecimalcrmfuser1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="ForbiddenException: Authorization Error" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if authenticating using a valid agent cert" - rlPhaseEnd - - ##### Delete certs asigned to a user - as KRA_auditorV ##### - - rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-del-009: Delete certs assigned to a user - as KRA_auditorV should fail" - i=1 - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_auditV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '2;${serialdecimalpkcs10user1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="ForbiddenException: Authorization Error" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if authenticating using a valid auditor cert" - - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_auditV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '2;${serialdecimalcrmfuser1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="ForbiddenException: Authorization Error" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if authenticating using a valid auditor cert" - - rlLog "FAIL: https://fedorahosted.org/pki/ticket/962" - rlPhaseEnd - - ##### Delete certs asigned to a user - as KRA_adminE ##### - - rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-del-0010: Delete certs assigned to a user - as KRA_adminE" - i=1 - rlRun "date --set='next day'" 0 "Set System date a day ahead" - rlRun "date --set='next day'" 0 "Set System date a day ahead" - rlRun "date" - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_adminE_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '2;${serialdecimalpkcs10user1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="ForbiddenException: Authorization Error" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if authenticating using an expired admin cert" - - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_adminE_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '2;${serialdecimalcrmfuser1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="ForbiddenException: Authorization Error" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if authenticating using an expired admin cert" - rlRun "date --set='2 days ago'" 0 "Set System back to the present day" - - rlLog "FAIL: https://fedorahosted.org/pki/ticket/962" - rlPhaseEnd - - ##### Delete certs asigned to a user - as KRA_agentE ##### - - rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-del-0011: Delete certs assigned to a user - as KRA_agentE" - i=1 - rlRun "date --set='next day'" 0 "Set System date a day ahead" - rlRun "date --set='next day'" 0 "Set System date a day ahead" - rlRun "date" - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_agentE_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '2;${serialdecimalpkcs10user1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="ForbiddenException: Authorization Error" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if authenticating using an expired agent cert" - - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_agentE_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '2;${serialdecimalcrmfuser1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="ForbiddenException: Authorization Error" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if authenticating using an expired agent cert" - rlRun "date --set='2 days ago'" 0 "Set System back to the present day" - - rlLog "FAIL: https://fedorahosted.org/pki/ticket/962" - rlPhaseEnd - - ##### Delete certs asigned to a user - as KRA_adminR ##### - - rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-del-0012: Delete certs assigned to a user - as KRA_adminR should fail" - i=1 - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_adminR_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '2;${serialdecimalpkcs10user1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="PKIException: Unauthorized" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if authenticating using a revoked admin cert" - - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_adminR_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '2;${serialdecimalcrmfuser1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="PKIException: Unauthorized" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if authenticating using a revoked admin cert" - rlLog "PKI Ticket: https://fedorahosted.org/pki/ticket/1134" - rlLog "PKI Ticket: https://fedorahosted.org/pki/ticket/1182" - rlPhaseEnd - - ##### Delete certs asigned to a user - as KRA_agentR ##### - - rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-del-0013: Delete certs assigned to a user - as KRA_agentR should fail" - i=1 - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_agentR_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '2;${serialdecimalpkcs10user1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="PKIException: Unauthorized" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if authenticating using a revoked agent cert" - - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_agentR_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '2;${serialdecimalcrmfuser1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="PKIException: Unauthorized" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if authenticating using a revoked agent cert" - rlLog "PKI Ticket: https://fedorahosted.org/pki/ticket/1134" - rlLog "PKI Ticket: https://fedorahosted.org/pki/ticket/1182" - rlPhaseEnd - - ##### Delete certs asigned to a user - as role_user_UTCA ##### - - rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-del-0014: Delete certs assigned to a user - as role_user_UTCA should fail" - i=1 - command="pki -d $UNTRUSTED_CERT_DB_LOCATION -n role_user_UTCA -c $UNTRUSTED_CERT_DB_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '2;${serialdecimalpkcs10user1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="PKIException: Unauthorized" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if authenticating using an untrusted cert" - - command="pki -d $UNTRUSTED_CERT_DB_LOCATION -n role_user_UTCA -c $UNTRUSTED_CERT_DB_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '2;${serialdecimalcrmfuser1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="PKIException: Unauthorized" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if authenticating using an untrusted cert" - - rlLog "FAIL: https://fedorahosted.org/pki/ticket/962" - rlPhaseEnd - - ##### Delete certs asigned to a user - as KRA_operatorV ##### - - rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-del-0015: Delete certs assigned to a user - as KRA_operatorV should fail" - i=1 - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_operatorV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '2;${serialdecimalpkcs10user1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="ForbiddenException: Authorization Error" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if authenticating using a valid operator cert" - - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_operatorV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '2;${serialdecimalcrmfuser1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="ForbiddenException: Authorization Error" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if authenticating using a valid operator cert" - rlPhaseEnd - - ##### Delete certs asigned to a user - as a user not assigned to any role ##### - - rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-del-0016: Delete certs assigned to a user - as a user not assigned to any role should fail" - i=1 - command="pki -d $CERTDB_DIR/ -n $user2 -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '2;${serialdecimalpkcs10user1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="ForbiddenException: Authorization Error" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - Error should be thrown when authentication as a user not assigned to any role" - - command="pki -d $CERTDB_DIR/ -n $user2 -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del $user1 '2;${serialdecimalcrmfuser1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US'" - rlLog "Executing: $command" - errmsg="ForbiddenException: Authorization Error" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - Error should be thrown when authentication as a user not assigned to any role" - - rlLog "FAIL: https://fedorahosted.org/pki/ticket/962" - rlPhaseEnd - - ##### Delete certs asigned to a user - switch positions of the required options ##### - - rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-del-0017: Delete certs assigned to a user - switch positions of the required options" - i=1 - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del '2;${serialdecimalpkcs10user1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US' $user1" - rlLog "Executing: $command" - errmsg="Error:" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if the required options are switched positions" - - command="pki -d $CERTDB_DIR/ -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-user-cert-del '2;${serialdecimalcrmfuser1[$i]};$ca_signing_cert_subj_name;UID=$user1$(($i+1)),E=$user1$(($i+1))@example.org,CN=$user1fullname$(($i+1)),OU=Engineering,O=Example.Inc,C=US' $user1" - rlLog "Executing: $command" - errmsg="Error:" - errorcode=255 - rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if the required options are switched positions" - rlLog "FAIL: https://fedorahosted.org/pki/ticket/969" - rlPhaseEnd - - ### Tests to delete certs assigned to KRA users - i18n characters #### - - rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-del-0019: Delete certs assigned to user - Subject name has i18n Characters" - rlRun "generate_new_cert tmp_nss_db:$TEMP_NSS_DB tmp_nss_db_pwd:$TEMP_NSS_DB_PASSWD request_type:pkcs10 \ - algo:rsa key_size:2048 subject_cn:\"Örjan Äke\" subject_uid:\"Örjan Äke\" subject_email:test@example.org \ - organizationalunit:Engineering organization:Example.Inc country:US archive:false req_profile:caUserCert \ - target_host:$CA_HOST protocol: port:$CA_PORT cert_db_dir:$CERTDB_DIR cert_db_pwd:$CERTDB_DIR_PASSWORD \ - certdb_nick:\"$ROOTCA_agent_user\" cert_info:$cert_info" - local valid_pkcs10_serialNumber=$(cat $cert_info| grep cert_serialNumber | cut -d- -f2) - local valid_decimal_pkcs10_serialNumber=$(cat $cert_info| grep decimal_valid_serialNumber | cut -d- -f2) - local STRIP_HEX_PKCS10=$(echo $valid_pkcs10_serialNumber | cut -dx -f2) - local CONV_UPP_VAL_PKCS10=${STRIP_HEX_PKCS10^^} - serialhexpkcs10user1[$i]=$valid_pkcs10_serialNumber - serialdecimalpkcs10user1[$i]=$valid_decimal_pkcs10_serialNumber - rlRun "pki -h $CA_HOST -p $CA_PORT cert-show $valid_pkcs10_serialNumber --encoded > $TmpDir/pki_kra_user_cert_del_encoded_0019pkcs10.out" 0 "Executing pki cert-show $valid_pkcs10_serialNumber" - rlRun "sed -n '/-----BEGIN CERTIFICATE-----/,/-----END CERTIFICATE-----/p' $TmpDir/pki_kra_user_cert_del_encoded_0019pkcs10.out > $TmpDir/pki_kra_user_cert_del_validcert_0019pkcs10.pem" - - rlRun "generate_new_cert tmp_nss_db:$TEMP_NSS_DB tmp_nss_db_pwd:$TEMP_NSS_DB_PASSWD request_type:crmf \ - algo:rsa key_size:2048 subject_cn:\"Örjan Äke\" subject_uid:\"Örjan Äke\" subject_email:test@example.org \ - organizationalunit:Engineering organization:Example.Inc country:US archive:false req_profile:caUserCert \ - target_host:$CA_HOST protocol: port:$CA_PORT cert_db_dir:$CERTDB_DIR cert_db_pwd:$CERTDB_DIR_PASSWORD \ - certdb_nick:\"$ROOTCA_agent_user\" cert_info:$cert_info" - local valid_crmf_serialNumber=$(cat $cert_info| grep cert_serialNumber | cut -d- -f2) - local valid_decimal_crmf_serialNumber=$(cat $cert_info| grep decimal_valid_serialNumber | cut -d- -f2) - local STRIP_HEX_CRMF=$(echo $valid_crmf_serialNumber | cut -dx -f2) - local CONV_UPP_VAL_CRMF=${STRIP_HEX_CRMF^^} - serialhexcrmfuser1[$i]=$valid_crmf_serialNumber - serialdecimalcrmfuser1[$i]=$valid_decimal_crmf_serialNumber - rlRun "pki -h $CA_HOST -p $CA_PORT cert-show $valid_crmf_serialNumber --encoded > $TmpDir/pki_kra_user_cert_del_encoded_0019crmf.out" 0 "Executing pki cert-show $valid_crmf_serialNumber" - rlRun "sed -n '/-----BEGIN CERTIFICATE-----/,/-----END CERTIFICATE-----/p' $TmpDir/pki_kra_user_cert_del_encoded_0019crmf.out > $TmpDir/pki_kra_user_cert_del_validcert_0019crmf.pem" - - - rlRun "pki -d $CERTDB_DIR/ \ - -n $(eval echo \$${subsystemId}_adminV_user) \ - -c $CERTDB_DIR_PASSWORD \ - -h $KRA_HOST \ - -p $KRA_PORT \ - kra-user-cert-add $user2 --input $TmpDir/pki_kra_user_cert_del_validcert_0019pkcs10.pem > $TmpDir/pki_kra_user_cert_del_useraddcert_pkcs10_0019.out" \ - 0 \ - "Cert is added to the user $user2" - - rlRun "pki -d $CERTDB_DIR/ \ - -n $(eval echo \$${subsystemId}_adminV_user) \ - -c $CERTDB_DIR_PASSWORD \ - -h $KRA_HOST \ - -p $KRA_PORT \ - kra-user-cert-add $user2 --input $TmpDir/pki_kra_user_cert_del_validcert_0019crmf.pem > $TmpDir/pki_kra_user_cert_del_useraddcert_crmf_0019.out" \ - 0 \ - "Cert is added to the user $user1" - rlLog "Executing pki -d $CERTDB_DIR/ \ - -n $(eval echo \$${subsystemId}_adminV_user) \ - -c $CERTDB_DIR_PASSWORD \ - -h $KRA_HOST \ - -p $KRA_PORT \ - kra-user-cert-del $user2 \"2;$valid_decimal_pkcs10_serialNumber;$ca_signing_cert_subj_name;UID=Örjan Äke,E=test@example.org,CN=Örjan Äke,OU=Engineering,O=Example.Inc,C=US\"" - rlRun "pki -d $CERTDB_DIR/ \ - -n $(eval echo \$${subsystemId}_adminV_user) \ - -c $CERTDB_DIR_PASSWORD \ - -h $KRA_HOST \ - -p $KRA_PORT \ - kra-user-cert-del $user2 \"2;$valid_decimal_pkcs10_serialNumber;$ca_signing_cert_subj_name;UID=Örjan Äke,E=test@example.org,CN=Örjan Äke,OU=Engineering,O=Example.Inc,C=US\" > $TmpDir/pki_kra_user_cert_del_0019pkcs10.out" \ - 0 \ - "Delete cert assigned to $user2" - rlAssertGrep "Deleted certificate \"2;$valid_decimal_pkcs10_serialNumber;$ca_signing_cert_subj_name;UID=Örjan Äke,E=test@example.org,CN=Örjan Äke,OU=Engineering,O=Example.Inc,C=US\"" "$TmpDir/pki_kra_user_cert_del_0019pkcs10.out" - - rlLog "Executing pki -d $CERTDB_DIR/ \ - -n $(eval echo \$${subsystemId}_adminV_user) \ - -c $CERTDB_DIR_PASSWORD \ - -h $KRA_HOST \ - -p $KRA_PORT \ - kra-user-cert-del $user2 \"2;$valid_decimal_crmf_serialNumber;$ca_signing_cert_subj_name;UID=Örjan Äke,E=test@example.org,CN=Örjan Äke,OU=Engineering,O=Example.Inc,C=US\"" - rlRun "pki -d $CERTDB_DIR/ \ - -n $(eval echo \$${subsystemId}_adminV_user) \ - -c $CERTDB_DIR_PASSWORD \ - -h $KRA_HOST \ - -p $KRA_PORT \ - kra-user-cert-del $user2 \"2;$valid_decimal_crmf_serialNumber;$ca_signing_cert_subj_name;UID=Örjan Äke,E=test@example.org,CN=Örjan Äke,OU=Engineering,O=Example.Inc,C=US\" > $TmpDir/pki_kra_user_cert_del_0019crmf.out" \ - 0 \ - "Delete cert assigned to $user2" - rlAssertGrep "Deleted certificate \"2;$valid_decimal_crmf_serialNumber;$ca_signing_cert_subj_name;UID=Örjan Äke,E=test@example.org,CN=Örjan Äke,OU=Engineering,O=Example.Inc,C=US\"" "$TmpDir/pki_kra_user_cert_del_0019crmf.out" - rlPhaseEnd ##### Add an Admin user "admin_user", add a cert to admin_user, add a new user as admin_user, delete the cert assigned to admin_user and then adding a new user should fail ##### @@ -646,6 +118,7 @@ ROOTCA_agent_user=${caId}_agentV -p $KRA_PORT \ kra-group-member-add Administrators admin_user1 > $TmpDir/pki-user-add-kra-group00191.out" + rlRun "generate_new_cert tmp_nss_db:$TEMP_NSS_DB tmp_nss_db_pwd:$TEMP_NSS_DB_PASSWD request_type:pkcs10 \ algo:rsa key_size:2048 subject_cn:\"Admin User\" subject_uid:\"admin_user\" subject_email:admin_user@example.org \ organizationalunit:Engineering organization:Example.Inc country:US archive:false req_profile:caUserCert \ @@ -682,7 +155,7 @@ ROOTCA_agent_user=${caId}_agentV kra-user-cert-add admin_user --input $TmpDir/pki_kra_user_cert_del_validcert_0020pkcs10.pem > $TmpDir/pki_kra_user_cert_del_useraddcert_0020pkcs10.out" \ 0 \ "PKCS10 Cert is added to the user admin_user" - rlRun "certutil -d $TEMP_NSS_DB -A -n \"admin-user-pkcs10\" -i $TmpDir/pki_kra_user_cert_del_validcert_0020pkcs10.pem -t "u,u,u"" + rlRun "certutil -d $TEMP_NSS_DB -A -n \"admin-user-pkcs10\" -i $TmpDir/pki_kra_user_cert_del_validcert_0020pkcs10.pem -t \"u,u,u\"" rlLog "pki -d $TEMP_NSS_DB/ \ -n admin-user-pkcs10 \ @@ -732,7 +205,8 @@ ROOTCA_agent_user=${caId}_agentV kra-user-cert-add admin_user1 --input $TmpDir/pki_kra_user_cert_del_validcert_0020crmf.pem > $TmpDir/pki_kra_user_cert_del_useraddcert_0020crmf.out" \ 0 \ "CRMF Cert is added to the user admin_user1" - rlRun "certutil -d $TEMP_NSS_DB -A -n \"admin-user1-crmf\" -i $TmpDir/pki_kra_user_cert_del_validcert_0020crmf.pem -t "u,u,u"" + rlLog "certutil -d $TEMP_NSS_DB -A -n \"admin-user1-crmf\" -i $TmpDir/pki_kra_user_cert_del_validcert_0020crmf.pem -t \"u,u,u\"" + rlRun "certutil -d $TEMP_NSS_DB -A -n \"admin-user1-crmf\" -i $TmpDir/pki_kra_user_cert_del_validcert_0020crmf.pem -t \"u,u,u\"" rlLog "pki -d $TEMP_NSS_DB/ \ -n admin-user1-crmf \ @@ -828,7 +302,7 @@ rlPhaseStartTest "pki_kra_user_cli_user_cleanup: Deleting role users" let j=$j+1 done #Delete temporary directory - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" + #rlRun "popd" + #rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd } diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-find.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-find.sh index 2f7cebf33..6cd5c3afa 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-find.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-find.sh @@ -54,12 +54,11 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) -CA_HOST=$(eval echo \$${caHost}) #####Create temporary dir to save the output files##### rlPhaseStartSetup "pki_kra_user_cli_kra_user_cert-find-startup: Create temporary directory" rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-show.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-show.sh index 4b1ef6787..de156e213 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-show.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-show.sh @@ -54,11 +54,10 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) -CA_HOST=$(eval echo \$${caHost}) ##### Create temporary directory to save output files ##### rlPhaseStartSetup "pki_kra_user_cli_kra_user_cert-show-startup: Create temporary directory" rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/kra/pki-user-cli-user-cert-add-kra.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/kra/pki-user-cli-user-cert-add-kra.sh index cf89b7c88..94186d5d0 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/kra/pki-user-cli-user-cert-add-kra.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/kra/pki-user-cli-user-cert-add-kra.sh @@ -54,8 +54,7 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 -CA_HOST=$(eval echo \$${caHost}) +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/kra/pki-user-cli-user-cert-delete-kra.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/kra/pki-user-cli-user-cert-delete-kra.sh index 71465363b..7ae62eb1e 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/kra/pki-user-cli-user-cert-delete-kra.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/kra/pki-user-cli-user-cert-delete-kra.sh @@ -54,8 +54,7 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 -CA_HOST=$(eval echo \$${caHost}) +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/kra/pki-user-cli-user-cert-find-kra.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/kra/pki-user-cli-user-cert-find-kra.sh index 6cf953e8a..f3c1ff558 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/kra/pki-user-cli-user-cert-find-kra.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/kra/pki-user-cli-user-cert-find-kra.sh @@ -54,8 +54,7 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 -CA_HOST=$(eval echo \$${caHost}) +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/kra/pki-user-cli-user-cert-show-kra.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/kra/pki-user-cli-user-cert-show-kra.sh index 8864820b2..9f380052f 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/kra/pki-user-cli-user-cert-show-kra.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/kra/pki-user-cli-user-cert-show-kra.sh @@ -54,11 +54,10 @@ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 caId=$4 -caHost=$5 +CA_HOST=$5 KRA_HOST=$(eval echo \$${MYROLE}) KRA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) CA_PORT=$(eval echo \$${caId}_UNSECURE_PORT) -CA_HOST=$(eval echo \$${caHost}) ca_signing_cert_subj_name=$(eval echo \$${caId}_SIGNING_CERT_SUBJECT_NAME) ##### Create temporary directory to save output files ##### rlPhaseStartSetup "pki_user_cli_user_cert-show-kra-startup: Create temporary directory" -- cgit