utf-queue-client 1.20.1b3__tar.gz → 1.21.0__tar.gz

{utf_queue_client-1.20.1b3 → utf_queue_client-1.21.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utf-queue-client
-Version: 1.20.1b3
+Version: 1.21.0
 Summary: No description provided
 Author-email: Joe Savage <joe.savage@silabs.com>
 Keywords: UTF

{utf_queue_client-1.20.1b3 → utf_queue_client-1.21.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "utf-queue-client"
-version = "1.20.1b3"
+version = "1.21.0"
 description = "No description provided"
 authors = [
     { name = "Joe Savage", email = "joe.savage@silabs.com" }

utf_queue_client-1.21.0/test/Dockerfile.script_test

@@ -0,0 +1,14 @@
+FROM python:3.8
+
+RUN apt update && apt install -y curl
+WORKDIR /usr/share/ca-certificates
+COPY test/silabs-root.pem ./silabs/silabs-root.crt
+COPY test/silabs-intermediate.pem ./silabs/silabs-intermediate.crt
+RUN curl --fail -k https://vault.dev.silabs.net/v1/pki/ca/pem -o ./silabs/silabs-net-dev.crt && \
+    curl --fail -k https://vault.silabs.net/v1/pki/ca/pem -o ./silabs/silabs-net-prod.crt && \
+    echo "silabs/silabs-net-dev.crt" >> /etc/ca-certificates.conf && \
+    echo "silabs/silabs-net-prod.crt" >> /etc/ca-certificates.conf && \
+    echo "silabs/silabs-root.crt" >> /etc/ca-certificates.conf && \
+    echo "silabs/silabs-intermediate.crt" >> /etc/ca-certificates.conf && \
+    /usr/sbin/update-ca-certificates
+

utf_queue_client-1.21.0/test/silabs-intermediate.pem

@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+MIIGGDCCBACgAwIBAgITEgAAAALXYiSfwSS0zwAAAAAAAjANBgkqhkiG9w0BAQsF
+ADAVMRMwEQYDVQQDEwpTTCBSb290IENBMB4XDTIxMTEwMTE1MDMwNFoXDTMxMTEw
+MTE1MTMwNFowSjETMBEGCgmSJomT8ixkARkWA2NvbTEWMBQGCgmSJomT8ixkARkW
+BnNpbGFiczEbMBkGA1UEAxMSU0wgRW50ZXJwcmlzZSBDQTAxMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAoL4EiGTUDxl5GMPrU/Nujud9iAVWh+8p/yHy
+v+aVRAh2R5XbVgIFLbQCdyHXf4CsGnFh1GBw5zHJfq7RhuZuJH+AD8EgxmDsUM7T
+JVq3bCKmS46PMvxWoUb+oG4V8bg0c/PkOtTiRjGsUh/gkq90hT+2L0nfORQWHTat
+OCg7hjGvmEGedw03AUnrUkJJjVZazGSjMANbrcTbWDYDBVc9LJbV5OJUQGjp9sc7
+qPgaL7bjzaziGfakZDArKNMQ5OG215FogWrCKd4cgKOeATM89UiMi2EPZw2/znE3
+XrnYOimuPCBAZ7ppVxZTtFMK6yEtWPSiBN1aIXgRQNi/c2QyKnN4YIGPN8CBQBc2
+IgE9Coo/dF8zgp0f0pZg+WpdfQeo1HZIqcq4V7wOABt9gZW9g1J+OswWHvCg7+25
++qcvvsDGpCg+zu9V+YQ0oocPImXsAPzXbvKaRydmUHvXZMzEVr5Nchq7vaW7bNM7
+jfqnUGQD+QQDJkbu43Aq8YDaozsrKwmw+1Nh9+PLnahC0j8RyTs869IDVPVyrMzZ
+N59DJ6HTxcBlVfU3XC02uMN3v777HWXbuA2+EMx9QA7nTxeXYfBhDc9uz9Vzm9/5
+4orybIL+hcb4kWTGHFI9jph85uLXXkXyAwhGf8eFJYbCwCQb9n1AE4HrJkHtqdRA
+1wr380cCAwEAAaOCASowggEmMBAGCSsGAQQBgjcVAQQDAgEAMB0GA1UdDgQWBBTp
+AR74UKd8kMhGBOxHHucPht9cUDAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTAL
+BgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBSsODwoVsWm
+MJ3N+St1Wp15q0uCCTBGBgNVHR8EPzA9MDugOaA3hjVodHRwOi8vcGtpY29ycC5z
+aWxhYnMuY29tL2NlcnRkYXRhL1NMJTIwUm9vdCUyMENBLmNybDBRBggrBgEFBQcB
+AQRFMEMwQQYIKwYBBQUHMAKGNWh0dHA6Ly9wa2ljb3JwLnNpbGFicy5jb20vY2Vy
+dGRhdGEvU0wlMjBSb290JTIwQ0EuY3J0MA0GCSqGSIb3DQEBCwUAA4ICAQAJy2tI
+6eaBgVMWc4IIbn9wzedtSazYUNoRrWdBpHJkBo0WUevX5JKSCu6YHCe5f3LGN7+n
+OyKpB6nqqh5YeRzwCGi2DgPLrcsnGDmbfcvLwaNfaVb3rXQRqG0orh9PRqOfUpKe
+imrnFDiZwmBGGkTAqveR7a0rpYBSAKWYUJh41iC53nw7ip3hFEWMA8Wk3VyBl0VG
+jzJtF0rDzgEYV/+xJCUeK1LUyWbOv9iarDEpsZgNGkpmzBwcaIk4rtzsPsj8l1Do
+cIEMkfx3/Rbjx5mX5JRNUJWCJ6t4uE7pi1fsQp3E/i+R+b61oUtR+zSyXdNZFdD1
+mN/Xzzo+cyYtcCJfZ/I64NhBSjAlLc7CSyd7ZiLNfvVSeiXdahP4jb3VyNgEf0zn
+OXFHYy8UK4jPgoBQW+OxwWfl8byA4xTKOMv4HXLqMiP1YRO9fEakKhXL+CMcmmCw
+egTWyrcEdE+A8WrztuDnftI29aaXr9BCmZkBdf4BS+x/qEAaYnG8sTXBAi8sPYhi
+oFbCsp26hJ41itfPoSMMJlKfRSHv/dL1ptxLPbMh9g90jm5BwC6yxmCtTdKmPNZl
+kYAeHyCODrJVgbWNchIRg0RbqwTeC1o2NrFFV+InhGScuTJ9flKIh6YpgCAUr6dq
+YjxAR3YGXOartflPVBb+sNBBTgvHByb9YWwtQg==
+-----END CERTIFICATE-----

utf_queue_client-1.21.0/test/silabs-root.pem

@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIFBTCCAu2gAwIBAgIQHlZ3eYApxoBG7lYiRKHKbDANBgkqhkiG9w0BAQsFADAV
+MRMwEQYDVQQDEwpTTCBSb290IENBMB4XDTIxMTEwMTE0MzQyOVoXDTQxMTEwMTE0
+NDQyOVowFTETMBEGA1UEAxMKU0wgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAN0NoaEPfhMvgv+O3DeW4RzQ2Q5Wg13AUjtX9LSYnIq5lgpO
+Up5Fnig94pHdm/6vmcAryl9b5UMZwrzO1Pa7Jd31s0KgbRJSHF9yHZ8suetb04I3
+cyX3TwGt14wjD+rIp5IdWHsahQreZyuIgFQAf6iFy+v9skLJ/mkf9VXSZUbUIDSl
+80NDuu5wTsJSvu5GOeAqlTyD2FEdf07o4yWPY/VDMEtvuzVkNoWshJazjO+cUiDX
+nIeXDMUKshNN4wV2WX6/14el+XC8p6iI7Lp/Kjr2OYb29FKDzmkX61P0uxMp5dkB
+NILtn2x3yUEGHhRsw21sj5+T5YFJYfCa12ZBaXXaffBLmzTeetYumrw0jCvDut1/
+LY8jvhDdqWyHsSSaYoi5fYtB1QgqGVfuBYQ6Jt2msnDkK68TYaqrnuIbIp7s+y08
+47LfEr4siIz5mgILfyg2U5rPeRJc6qh3M7SrF7Cc05MU8dfBvdSs+dpnxqoAgYnk
+lfU/0PNTIrz1R3P/w+xt5sSXlNB6q/IpFCj69grBXNCW1FPOIZeRis38pGq58whA
+9bJoqjKQL0rTcN9IIbk6yY0xLReIJ+egV8GgVYuNP+yYCN6/5NYqzm85DCBkSKG1
+R5srHQUPTRzd5tgAg0m76QBksXE022PCsPefeS+ZL2zo8qjbg8yBB1lhPOljAgMB
+AAGjUTBPMAsGA1UdDwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSs
+ODwoVsWmMJ3N+St1Wp15q0uCCTAQBgkrBgEEAYI3FQEEAwIBADANBgkqhkiG9w0B
+AQsFAAOCAgEANadAUufhrExMpqVh9LKL8n9zRZVicrnWtjotIRj5o9jpiDVyKxK9
+4ZBYXRAqmQqql0QPM9lcSBkJwWcYZYfGhrZ4uD2TWJ8sW2JeRO5MRvJn7yR73LC6
+lZQydGPqINZu8W1aoZ7giTFHhCP9kIwEY6y7WUZf7VPDYO8xM7np0zjWVl0R0gQF
+Xp8XYCj6EpCnsn5ZwsbTnekz3exVC6QsxB/dBlgeI0MN4D2J2sOMlw2xlHCUkzLQ
+TCfCwcGKSzKVQz1XQ2SpI6JS9An9EQeJH1jgvPNr8pDPhGZY7IKf6RwhI1inK6/5
+e/Op/X8ifzUrUxW7HQIkOKKTu09hBrp8yq7+CYOXXEHNmsiwptUyUT202EBEWIQa
+xOr2PwLQVYyCGM1Ec7Q/j179jfhZvUEBVK6zN8XwlIrwcgiI/8azwgT5d4Rqz4No
+T6rLwbucYafP8HndjiwkUKW8SeTNI3+1uPR0Qrl87qYd5KqPmwV2FIaqYpH7kT91
+PJN6Z/ClWFInUGXDBWrFdW6lWk/VBFNeAoTdwHR1WtmmyEsKR8LFimq97Uc8URSb
+alvr09umQ+aieXPphyhQNQoUuLdSmAafcgr1Aj/8PNTCPEZih0aOhA6pVDMkyApr
+GmZ84Rd6x6J2YMWKrldCdelWbiQOpMNBu0TG8QHjcrJj2esL1BUU4xI=
+-----END CERTIFICATE-----

utf_queue_client-1.21.0/test/test_ca_cert.py

@@ -0,0 +1,84 @@
+import pathlib
+import tempfile
+from unittest.mock import patch
+
+import requests
+from certifi import contents as certifi_contents
+
+from utf_queue_client.scripts import (
+    LOCAL_CA_FILE_PATH,
+    SILABS_NET_CA,
+    get_or_make_ca_file,
+)
+
+ISRG_X1_CERT = """-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
+WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
+ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
+MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
+h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
+0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
+A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
+T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
+B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
+B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
+KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
+OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
+jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
+qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
+rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
+hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
+3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
+NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
+ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
+TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
+jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
+oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
+4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
+mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
+emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----
+"""
+
+
+def verify_ca(ca_file: str):
+    r = requests.get("https://iot-notifications.silabs.net/docs", verify=ca_file)
+    assert r.status_code == 200
+
+    r = requests.get("https://ubai.silabs.net/docs", verify=ca_file)
+    assert r.status_code == 200
+
+
+def get_ca_and_verify():
+    LOCAL_CA_FILE_PATH.unlink(missing_ok=True)
+    for _ in range(2):
+        ca_file = get_or_make_ca_file()
+        assert pathlib.Path(ca_file).is_file()
+        ca_file_text = pathlib.Path(ca_file).read_text()
+        assert ISRG_X1_CERT in ca_file_text
+        assert SILABS_NET_CA in ca_file_text
+
+        verify_ca(ca_file)
+    LOCAL_CA_FILE_PATH.unlink(missing_ok=True)
+
+
+def test_get_or_make_ca_file_empty_default_ca():
+    with patch(
+        "utf_queue_client.scripts.LOCAL_CA_FILE_PATH",
+        pathlib.Path(tempfile.gettempdir()) / "does-not-exist",
+    ):
+        get_ca_and_verify()
+
+
+def test_get_or_make_ca_file_existing_default_ca(tmp_path):
+    default_ca_file = tmp_path / "default-ca.crt"
+    default_ca_file.write_text(certifi_contents() + SILABS_NET_CA)
+    with patch(
+        "utf_queue_client.scripts.LOCAL_CA_FILE_PATH",
+        default_ca_file,
+    ):
+        get_ca_and_verify()

{utf_queue_client-1.20.1b3 → utf_queue_client-1.21.0}/utf_queue_client/scripts/__init__.py

@@ -1,9 +1,11 @@
 import logging
 import os
+import pathlib
 import tempfile
 from contextlib import contextmanager
 
 import urllib3
+from certifi import contents as certifi_contents
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
 from otel_extensions import (
     TelemetryOptions,
@@ -17,8 +19,7 @@ telemetry_initialized = False
 
 SERVICE_NAME = "UTF-Queue-Client-CLI"
 
-SILABS_NET_CA = """
------BEGIN CERTIFICATE-----
+SILABS_NET_CA = """-----BEGIN CERTIFICATE-----
 MIIDMjCCAhqgAwIBAgIUDGFjXuAmh2l8HHbGrbQcyurWMRowDQYJKoZIhvcNAQEL
 BQAwFTETMBEGA1UEAxMKc2lsYWJzLm5ldDAeFw0yMDA1MjkyMDQyNDBaFw0zMDA1
 MjcyMDQzMDlaMBUxEzARBgNVBAMTCnNpbGFicy5uZXQwggEiMA0GCSqGSIb3DQEB
@@ -40,19 +41,19 @@ XBhoBcSg
 -----END CERTIFICATE-----
 """
 
-DEFAULT_SILABS_NET_CA_CERT_FILE = "/usr/local/share/ca-certificates/vault-ca-prod.crt"
+
+LOCAL_CA_FILE_PATH = (
+    pathlib.Path(tempfile.gettempdir()) / "cert-bundle-with-silabs-net-ca.crt"
+)
 
 
 def get_or_make_ca_file() -> str:
-    if os.path.isfile(DEFAULT_SILABS_NET_CA_CERT_FILE):
-        return DEFAULT_SILABS_NET_CA_CERT_FILE
-    temp_dir = tempfile.gettempdir()
-    ca_file_name = "silabs-net-ca.crt"
-    ca_file_path = os.path.join(temp_dir, ca_file_name)
-    if not os.path.isfile(ca_file_path):
-        with open(ca_file_path, "w") as f:
-            f.write(SILABS_NET_CA)
-    return ca_file_path
+    """Creates a local CA file, if it doesn't exist already, that includes both the certifi bundle and the silabs.net CA.
+    Returns the ca path as a string.
+    """
+    if not LOCAL_CA_FILE_PATH.is_file():
+        LOCAL_CA_FILE_PATH.write_text(certifi_contents() + SILABS_NET_CA)
+    return str(LOCAL_CA_FILE_PATH)
 
 
 @contextmanager

{utf_queue_client-1.20.1b3 → utf_queue_client-1.21.0}/utf_queue_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utf-queue-client
-Version: 1.20.1b3
+Version: 1.21.0
 Summary: No description provided
 Author-email: Joe Savage <joe.savage@silabs.com>
 Keywords: UTF

{utf_queue_client-1.20.1b3 → utf_queue_client-1.21.0}/utf_queue_client.egg-info/SOURCES.txt

@@ -19,10 +19,13 @@ test/Dockerfile.script_test
 test/conftest.py
 test/pytest.ini
 test/script_test.groovy
+test/silabs-intermediate.pem
+test/silabs-root.pem
 test/stopwatch.py
 test/test.hex
 test/test_amqp_connections.py
 test/test_async_consumer.py
+test/test_ca_cert.py
 test/test_connection_retry.py
 test/test_data_lake_data_producer.py
 test/test_http_producer.py

utf_queue_client-1.20.1b3/test/Dockerfile.script_test

@@ -1,12 +0,0 @@
-FROM python:3.8
-
-RUN apt update && apt install -y curl
-WORKDIR /usr/local/share/ca-certificates
-RUN curl -k https://vault.dev.silabs.net/v1/pki/ca/pem -o silabs-net-dev.crt && \
-    curl -k https://vault.silabs.net/v1/pki/ca/pem -o silabs-net-prod.crt && \
-    curl http://pkicorp.silabs.com/certdata/SL%20Root%20CA.crt -o /tmp/slroot.der && \
-    curl http://pkicorp.silabs.com/certdata/SL%20Enterprise%20CA01.crt -o /tmp/slintermediate.der && \
-    openssl x509 -inform der -in /tmp/slroot.der -out slroot.crt && \
-    openssl x509 -inform der -in /tmp/slintermediate.der -out slintermediate.crt && \
-    /usr/sbin/update-ca-certificates
-