aaredb: https in image requests
This commit is contained in:
+15
-4
@@ -67,6 +67,10 @@ class AareWrapper:
|
||||
self.__raster_api = aareDB.GridscanRunnerApi(self.client)
|
||||
self.__bl = bl
|
||||
|
||||
self.__ssl_ca_cert = configuration.ssl_ca_cert
|
||||
self.__cert_file = configuration.cert_file
|
||||
self.__key_file = configuration.key_file
|
||||
|
||||
def set_pucks_beamline(self, input_list: List[PuckLoadedInfo]):
|
||||
o = []
|
||||
|
||||
@@ -207,7 +211,8 @@ class AareWrapper:
|
||||
|
||||
request_kwargs = {
|
||||
"files": {'uploaded_file': (filename + ".jpg", jpeg_bytes, "image/jpeg")},
|
||||
"verify": False,
|
||||
"verify": self.__ssl_ca_cert,
|
||||
"cert": (self.__cert_file, self.__key_file),
|
||||
"headers": headers,
|
||||
}
|
||||
if message is not None:
|
||||
@@ -225,7 +230,9 @@ class AareWrapper:
|
||||
}
|
||||
response = requests.post(url,
|
||||
files={'uploaded_file': (filename + ".jpg", jpg_image, "image/jpeg")},
|
||||
verify=False, headers=headers)
|
||||
verify=self.__ssl_ca_cert,
|
||||
cert=(self.__cert_file, self.__key_file),
|
||||
headers=headers)
|
||||
logger.debug(f"Response status code: {response.status_code}")
|
||||
|
||||
def create_rotation_run(self, s: Optional[SampleShortInfo], r:RotationScanRequest, d:DAQStatusModel):
|
||||
@@ -386,7 +393,9 @@ class AareWrapper:
|
||||
}
|
||||
response = requests.post(url,
|
||||
auth=(os.getenv("AAREDB_USERNAME"), os.getenv("AAREDB_PASSWORD")),
|
||||
headers=headers, data=json.dumps(payload), timeout=30, verify=False)
|
||||
headers=headers, data=json.dumps(payload), timeout=30,
|
||||
verify=self.__ssl_ca_cert,
|
||||
cert=(self.__cert_file, self.__key_file))
|
||||
response.raise_for_status()
|
||||
|
||||
logger.info(f"Response status code: {response.status_code}")
|
||||
@@ -453,7 +462,9 @@ class AareWrapper:
|
||||
}
|
||||
response = requests.post(url,
|
||||
auth=(os.getenv("AAREDB_USERNAME"), os.getenv("AAREDB_PASSWORD")),
|
||||
headers=headers, data=json.dumps(payload), timeout=30, verify=False)
|
||||
headers=headers, data=json.dumps(payload), timeout=30,
|
||||
verify=self.__ssl_ca_cert,
|
||||
cert=(self.__cert_file, self.__key_file))
|
||||
response.raise_for_status()
|
||||
|
||||
logger.info(f"Response status code: {response.status_code}")
|
||||
|
||||
Reference in New Issue
Block a user