From bd04f8407b3de154bc102e34366b8e6b45445530 Mon Sep 17 00:00:00 2001 From: Marco Colombo Date: Mon, 3 Mar 2025 12:39:32 +0100 Subject: [PATCH 1/4] ucloud: update action/cache due to deprecation and drop --- .github/workflows/client-test.yml | 2 +- src/arduino_iot_cloud/ucloud.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/client-test.yml b/.github/workflows/client-test.yml index b8b889e..9bba477 100644 --- a/.github/workflows/client-test.yml +++ b/.github/workflows/client-test.yml @@ -32,7 +32,7 @@ jobs: uses: actions/checkout@v3 - name: '♻ Caching dependencies' - uses: actions/cache@v3.3.1 + uses: actions/cache@v4.2.2 id: cache with: path: ~/cache/bin/ diff --git a/src/arduino_iot_cloud/ucloud.py b/src/arduino_iot_cloud/ucloud.py index 992282b..f1b9100 100644 --- a/src/arduino_iot_cloud/ucloud.py +++ b/src/arduino_iot_cloud/ucloud.py @@ -21,13 +21,13 @@ class InvalidStateError(Exception): try: from arduino_iot_cloud._version import __version__ except (ImportError, AttributeError): - __version__ = "1.3.3" + __version__ = "1.5.0" # Server/port for basic auth. _DEFAULT_SERVER = "iot.arduino.cc" # Default port for cert based auth and basic auth. -_DEFAULT_PORT = (8883, 8884) +_DEFAULT_PORT = (8885, 8884) class DoneException(Exception): From 045887564e9b5336878e31280bc5eb8aba9114d1 Mon Sep 17 00:00:00 2001 From: Marco Colombo Date: Mon, 3 Mar 2025 14:28:30 +0100 Subject: [PATCH 2/4] ucloud: update CA certificate DER --- src/arduino_iot_cloud/__init__.py | 32 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/arduino_iot_cloud/__init__.py b/src/arduino_iot_cloud/__init__.py index 83d7d06..509d802 100644 --- a/src/arduino_iot_cloud/__init__.py +++ b/src/arduino_iot_cloud/__init__.py @@ -12,25 +12,23 @@ CADATA = binascii.unhexlify( - b"308201cf30820174a00302010202141f101deba7e125e727c1a391e3ec0d" - b"174ded4a59300a06082a8648ce3d0403023045310b300906035504061302" - b"555331173015060355040a130e41726475696e6f204c4c43205553310b30" - b"09060355040b130249543110300e0603550403130741726475696e6f301e" - b"170d3138303732343039343730305a170d3438303731363039343730305a" - b"3045310b300906035504061302555331173015060355040a130e41726475" - b"696e6f204c4c43205553310b3009060355040b130249543110300e060355" - b"0403130741726475696e6f3059301306072a8648ce3d020106082a8648ce" - b"3d030107034200046d776c5acf611c7d449851f25ee1024077b79cbd49a2" - b"a38c4eab5e98ac82fc695b442277b44d2e8edf2a71c1396cd63914bdd96b" - b"184b4becb3d5ee4289895522a3423040300e0603551d0f0101ff04040302" - b"0106300f0603551d130101ff040530030101ff301d0603551d0e04160414" - b"5b3e2a6b8ec9b01aa854e6369b8c09f9fce1b980300a06082a8648ce3d04" - b"03020349003046022100bfd3dc236668b50adc3f0d0ec373e20ac7f760aa" - b"100dd320bfe102969b6b05d8022100ead9d9da5acd12529709a8ed660fe1" - b"8d6444ffe82217304ff2b89aafca8ecf6c" + b"8230d0018230760103a0010202026f149eadf52bd56f9ab6063ce49803304605" + b"07f1305a060a2a0848863dce030430023145300b060955030604021353551731" + b"153003060455130a410e647269756f6e4c20434c55203153300b060955030b04" + b"0213544910310e300306045513034107647269756f6e20300d17353231303031" + b"303133353232185a320f3530303530313133353032335a3245300b3109300306" + b"04551306550231533017061555030a040e13724175646e69206f4c4c20435355" + b"0b31093003060455130b490231543010060e550303040713724175646e69306f" + b"305906132a0748863dce01020806862ace48033d070142030400e1a16c535235" + b"331ae80dac2b125b8fc137503eb39b64eea00227c7355a8d4510cad052f597ec" + b"9af281ffe2c69779d33fc639a1d76bcc8561f670ae3b1d62c87142a340300f30" + b"03061d550113ff0105040330010130ff060e55030f1d010104ff030401023006" + b"061d55030e1d160414046542842904d0d18803c609f478b33be328123ee00a30" + b"0806862ace48043d02034803300002450021a4cf60cb5eff5389fdab54c55dff" + b"c0731f6af17b356829ee19d43273c65e505520022d6f742fd9dac866a539a415" + b"f612f28123ee92d55b5bfb11d7ecec3f86c5a767" ) - class Location(ArduinoCloudObject): def __init__(self, name, **kwargs): super().__init__(name, keys={"lat", "lon"}, **kwargs) From a17f49dad9390766734f8e7fee6247f24ddc76c5 Mon Sep 17 00:00:00 2001 From: Marco Colombo Date: Mon, 3 Mar 2025 14:39:58 +0100 Subject: [PATCH 3/4] ucloud: code lint --- src/arduino_iot_cloud/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/arduino_iot_cloud/__init__.py b/src/arduino_iot_cloud/__init__.py index 509d802..17f6af5 100644 --- a/src/arduino_iot_cloud/__init__.py +++ b/src/arduino_iot_cloud/__init__.py @@ -29,6 +29,7 @@ b"f612f28123ee92d55b5bfb11d7ecec3f86c5a767" ) + class Location(ArduinoCloudObject): def __init__(self, name, **kwargs): super().__init__(name, keys={"lat", "lon"}, **kwargs) From d6a15770fd72a2d472e7779320d8e3fe84a1ecfe Mon Sep 17 00:00:00 2001 From: Marco Colombo Date: Tue, 4 Mar 2025 15:26:27 +0100 Subject: [PATCH 4/4] ucloud: updated root certificate --- src/arduino_iot_cloud/__init__.py | 32 ++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/arduino_iot_cloud/__init__.py b/src/arduino_iot_cloud/__init__.py index 17f6af5..67912d5 100644 --- a/src/arduino_iot_cloud/__init__.py +++ b/src/arduino_iot_cloud/__init__.py @@ -12,21 +12,23 @@ CADATA = binascii.unhexlify( - b"8230d0018230760103a0010202026f149eadf52bd56f9ab6063ce49803304605" - b"07f1305a060a2a0848863dce030430023145300b060955030604021353551731" - b"153003060455130a410e647269756f6e4c20434c55203153300b060955030b04" - b"0213544910310e300306045513034107647269756f6e20300d17353231303031" - b"303133353232185a320f3530303530313133353032335a3245300b3109300306" - b"04551306550231533017061555030a040e13724175646e69206f4c4c20435355" - b"0b31093003060455130b490231543010060e550303040713724175646e69306f" - b"305906132a0748863dce01020806862ace48033d070142030400e1a16c535235" - b"331ae80dac2b125b8fc137503eb39b64eea00227c7355a8d4510cad052f597ec" - b"9af281ffe2c69779d33fc639a1d76bcc8561f670ae3b1d62c87142a340300f30" - b"03061d550113ff0105040330010130ff060e55030f1d010104ff030401023006" - b"061d55030e1d160414046542842904d0d18803c609f478b33be328123ee00a30" - b"0806862ace48043d02034803300002450021a4cf60cb5eff5389fdab54c55dff" - b"c0731f6af17b356829ee19d43273c65e505520022d6f742fd9dac866a539a415" - b"f612f28123ee92d55b5bfb11d7ecec3f86c5a767" + b"308201d030820176a00302010202146fad9e2bf56fd5b69a3c0698e43003" + b"0546f1075a300a06082a8648ce3d0403023045310b300906035504061302" + b"555331173015060355040a130e41726475696e6f204c4c43205553310b30" + b"09060355040b130249543110300e0603550403130741726475696e6f3020" + b"170d3235303131303130353332325a180f32303535303130333130353332" + b"325a3045310b300906035504061302555331173015060355040a130e4172" + b"6475696e6f204c4c43205553310b3009060355040b130249543110300e06" + b"03550403130741726475696e6f3059301306072a8648ce3d020106082a86" + b"48ce3d03010703420004a1e1536c35521a330de82bac5b12c18f5037b33e" + b"649ba0ee270235c78d5a1045d0caf552ec97f29aff81c6e279973fd339c6" + b"d7a1cc6b618570f63bae621d71c8a3423040300f0603551d130101ff0405" + b"30030101ff300e0603551d0f0101ff040403020106301d0603551d0e0416" + b"041442652984d00488d1c603f409b378e33b1228e03e300a06082a8648ce" + b"3d0403020348003045022100cfa4cb60ff5e8953abfdc554ff5d73c06a1f" + b"7bf16835ee29d41973325ec6555002206f2d2f74dad966c839a515a412f6" + b"81f2ee23d5925b5b11fbecd73fecc58667a7" + b"81f2ee23d5925b5b11fbecd73fecc58667a7" )