ifstate 1.13.4__tar.gz → 1.13.5__tar.gz

{ifstate-1.13.4 → ifstate-1.13.5}/PKG-INFO

@@ -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 → ifstate-1.13.5}/ifstate.egg-info/PKG-INFO

@@ -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 → ifstate-1.13.5}/libifstate/__init__.py

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

{ifstate-1.13.4 → ifstate-1.13.5}/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)

{ifstate-1.13.4 → ifstate-1.13.5}/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)