tagreader 5.0.0__tar.gz → 5.1.1__tar.gz

{tagreader-5.0.0 → tagreader-5.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tagreader
-Version: 5.0.0
+Version: 5.1.1
 Summary: Tagreader is a Python package for reading trend data from the OSIsoft PI and Aspen Infoplus.21 IMS systems.
 Home-page: https://github.com/equinor/tagreader-python
 License: MIT
@@ -21,21 +21,16 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Scientific/Engineering :: Interface Engine/Protocol Translator
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Provides-Extra: notebooks
 Requires-Dist: certifi (>=2023.7.22,<2024.0.0)
-Requires-Dist: cryptography (>=41.0.3,<42.0.0)
 Requires-Dist: diskcache (>=5.6.1,<6.0.0)
 Requires-Dist: matplotlib (>=3,<4) ; extra == "notebooks"
 Requires-Dist: notebook (>=7.0.3,<8.0.0) ; extra == "notebooks"
 Requires-Dist: pandas (>=1)
-Requires-Dist: pyodbc (>=4,<5)
 Requires-Dist: requests (>=2,<3)
 Requires-Dist: requests-kerberos (>=0,<1)
 Project-URL: Repository, https://github.com/equinor/tagreader-python

{tagreader-5.0.0 → tagreader-5.1.1}/pyproject.toml

@@ -1,8 +1,8 @@
 [tool.poetry]
 name = "tagreader"
-version = "5.0.0"
+version = "5.1.1"
 description = "Tagreader is a Python package for reading trend data from the OSIsoft PI and Aspen Infoplus.21 IMS systems."
-authors = ["Einar S. Idsø <eiids@equinor.com>"]
+authors = ["Einar S. Idsø <eiids@equinor.com>", "Morten Dæhli Aslesen <masl@equinor.com"]
 license = "MIT"
 readme = "README.md"
 packages = [{include = "tagreader"}]
@@ -30,8 +30,6 @@ classifiers=[
 [tool.poetry.dependencies]
 python = "^3.8"
 pandas = ">=1"
-pyodbc = "^4"
-cryptography = "^41.0.3"
 certifi = "^2023.7.22"
 requests = "^2"
 requests-kerberos = "^0"

{tagreader-5.0.0 → tagreader-5.1.1}/tagreader/utils.py

@@ -130,6 +130,10 @@ class ReaderType(enum.IntEnum):
 
 
 def add_statoil_root_certificate() -> bool:
+    return add_equinor_root_certificate(True) and add_equinor_root_certificate(False)
+
+
+def add_equinor_root_certificate(get_equinor: bool = True) -> bool:
     """
     This is a utility function for Equinor employees on Equinor managed machines.
 
@@ -137,7 +141,8 @@ def add_statoil_root_certificate() -> bool:
     cert store and imports it to the cacert bundle. Does nothing if not
     running on Equinor host.
 
-    This needs to be repeated after updating the cacert module.
+    NB! This needs to be repeated after updating the cacert module.
+    NB! Will not download certificates.
 
     Returns:
         bool: True if function completes successfully
@@ -148,6 +153,14 @@ def add_statoil_root_certificate() -> bool:
     import certifi
 
     STATOIL_ROOT_PEM_HASH = "ce7bb185ab908d2fea28c7d097841d9d5bbf2c76"
+    EQUINOR_root_PEM_HASH = "5A206332CE73CED1D44C8A99C4C43B7CEE03DF5F"
+
+    if get_equinor:
+        used_hash = EQUINOR_root_PEM_HASH.upper()
+        ca_search = "Equinor Root CA"
+    else:
+        used_hash = STATOIL_ROOT_PEM_HASH.upper()
+        ca_search = "Statoil Root CA"
 
     found = False
     der = None
@@ -158,7 +171,7 @@ def add_statoil_root_certificate() -> bool:
         logger.debug("Scanning CA certificate in Windows cert store", end="")
         for cert in ssl.enum_certificates("CA"):
             der = cert[0]
-            if hashlib.sha1(der).hexdigest() == STATOIL_ROOT_PEM_HASH:
+            if hashlib.sha1(der).hexdigest().upper() == used_hash:
                 found = True
                 logger.debug("CA certificate found!")
                 break
@@ -166,14 +179,14 @@ def add_statoil_root_certificate() -> bool:
         import subprocess
 
         macos_ca_certs = subprocess.run(
-            ["security", "find-certificate", "-a", "-c", "Statoil Root CA", "-Z"],
+            ["security", "find-certificate", "-a", "-c", ca_search, "-Z"],
             stdout=subprocess.PIPE,
         ).stdout
 
-        if STATOIL_ROOT_PEM_HASH.upper() in str(macos_ca_certs).upper():
+        if used_hash in str(macos_ca_certs).upper():
             c = get_macos_equinor_certificates()
             for cert in c:
-                if hashlib.sha1(cert).hexdigest() == STATOIL_ROOT_PEM_HASH:
+                if hashlib.sha1(cert).hexdigest().upper() == used_hash:
                     der = cert
                     found = True
                     break
@@ -196,18 +209,24 @@ def add_statoil_root_certificate() -> bool:
     return found
 
 
-def get_macos_equinor_certificates():
+def get_macos_equinor_certificates(get_equinor: bool = True):
     import ssl
     import tempfile
 
+    if get_equinor:
+        ca_search = "Equinor Root CA"
+    else:
+        ca_search = "Statoil Root CA"
+
     ctx = ssl.create_default_context()
     macos_ca_certs = subprocess.run(
-        ["security", "find-certificate", "-a", "-c", "Statoil Root CA", "-p"],
+        ["security", "find-certificate", "-a", "-c", ca_search, "-p"],
         stdout=subprocess.PIPE,
     ).stdout
-    with tempfile.NamedTemporaryFile("w+b") as tmp_file:
+    with tempfile.NamedTemporaryFile("w+b", delete=False) as tmp_file:
         tmp_file.write(macos_ca_certs)
-        ctx.load_verify_locations(tmp_file.name)
+
+    ctx.load_verify_locations(tmp_file.name)
 
     return ctx.get_ca_certs(binary_form=True)