script_run: Check that credentials are not override value (iss #16)

UAL-RE · Mar 5, 2020 · bdb6cb3 · bdb6cb3
1 parent dd202e4
commit bdb6cb3
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/DataRepository_patrons/script_run b/DataRepository_patrons/script_run
@@ -46,14 +46,16 @@ if __name__ == '__main__':
 
         if (p in vargs) and (vargs[p] is not None):
             vargs[p] = vargs[p]
-        elif (p in config['global']) and (config['global'][p] is not None):
+        elif (p in config['global']) and (config['global'][p] is not None) and \
+                (config['global'][p] != "***override***"):
             vargs[p] = config['global'][p]
         else:
             vargs[p] = '(unset)'
 
-        if p in ['ldap_password', 'grouper_password']:
+        if p in ['ldap_user', 'ldap_password', 'grouper_user', 'grouper_password']:
             if vargs[p] is '(unset)':
                 print('    %s = (unset)', p)
+                cred_err += 1
             else:
                 print('    %s = (set)', p)
         else: