ifstate 1.13.4__py3-none-any.whl → 1.13.5__py3-none-any.whl

{ifstate-1.13.4.dist-info → ifstate-1.13.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ifstate
-Version: 1.13.4
+Version: 1.13.5
 Summary: Manage host interface settings in a declarative manner
 Home-page: https://ifstate.net/
 Author: Thomas Liske

{ifstate-1.13.4.dist-info → ifstate-1.13.5.dist-info}/RECORD

@@ -2,11 +2,11 @@ ifstate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ifstate/ifstate.py,sha256=l6VxiAXWyoqj7T5J495gM5Nhn807f5pHmL8_kh1uJAc,8891
 ifstate/shell.py,sha256=7_JFpi4icr9MijynDzbb0v5mxhFsng6PCC4m3uQ255A,2177
 ifstate/vrrp.py,sha256=cXzQZ2v-QS56ZBS8raLM4GyCjPFtTV6tg_9Drkgul1k,5952
-ifstate-1.13.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-libifstate/__init__.py,sha256=oj7tFRk3f28pnEJQ0qkbGoXPiOzJ1RvsIrdYTilg6_0,30950
+ifstate-1.13.5.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+libifstate/__init__.py,sha256=NfL3Ef-3vH3I56mR9MxZX3nQc3a7Asig0luDPBclokw,30950
 libifstate/exception.py,sha256=5i59BZdl56J_sNJbyU9n6uHuUNJEyDOO4FJ-neDn9Ds,2608
 libifstate/log.py,sha256=XVoZdwdQoWsjuupFIuG6OP0OrBpXpx7oqyAaUhQ-nJk,4553
-libifstate/util.py,sha256=vqNaa67QZ2G07bQNAisTyUKbVmp0JGkvEGgbKVTtmYA,10579
+libifstate/util.py,sha256=WzbGKX78iWUunnZ-v_3OREmxMiYt7vVM_QyCgTcMYow,10802
 libifstate/address/__init__.py,sha256=zIGM7UWXSvoijHMD06DfS2CDtiHpiJlqDgJG7Dl1IPE,3222
 libifstate/bpf/__init__.py,sha256=NVzaunTmJU2PbIQg9eWBMKpFgLh3EnD3ujNa7Yt6rNc,7699
 libifstate/bpf/ctypes.py,sha256=kLZJHZlba09Vc-tbsJAcKpDwdoNO2IjlYVLCopawHmA,4274
@@ -27,11 +27,11 @@ libifstate/parser/yaml.py,sha256=MC0kmwqt3P45z61fb_wfUqoj0iZyhFYkdPyr0UqMSZA,141
 libifstate/routing/__init__.py,sha256=Hmj-LHBEtVXs5tlRzY8JS_C5qdnN3alD3cIznmzQ-rY,20469
 libifstate/sysctl/__init__.py,sha256=EF52CdOOkVSUFR2t21A99KlG1-PjsD4qOiceQC4eI24,3074
 libifstate/tc/__init__.py,sha256=inPdampCOIr_4oKNB3awqMkW0Eh4fpPh9jvSba6sPVg,12092
-libifstate/wireguard/__init__.py,sha256=vM7vxioV9vQ3gq9SE_URf97ZfGhLsxNiam16y_gXZ5E,6225
+libifstate/wireguard/__init__.py,sha256=HEmGsrtIX8MEjxtMbqgzP-e2BIUicyfmcywnRE93lRQ,6579
 libifstate/xdp/__init__.py,sha256=X1xhEIGng7R5d5F4KsChykT2g6H-XBRWbWABijoYDQA,7208
 schema/ifstate.conf.schema.json,sha256=NOPeI8_r1jXvgAAJeBqz92ZACNvxskId3qMykj-sG7M,201292
-ifstate-1.13.4.dist-info/METADATA,sha256=aLcfurXRF21iURo3Ur8ubiGgG3820lMFWNAwBBhG0po,1598
-ifstate-1.13.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-ifstate-1.13.4.dist-info/entry_points.txt,sha256=HF6jX7Uu_nF1Ly-J9uEPeiRapOxnM6LuHsb2y6Mt-k4,52
-ifstate-1.13.4.dist-info/top_level.txt,sha256=A7peI7aKBaM69fsiSPvMbL3rzTKZZr5qDxKC-pHMGdE,19
-ifstate-1.13.4.dist-info/RECORD,,
+ifstate-1.13.5.dist-info/METADATA,sha256=7wXC-qOpR-GJ2ENCpWYZc7-FqaqEaIc98I39apFge_E,1598
+ifstate-1.13.5.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+ifstate-1.13.5.dist-info/entry_points.txt,sha256=HF6jX7Uu_nF1Ly-J9uEPeiRapOxnM6LuHsb2y6Mt-k4,52
+ifstate-1.13.5.dist-info/top_level.txt,sha256=A7peI7aKBaM69fsiSPvMbL3rzTKZZr5qDxKC-pHMGdE,19
+ifstate-1.13.5.dist-info/RECORD,,

{ifstate-1.13.4.dist-info → ifstate-1.13.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

libifstate/__init__.py

@@ -48,7 +48,7 @@ import json
 import errno
 import logging
 
-__version__ = "1.13.4"
+__version__ = "1.13.5"
 
 
 class IfState():

libifstate/util.py

@@ -200,6 +200,12 @@ class NetNSExt(NetNS):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
+        # pyroute 0.9.1+
+        # workaround: netns property was moved into the status dict
+        if not hasattr(self, "netns"):
+            assert(hasattr(self, "status"))
+            self.netns = self.status["netns"]
+
         try:
             netns.pushns(self.netns)
             self.__sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)

libifstate/wireguard/__init__.py

@@ -56,9 +56,15 @@ class WireGuard():
         try:
             state = self.wg.get_interface(
                 self.iface, spill_private_key=True, spill_preshared_keys=True)
-        except Exception as err:
+        except TypeError as err:
+            # wgnlpy 0.1.5 can triggger a TypeError exception
+            # if the WGPEER_A_LAST_HANDSHAKE_TIME NLA does not
+            # return an integer
+            # https://github.com/argosyLabs/wgnlpy/pull/5
             logger.warning('WireGuard on {} failed: {}'.format(
-                self.iface, err.args[1]))
+                self.iface, err.args[0]))
+            # we cannot do anything here, but at least ifstate does not crash
+            # with an unhandled exception from inside wgnlpy
             return
 
         # check base settings (not the peers, yet)