Browse Source

Adding user name checking in config init

Andrej 4 years ago
parent
commit
c63163f6ef
1 changed files with 24 additions and 5 deletions
  1. 24 5
      labkeyBrowser/slicerNetwork.py

+ 24 - 5
labkeyBrowser/slicerNetwork.py

@@ -258,7 +258,10 @@ class labkeyURIHandler(slicer.vtkURIHandler):
             return self.http.request('HEAD',url,headers=headers)
         except urllib3.exceptions.HTTPError as e:
             print(e)
-            return e
+            response=DummyResponse()
+            response.status=1000
+            response.data=str(e)
+            return response
 
 
 
@@ -276,7 +279,10 @@ class labkeyURIHandler(slicer.vtkURIHandler):
         #f contains json as a return value
         except urllib3.exceptions.HTTPError as e:
             print(e)
-            return e
+            response=DummyResponse()
+            response.status=1000
+            response.data=str(e)
+            return response
 
 
     def put(self,url,data):
@@ -297,7 +303,10 @@ class labkeyURIHandler(slicer.vtkURIHandler):
         #f contains json as a return value
         except urllib3.exceptions.HTTPError as e:
             print(e)
-            return e
+            response=DummyResponse()
+            response.status=1000
+            response.data=str(e)
+            return response
     
     def sendRequest(self,url,requestCode):
 
@@ -312,7 +321,10 @@ class labkeyURIHandler(slicer.vtkURIHandler):
         #f contains json as a return value
         except urllib3.exceptions.HTTPError as e:
             print(e)
-            return e
+            response=DummyResponse()
+            response.status=1000
+            response.data=str(e)
+            return response
     
     def mkcol(self,url):
         return self.sendRequest(url,'MKCOL')
@@ -334,7 +346,10 @@ class labkeyURIHandler(slicer.vtkURIHandler):
         #f contains json as a return value
         except urllib3.exceptions.HTTPError as e:
             print(e)
-            return e
+            response=DummyResponse()
+            response.status=1000
+            response.data=str(e)
+            return response
 
     @staticmethod 
     def HTTPStatus(response,method=None):
@@ -364,6 +379,10 @@ class labkeyURIHandler(slicer.vtkURIHandler):
         #local cookie jar
         self.cookie=response.getheader('Set-Cookie')
         print("CSRF: {}".format(jsonData["CSRF"]))
+        user=jsonData['email']
+        if not user==self.connectionConfig['labkey']['user']:
+            print("User mismatch: {}/{}".format(user,self.connectionConfig['labkey']['user']))
+            return None
         return jsonData["CSRF"]