This is an automated email from the ASF dual-hosted git repository.
lahirujayathilake pushed a commit to branch thrift-upgrade
in repository https://gitbox.apache.org/repos/asf/airavata-portals.git
The following commit(s) were added to refs/heads/thrift-upgrade by this push:
new 8767f64d2 pull the ca certificate path from settings_local.py and
updated the airavata python sdk version
8767f64d2 is described below
commit 8767f64d2ef8082047335993dad18ba1ccd21bf3
Author: lahiruj <[email protected]>
AuthorDate: Fri Jul 18 15:09:42 2025 -0400
pull the ca certificate path from settings_local.py and updated the
airavata python sdk version
---
airavata-django-portal/django_airavata/settings_local.py.ide | 3 +++
airavata-django-portal/django_airavata/settings_local.py.sample | 3 +++
airavata-django-portal/django_airavata/utils.py | 5 +++--
airavata-django-portal/requirements.txt | 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/airavata-django-portal/django_airavata/settings_local.py.ide
b/airavata-django-portal/django_airavata/settings_local.py.ide
index 2e4232136..8956ebfae 100644
--- a/airavata-django-portal/django_airavata/settings_local.py.ide
+++ b/airavata-django-portal/django_airavata/settings_local.py.ide
@@ -58,6 +58,9 @@ AUTHENTICATION_OPTIONS = {
# ]
}
+# Path to the CA certificates bundle for secure connections
+CA_CERTS_PATH = '/etc/ssl/certs/ca-certificates.crt'
+
# Airavata API Configuration
GATEWAY_ID = 'default'
AIRAVATA_API_HOST = 'localhost'
diff --git a/airavata-django-portal/django_airavata/settings_local.py.sample
b/airavata-django-portal/django_airavata/settings_local.py.sample
index c5e9cb806..d823c6dba 100644
--- a/airavata-django-portal/django_airavata/settings_local.py.sample
+++ b/airavata-django-portal/django_airavata/settings_local.py.sample
@@ -75,6 +75,9 @@ AUTHENTICATION_OPTIONS = {
# ]
}
+# Path to the CA certificates bundle for secure connections
+CA_CERTS_PATH = '/etc/ssl/certs/ca-certificates.crt'
+
# Airavata API Configuration
GATEWAY_ID = 'default'
AIRAVATA_API_HOST = 'localhost'
diff --git a/airavata-django-portal/django_airavata/utils.py
b/airavata-django-portal/django_airavata/utils.py
index 87fa540ef..343cea952 100644
--- a/airavata-django-portal/django_airavata/utils.py
+++ b/airavata-django-portal/django_airavata/utils.py
@@ -1,5 +1,6 @@
import logging
import ssl
+from django.conf import settings
from contextlib import contextmanager
import thrift_connector.connection_pool as connection_pool
@@ -50,7 +51,7 @@ def get_secure_transport(hostname, port):
hostname,
port,
cert_reqs=ssl.CERT_REQUIRED,
- ca_certs='/etc/ssl/certs/ca-certificates.crt',
+ ca_certs=settings.CA_CERTS_PATH,
)
return TTransport.TBufferedTransport(transport)
@@ -186,7 +187,7 @@ class CustomThriftClient(connection_pool.ThriftClient):
host,
port,
cert_reqs=ssl.CERT_REQUIRED,
- ca_certs='/etc/ssl/certs/ca-certificates.crt',
+ ca_certs=settings.CA_CERTS_PATH,
)
return factory
diff --git a/airavata-django-portal/requirements.txt
b/airavata-django-portal/requirements.txt
index 94f06ae7f..fae3e0066 100644
--- a/airavata-django-portal/requirements.txt
+++ b/airavata-django-portal/requirements.txt
@@ -25,7 +25,7 @@ grpcio==1.48.2 ; python_version < "3.7"
grpcio==1.51.1 ; python_version >= "3.7"
airavata-django-portal-sdk== 1.8.4
-airavata-python-sdk==2.1.5
+airavata-python-sdk==2.1.6
airavata-django-portal-commons==1.0.0
-e "."
