[#673,#665] modify test for internal irodsA generation

Author: d-w-moore

irods/test/scripts/test004_prc_pam_password_internal_secrets_file_generation.bats

@@ -10,28 +10,28 @@ PYTHON=python3
 # Run as ubuntu user with sudo; python_irodsclient must be installed (in either ~/.local or a virtualenv)
 #
 
-ALICES_PAM_PASSWORD=test123
+ALICES_ORIGINAL_PAM_PASSWORD=test123
+ALICES_NEW_PASSWORD=test_1234
 
 setup()
 {
     export SKIP_IINIT_FOR_PASSWORD=1
-    setup_pam_login_for_alice "$ALICES_PAM_PASSWORD"
+    setup_pam_login_for_alice "$ALICES_ORIGINAL_PAM_PASSWORD"
     unset SKIP_IINIT_FOR_PASSWORD
 }
 
 teardown()
 {
-:
-# finalize_pam_login_for_alice
-# test_specific_cleanup
+    finalize_pam_login_for_alice
+    test_specific_cleanup
 }
 
 @test f001 {
 
-    AUTH_FILE=~/.irods/.irodsA
+    local AUTH_FILE=~/.irods/.irodsA
 
     # Test assertion: No pre-existing authentication file.
-    ! [ -e $AUTH_FILE ]
+    [ ! -e $AUTH_FILE ]
 
     local SCRIPT="
 import irods.test.helpers as h
@@ -42,30 +42,54 @@ print ('env_auth_scheme=%s' % ses.pool.account._original_authentication_scheme)
 
     # First invocation.  PRC will both authenticate with pam_password, and write the generated secrets to the auth file,
     OUTPUT=$($PYTHON -c "import irods.client_configuration as cfg
-cfg.legacy_auth.pam.password_for_auto_renew = '$ALICES_PAM_PASSWORD'
+cfg.legacy_auth.pam.password_for_auto_renew = '$ALICES_ORIGINAL_PAM_PASSWORD'
 cfg.legacy_auth.pam.time_to_live_in_hours = 1
 cfg.legacy_auth.pam.store_password_to_environment = True
 $SCRIPT")
 
+    # Test assertion: Python script has 
+    [ -e $AUTH_FILE ]
+    [[ $OUTPUT = "env_auth_scheme=pam"* ]]
+
     SECRETS_0=$(cat $AUTH_FILE)
-    STAT_0=$(stat -c%y $AUTH_FILE)
+    STAT_0=$(stat -c%Y $AUTH_FILE)
+
+    # -----
 
     sleep 1.1
 
     # Second invocation.  PRC will use previously generated secrets from the auth file generated in the first invocation.
     OUTPUT=$($PYTHON -c "import irods.client_configuration as cfg
-#cfg.legacy_auth.pam.password_for_auto_renew = '$ALICES_PAM_PASSWORD'
-cfg.legacy_auth.pam.time_to_live_in_hours = 1
-cfg.legacy_auth.pam.store_password_to_environment = True
 $SCRIPT")
 
     SECRETS_1=$(cat $AUTH_FILE)
-    STAT_1=$(stat -c%y $AUTH_FILE)
+    STAT_1=$(stat -c%Y $AUTH_FILE)
 
     # Test assertion: authentication file is the same, before and after, with identical modification date and contents.
     [ "$STAT_1" = "$STAT_0" ]
     [ "$SECRETS_0" = "$SECRETS_1" ]
 
+    [[ $OUTPUT = "env_auth_scheme=pam"* ]]
+
+    # -----
+
+    age_out_pam_password "alice"
+    sudo chpasswd <<< "alice:$ALICES_NEW_PASSWORD"
+
+    # Third invocation.  PRC will generate new auth file as TTL has run out.
+    OUTPUT=$($PYTHON -c "import irods.client_configuration as cfg
+cfg.legacy_auth.pam.password_for_auto_renew = '$ALICES_NEW_PASSWORD'
+cfg.legacy_auth.pam.time_to_live_in_hours = 1
+cfg.legacy_auth.pam.store_password_to_environment = True
+$SCRIPT")
+
+    # Assert .irodsA timestamp and contents have changed.
+    SECRETS_2=$(cat $AUTH_FILE)
+    STAT_2=$(stat -c%Y $AUTH_FILE)
+
+    [ "$STAT_2" -gt "$STAT_1" ]
+    [ "$SECRETS_2" != "$SECRETS_1" ]
+
     # Test assertion: authentication method is pam_password
-    [ $OUTPUT = "env_auth_scheme=pam_password" ]
+    [[ $OUTPUT = "env_auth_scheme=pam"* ]]
 }