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