Merge remote-tracking branch 'remotes/origin/main' into 336-bug-accessing-spectralanalysismembersinternalforces-for-different-envelopes-not-possible

Author: Tomas.Pail@dlubal.com

RFEM/connectionGlobals.py

@@ -1,9 +1,12 @@
+
 url = "http://127.0.0.1"
 port = "8081"
 connected = False
+api_key = None
+verify = True # This can be a boolean or a path to a CA bundle file (in case of self-signed certificate it's required)
 
 # Is filled in the initModel
 client = None
 ca = None
 cacheLoc = ""
-session = None
+session = None

RFEM/initModel.py

@@ -2,6 +2,7 @@
 import sys
 import RFEM.dependencies # dependency check ahead of imports
 import socket
+import ssl
 import requests
 import xmltodict
 from urllib import request
@@ -29,10 +30,27 @@ def connectToServer(url=connectionGlobals.url, port=connectionGlobals.port):
     # local machine url format: 'http://127.0.0.1'
     urlAndPort = f'{url}:{port}'
 
-    # Check if port is listening
-    a_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    # Parse the hostname from the URL
+    if url.startswith('https://'):
+        hostname = url[8:]  # Remove 'https://'
+        context = ssl.create_default_context()
+        if isinstance(connectionGlobals.verify, str):
+            context.load_verify_locations(cafile=connectionGlobals.verify)
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        a_socket = context.wrap_socket(sock, server_hostname=hostname)
+        new_wsdl = request.urlopen(urlAndPort+'/wsdl', context=context)
+    elif url.startswith('http://'):
+        hostname = url[7:]  # Remove 'http://'
+        a_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        new_wsdl = request.urlopen(urlAndPort+'/wsdl')
+    else:
+        hostname = url
+        a_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        new_wsdl = request.urlopen(urlAndPort+'/wsdl')
 
-    location = (url[7:], int(port))
+    location = (hostname, int(port))
+
+    # Check if port is listening
     result_of_check = a_socket.connect_ex(location)
 
     if result_of_check == 0:
@@ -46,7 +64,7 @@ def connectToServer(url=connectionGlobals.url, port=connectionGlobals.port):
 
     # Delete old cache if the version or mode doesn't correlate
     connectionGlobals.cacheLoc = os.path.join(gettempdir(), 'WSDL')
-    new_wsdl = request.urlopen(urlAndPort+'/wsdl')
+
     new_wsdl_data = new_wsdl.read()
     new_wsdl.close()
     new_tns = xmltodict.parse(new_wsdl_data)['definitions']['@targetNamespace']
@@ -65,10 +83,15 @@ def connectToServer(url=connectionGlobals.url, port=connectionGlobals.port):
     # Check for issues locally and remotely
     try:
         connectionGlobals.ca = DocumentCache(location=connectionGlobals.cacheLoc)
-        connectionGlobals.client = Client(urlAndPort+'/wsdl', location = urlAndPort, cache=connectionGlobals.ca)
+        trans = RequestsTransport(
+            api_key=connectionGlobals.api_key,
+            session=connectionGlobals.session,
+            verify=connectionGlobals.verify
+        )
+        connectionGlobals.client = Client(urlAndPort+'/wsdl', location = urlAndPort, cache=connectionGlobals.ca, transport=trans)
         connectionGlobals.connected = True
 
-    except:
+    except Exception:
         print('Error: Connection to server failed!')
         print('Please check:')
         print('- If you have started RFEM application')
@@ -82,7 +105,7 @@ def connectToServer(url=connectionGlobals.url, port=connectionGlobals.port):
 
     try:
         modelLst = connectionGlobals.client.service.get_model_list()
-    except:
+    except Exception:
         print('Error: Please check if all RFEM dialogs are closed.')
         input('Press Enter to exit...')
         sys.exit()
@@ -169,7 +192,12 @@ def __init__(self,
                 connectionGlobals.session = requests.Session()
                 adapter = requests.adapters.HTTPAdapter(pool_connections=1, pool_maxsize=1)
                 connectionGlobals.session.mount('http://', adapter)
-                trans = RequestsTransport(connectionGlobals.session)
+                connectionGlobals.session.mount('https://', adapter)
+                trans = RequestsTransport(
+                    api_key=connectionGlobals.api_key,
+                    session = connectionGlobals.session,
+                    verify=connectionGlobals.verify
+                )
 
                 cModel = Client(modelCompletePath, transport=trans, location = modelUrlPort, cache=connectionGlobals.ca, timeout=360)
 
@@ -201,7 +229,12 @@ def __init__(self,
                 connectionGlobals.session = requests.Session()
                 adapter = requests.adapters.HTTPAdapter(pool_connections=1, pool_maxsize=1)
                 connectionGlobals.session.mount('http://', adapter)
-                trans = RequestsTransport(connectionGlobals.session)
+                connectionGlobals.session.mount('https://', adapter)
+                trans = RequestsTransport(
+                    api_key=connectionGlobals.api_key,
+                    session = connectionGlobals.session,
+                    verify=connectionGlobals.verify
+                )
 
                 cModel = Client(modelCompletePath, transport=trans, location = modelUrlPort, cache=connectionGlobals.ca, timeout=360)
             elif model_name == "":
@@ -213,7 +246,12 @@ def __init__(self,
                 connectionGlobals.session = requests.Session()
                 adapter = requests.adapters.HTTPAdapter(pool_connections=1, pool_maxsize=1)
                 connectionGlobals.session.mount('http://', adapter)
-                trans = RequestsTransport(connectionGlobals.session)
+                connectionGlobals.session.mount('https://', adapter)
+                trans = RequestsTransport(
+                    api_key=connectionGlobals.api_key,
+                    session = connectionGlobals.session,
+                    verify=connectionGlobals.verify
+                )
 
                 cModel = Client(modelCompletePath, transport=trans, location = modelUrlPort, cache=connectionGlobals.ca, timeout=360)
             else:

RFEM/suds_requests.py

@@ -46,25 +46,31 @@ def wrapper(*args, **kwargs):
 
 
 class RequestsTransport(transport.Transport):
-    def __init__(self, session=None):
+    def __init__(self, session=None, api_key=None, verify=True):
         transport.Transport.__init__(self)
         self._session = session or requests.Session()
+        self.api_key = api_key
+        self.verify = verify
 
     @handle_errors
     def open(self, request):
-        resp = self._session.get(request.url)
+        headers = {'Authorization': f'Bearer {self.api_key}'} if self.api_key else {}
+        resp = self._session.get(request.url, headers=headers, verify=self.verify)
         resp.raise_for_status()
         return BytesIO(resp.content)
 
     @handle_errors
     def send(self, request):
+        headers = request.headers
+        if self.api_key:
+            headers['Authorization'] = f'Bearer {self.api_key}'
         resp = self._session.post(
             request.url,
             data=request.message,
-            headers=request.headers,
+            headers=headers,
+            verify=self.verify,
         )
-        if resp.headers.get('content-type') not in ('text/xml',
-                                                    'application/soap+xml'):
+        if resp.headers.get('content-type') not in ('text/xml','application/soap+xml'):
             resp.raise_for_status()
         return transport.Reply(
             resp.status_code,

UnitTests/test_DesignOverview.py

@@ -1,5 +1,6 @@
 import sys
 import os
+import pytest
 PROJECT_ROOT = os.path.abspath(os.path.join(
                   os.path.dirname(__file__),
                   os.pardir)
@@ -8,6 +9,7 @@
 
 from RFEM.enums import AddOn
 from RFEM.initModel import Model, SetAddonStatus, getPathToRunningRFEM
+from RFEM.connectionGlobals import url
 from RFEM.Results.designOverview import GetDesignOverview, GetPartialDesignOverview
 from RFEM.Reports.partsList import GetPartsListAllByMaterial, GetPartsListMemberRepresentativesByMaterial
 from RFEM.Reports.partsList import GetPartsListMemberSetsByMaterial, GetPartsListMembersByMaterial
@@ -16,6 +18,10 @@
 if Model.clientModel is None:
     Model()
 
+@pytest.mark.skipif(url != 'http://127.0.0.1', reason="This test fails on remote PC due to incorrect file path. \
+                    Althought it is easy to change, it would not be easy to update on every remote computer.\
+                    It is not necessary to evaluate Client as functional. Localy this tests still gets executed.")
+
 def test_designOverview():
 
     Model.clientModel.service.delete_all()

UnitTests/test_Export.py

@@ -18,6 +18,9 @@
 if Model.clientModel is None:
     Model()
 
+@pytest.mark.skipif(connectionGlobals.url != 'http://127.0.0.1', reason="This test fails on remote PC due to incorrect file paths. \
+                    Althought it is easy to change, it would not be easy to update on every remote computer.\
+                    It is not necessary to evaluate Client as functional. Localy this tests still gets executed.")
 def test_export():
 
     Model.clientModel.service.delete_all()
@@ -89,4 +92,4 @@ def test_import():
 
     #assert getSAFSettings().property_general_run_excel_application == False
     assert getSAFSettings().property_export_saf_version == '1_0_5'
-    assert getSAFSettings().property_import_show_conversion_tables_after_import == False
+    assert getSAFSettings().property_import_show_conversion_tables_after_import == False

UnitTests/test_GetAllObjects.py

@@ -6,11 +6,16 @@
 )
 sys.path.append(PROJECT_ROOT)
 from RFEM.initModel import Model, getPathToRunningRFEM
+from RFEM.connectionGlobals import url
 from RFEM.Tools.GetObjectNumbersByType import GetAllObjects
+import pytest
 
 if Model.clientModel is None:
     Model()
 
+@pytest.mark.skipif(url != 'http://127.0.0.1', reason="This test fails on remote PC due to incorrect file path. \
+                    Althought it is easy to change, it would not be easy to update on every remote computer.\
+                    It is not necessary to evaluate Client as functional. Localy this tests still gets executed.")
 def test_GetAllObjects():
 
     Model.clientModel.service.delete_all()

UnitTests/test_GlobalParameters_Test.py

@@ -13,6 +13,8 @@
 from RFEM.enums import GlobalParameterUnitGroup, GlobalParameterDefinitionType, ObjectTypes
 from RFEM.globalParameter import GlobalParameter
 from RFEM.initModel import Model, getPathToRunningRFEM
+from RFEM.connectionGlobals import url
+import pytest
 
 if Model.clientModel is None:
     Model()
@@ -79,6 +81,10 @@ def test_global_parameters():
     assert gp_2.steps == 4
     assert gp_2.unit_group == 'LOADS_DENSITY'
 
+
+@pytest.mark.skipif(url != 'http://127.0.0.1', reason="This test fails on remote PC due to incorrect file path. \
+                    Althought it is easy to change, it would not be easy to update on every remote computer.\
+                    It is not necessary to evaluate Client as functional. Localy this tests still gets executed.")
 def test_set_and_get_formula():
 
     Model.clientModel.service.delete_all()

UnitTests/test_Reports.py

@@ -16,7 +16,6 @@
 if Model.clientModel is None:
     Model()
 
-
 @pytest.mark.skipif(url != 'http://127.0.0.1', reason="This test fails on remote PC due to incorrect file path. \
                     Althought it is easy to change, it would not be easy to update on every remote computer.\
                     It is not necessary to evaluate Client as functional. Localy this tests still gets executed.")
@@ -34,6 +33,9 @@ def test_html_report():
 
     assert os.path.exists(folderPath)
 
+@pytest.mark.skipif(url != 'http://127.0.0.1', reason="This test fails on remote PC due to incorrect file path. \
+                    Althought it is easy to change, it would not be easy to update on every remote computer.\
+                    It is not necessary to evaluate Client as functional. Localy this tests still gets executed.")
 def test_printout_report():
     # Remove any previous results if they exist
     dirname = os.path.join(os.getcwd(), os.path.dirname(__file__))

UnitTests/test_ResultTables.py

@@ -9,12 +9,16 @@
 )
 sys.path.append(PROJECT_ROOT)
 from RFEM.initModel import Model, getPathToRunningRFEM
+from RFEM.connectionGlobals import url
 from RFEM.enums import CaseObjectType
 from RFEM.Results.resultTables import ResultTables
 
 if Model.clientModel is None:
     Model()
 
+@pytest.mark.skipif(url != 'http://127.0.0.1', reason="This test fails on remote PC due to incorrect file path. \
+                    Althought it is easy to change, it would not be easy to update on every remote computer.\
+                    It is not necessary to evaluate Client as functional. Localy this tests still gets executed.")
 def test_result_tables():
     Model.clientModel.service.delete_all()
     Model.clientModel.service.run_script(os.path.join(getPathToRunningRFEM(),'scripts\\internal\\Demos\\Demo-004 Bus Station-Concrete Design.js'))

UnitTests/test_SectionDialogue.py

@@ -7,13 +7,18 @@
 sys.path.append(PROJECT_ROOT)
 
 from RFEM.initModel import Model
+from RFEM.connectionGlobals import url
 from RFEM.Tools.sectionDialogue import *
 from RFEM.BasicObjects.section import Section
 from RFEM.BasicObjects.material import Material
+import pytest
 
 if Model.clientModel is None:
     Model()
 
+@pytest.mark.skipif(url != 'http://127.0.0.1', reason="This test fails on remote PC due to incorrect file path. \
+                    Althought it is easy to change, it would not be easy to update on every remote computer.\
+                    It is not necessary to evaluate Client as functional. Localy this tests still gets executed.")
 def test_section_dialogue():
 
     Model.clientModel.service.delete_all()