X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5a9684ac02fb535d1ad5cc80a6390d758415d0d5..97374cec874aaaaeb92eeb962bf580bdba199be9:/sdk/pam/arvados_pam.py

diff --git a/sdk/pam/arvados_pam.py b/sdk/pam/arvados_pam.py
index bc65b06294..b38e54f046 100644
--- a/sdk/pam/arvados_pam.py
+++ b/sdk/pam/arvados_pam.py
@@ -16,28 +16,29 @@ 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:
-        auth_log("libpam_arvados could not dertermine vm uuid for '%s'" % hostname)
+        auth_log("libpam_arvados could not determine vm uuid for '%s'" % hostname)
         return False
 
     this_vm_uuid = matches[0]['uuid']