YDA-3680: add config option to verify the certificate of the EUS API.

UtrechtUniversity · Jul 26, 2023 · 920eadd · 920eadd
1 parent eb1e937
commit 920eadd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/groups.py b/groups.py
@@ -876,9 +876,10 @@ def provisionExternalUser(ctx, username, creatorUser, creatorZone):
 
     :returns: Response status code
     """
-    eus_api_fqdn   = config.eus_api_fqdn
-    eus_api_port   = config.eus_api_port
-    eus_api_secret = config.eus_api_secret
+    eus_api_fqdn       = config.eus_api_fqdn
+    eus_api_port       = config.eus_api_port
+    eus_api_secret     = config.eus_api_secret
+    eus_api_tls_verify = config.eus_api_tls_verify
 
     url = 'https://' + eus_api_fqdn + ':' + eus_api_port + '/api/user/add'
 
@@ -892,7 +893,7 @@ def provisionExternalUser(ctx, username, creatorUser, creatorZone):
                                  headers={'X-Yoda-External-User-Secret':
                                           eus_api_secret},
                                  timeout=10,
-                                 verify=False)
+                                 verify=eus_api_tls_verify)
     except requests.ConnectionError or requests.ConnectTimeout:
         return -1
 
@@ -945,9 +946,10 @@ def removeExternalUser(ctx, username, userzone):
 
     :returns: Response status code
     """
-    eus_api_fqdn   = config.eus_api_fqdn
-    eus_api_port   = config.eus_api_port
-    eus_api_secret = config.eus_api_secret
+    eus_api_fqdn       = config.eus_api_fqdn
+    eus_api_port       = config.eus_api_port
+    eus_api_secret     = config.eus_api_secret
+    eus_api_tls_verify = config.eus_api_tls_verify
 
     url = 'https://' + eus_api_fqdn + ':' + eus_api_port + '/api/user/delete'
 
@@ -959,7 +961,7 @@ def removeExternalUser(ctx, username, userzone):
                              headers={'X-Yoda-External-User-Secret':
                                       eus_api_secret},
                              timeout=10,
-                             verify=False)
+                             verify=eus_api_tls_verify)
 
     return str(response.status_code)
 

diff --git a/rules_uu.cfg.template b/rules_uu.cfg.template
@@ -32,6 +32,7 @@ datacite_password              =
 eus_api_fqdn                   =
 eus_api_port                   =
 eus_api_secret                 =
+eus_api_tls_verify             =
 
 enable_deposit                 =
 enable_open_search             =

diff --git a/util/config.py b/util/config.py
@@ -95,6 +95,7 @@ def __repr__(self):
                 eus_api_fqdn=None,
                 eus_api_port=None,
                 eus_api_secret=None,
+                eus_api_tls_verify=True,
                 enable_deposit=False,
                 enable_open_search=False,
                 enable_intake=False,