WIP

dchristidis · Apr 9, 2024 · 6c38031 · 6c38031
1 parent ef17958
commit 6c38031
Showing 1 changed file with 0 additions and 17 deletions.
diff --git a/lib/rucio/transfertool/fts3.py b/lib/rucio/transfertool/fts3.py
@@ -844,15 +844,12 @@ def __init__(self, external_host, oidc_account=None, oidc_support: bool = False,
         if self.external_host.startswith('https://'):
             if self.token:
                 self.cert = None
-                self.verify = False
                 self.headers['Authorization'] = 'Bearer ' + self.token
             else:
                 cert = _pick_cert_file(vo=vo)
                 self.cert = (cert, cert)
-                self.verify = False
         else:
             self.cert = None
-            self.verify = True  # True is the default setting of a requests.* method
 
         self.scitags_exp_id, self.scitags_activity_ids = _scitags_ids(logger=logger)
 
@@ -1026,7 +1023,6 @@ def submit(self, transfers, job_params, timeout=None):
         stopwatch = Stopwatch()
         try:
             post_result = requests.post('%s/jobs' % self.external_host,
-                                        verify=self.verify,
                                         cert=self.cert,
                                         data=params_str,
                                         headers=self.headers,
@@ -1075,7 +1071,6 @@ def cancel(self, transfer_ids, timeout=None):
         job = None
 
         job = requests.delete('%s/jobs/%s' % (self.external_host, transfer_id),
-                              verify=self.verify,
                               cert=self.cert,
                               headers=self.headers,
                               timeout=timeout)
@@ -1102,7 +1097,6 @@ def update_priority(self, transfer_id, priority, timeout=None):
         params_str = json.dumps(params_dict, cls=APIEncoder)
 
         job = requests.post('%s/jobs/%s' % (self.external_host, transfer_id),
-                            verify=self.verify,
                             data=params_str,
                             cert=self.cert,
                             headers=self.headers,
@@ -1135,7 +1129,6 @@ def query(self, transfer_ids, details=False, timeout=None):
         job = None
 
         job = requests.get('%s/jobs/%s' % (self.external_host, transfer_id),
-                           verify=self.verify,
                            cert=self.cert,
                            headers=self.headers,
                            timeout=timeout)  # TODO Set to 5 in conveyor
@@ -1158,7 +1151,6 @@ def whoami(self):
         get_result = None
 
         get_result = requests.get('%s/whoami' % self.external_host,
-                                  verify=self.verify,
                                   cert=self.cert,
                                   headers=self.headers)
 
@@ -1179,7 +1171,6 @@ def version(self):
         get_result = None
 
         get_result = requests.get('%s/' % self.external_host,
-                                  verify=self.verify,
                                   cert=self.cert,
                                   headers=self.headers)
 
@@ -1202,7 +1193,6 @@ def bulk_query(self, requests_by_eid, timeout=None):
         fts_session = requests.Session()
         xfer_ids = ','.join(requests_by_eid)
         jobs = fts_session.get('%s/jobs/%s?files=file_state,dest_surl,finish_time,start_time,staging_start,staging_finished,reason,source_surl,file_metadata' % (self.external_host, xfer_ids),
-                               verify=self.verify,
                                cert=self.cert,
                                headers=self.headers,
                                timeout=timeout)
@@ -1238,7 +1228,6 @@ def list_se_status(self):
 
         try:
             result = requests.get('%s/ban/se' % self.external_host,
-                                  verify=self.verify,
                                   cert=self.cert,
                                   headers=self.headers,
                                   timeout=None)
@@ -1257,7 +1246,6 @@ def get_se_config(self, storage_element):
 
         try:
             result = requests.get('%s/config/se' % (self.external_host),
-                                  verify=self.verify,
                                   cert=self.cert,
                                   headers=self.headers,
                                   timeout=None)
@@ -1316,7 +1304,6 @@ def set_se_config(self, storage_element, inbound_max_active=None, outbound_max_a
 
         try:
             result = requests.post('%s/config/se' % (self.external_host),
-                                   verify=self.verify,
                                    cert=self.cert,
                                    data=params_str,
                                    headers=self.headers,
@@ -1355,7 +1342,6 @@ def set_se_status(self, storage_element, message, ban=True, timeout=None):
         if ban:
             try:
                 result = requests.post('%s/ban/se' % self.external_host,
-                                       verify=self.verify,
                                        cert=self.cert,
                                        data=params_str,
                                        headers=self.headers,
@@ -1369,7 +1355,6 @@ def set_se_status(self, storage_element, message, ban=True, timeout=None):
 
             try:
                 result = requests.delete('%s/ban/se?storage=%s' % (self.external_host, storage_element),
-                                         verify=self.verify,
                                          cert=self.cert,
                                          data=params_str,
                                          headers=self.headers,
@@ -1403,7 +1388,6 @@ def __get_transfer_baseid_voname(self):
                 get_result = None
                 try:
                     get_result = requests.get('%s/whoami' % self.external_host,
-                                              verify=self.verify,
                                               cert=self.cert,
                                               headers=self.headers,
                                               timeout=5)
@@ -1500,7 +1484,6 @@ def __query_details(self, transfer_id: Optional[dict[str, Any]]) -> Optional[str
         files = None
 
         files = requests.get('%s/jobs/%s/files' % (self.external_host, transfer_id),
-                             verify=self.verify,
                              cert=self.cert,
                              headers=self.headers,
                              timeout=5)