Merge branch 'git-commit-debug' of https://github.com/wtsi-hgi/arvados

[arvados.git] / sdk / pam / arvados_pam.py

diff --git a/sdk/pam/arvados_pam.py b/sdk/pam/arvados_pam.py
index 9fe1657f7a70fba2635e890edd54b6d5cb41e978..b38e54f0460bdad0f004584d5cc0fcd6be88afec 100644 (file)
--- a/sdk/pam/arvados_pam.py
+++ b/sdk/pam/arvados_pam.py
@@ -16,24 +16,25 @@ def check_arvados_token(requested_username, token):
     auth_log("%s %s" % (requested_username, token))
 
     try:
-       f=file('/etc/default/arvados_pam')
-       config=dict([l for l in f.readlines() if not l.startswith('#') or l.strip()==""])
-       arvados_api_host=config['ARVADOS_API_HOST'].strip()
-       hostname=config['HOSTNAME'].strip()
+        f=file('/etc/default/arvados_pam')
+        config=dict([l.split('=') for l in f.readlines() if not l.startswith('#') or l.strip()==""])
+        arvados_api_host=config['ARVADOS_API_HOST'].strip()
+        hostname=config['HOSTNAME'].strip()
     except Exception as e:
-       auth_log("problem getting default values" % (str(e)))
+        auth_log("problem getting default values  %s" % e)
+        return False
 
     try:
-       arv = arvados.api('v1',host=arvados_api_host, token=token, cache=None)
+        arv = arvados.api('v1',host=arvados_api_host, token=token, cache=None)
     except Exception as e:
-       auth_log(str(e))
-       return False
+        auth_log(str(e))
+        return False
 
     try:
-       matches = arv.virtual_machines().list(filters=[['hostname','=',hostname]]).execute()['items']
+        matches = arv.virtual_machines().list(filters=[['hostname','=',hostname]]).execute()['items']
     except Exception as e:
-       auth_log(str(e))
-       return False
+        auth_log(str(e))
+        return False
 
 
     if len(matches) != 1: