distributed-state-network 0.5.4__tar.gz → 0.5.6__tar.gz

{distributed_state_network-0.5.4 → distributed_state_network-0.5.6}/.gitignore

@@ -8,4 +8,5 @@ test.key
 count.py
 appended.py
 py_line_count_history.jsonl
-network.key
+network.key
+todo.txt

{distributed_state_network-0.5.4 → distributed_state_network-0.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: distributed-state-network
-Version: 0.5.4
+Version: 0.5.6
 Summary: A tool to distribute the state of a network device to other devices on the network
 Project-URL: Homepage, https://github.com/erinclemmer/distributed_state_network
 Project-URL: Issues, https://github.com/erinclemmer/distributed_state_network/issues

{distributed_state_network-0.5.4 → distributed_state_network-0.5.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "distributed-state-network"
-version = "0.5.4"
+version = "0.5.6"
 authors = [{name="Erin Clemmer", email="erin.c.clemmer@gmail.com"}]
 description = "A tool to distribute the state of a network device to other devices on the network"
 keywords = ["distributed", "networking"]

{distributed_state_network-0.5.4 → distributed_state_network-0.5.6}/src/distributed_state_network/dsnode.py

@@ -73,8 +73,8 @@ class DSNode:
         return bytes.fromhex(self.config.aes_key)
 
     def write_address_book(self, node_id: str, conn: Endpoint):
-        if conn.address == "127.0.0.1":
-            return
+        if conn.address == "127.0.0.1" and conn.port == self.config.port:
+            raise Exception("Trying to write address book for self")
         self.logger.info(f"Address set: {node_id} -> {conn.address}:{conn.port}")
         self.address_book[node_id] = conn
 
@@ -90,8 +90,10 @@ class DSNode:
         def remove(node_id: str):
             if node_id in self.node_states:
                 del self.node_states[node_id]
+            if node_id in self.address_book:    
                 del self.address_book[node_id]
-                self.logger.info(f"PING failed for {node_id}, disconnecting...")
+            self.logger.info(f"PING failed for {node_id}, disconnecting...")
+        
         for node_id in self.node_states.copy().keys():
             if node_id not in self.node_states or node_id == self.config.node_id:
                 continue
@@ -245,10 +247,13 @@ class DSNode:
         self.write_address_book(pkt.node_id, con)
 
         if pkt.node_id not in self.node_states:
-            self.node_states[pkt.node_id] = StatePacket(pkt.node_id, 0, b'', { })
+            self.init_state(pkt.node_id)
 
         return pkt.node_id
 
+    def init_state(self, node_id: str):
+        self.node_states[node_id] = StatePacket(node_id, 0, b'', { })
+
     def handle_hello(self, data: bytes, detected_address: str) -> bytes:
         pkt = HelloPacket.from_bytes(data)
         self.logger.info(f"Received HELLO from {pkt.node_id}")
@@ -261,7 +266,7 @@ class DSNode:
         self.write_address_book(pkt.node_id, Endpoint(detected_address, pkt.connection.port))
 
         if pkt.node_id not in self.node_states:
-            self.node_states[pkt.node_id] = StatePacket(pkt.node_id, 0, b'', { })
+            self.init_state(pkt.node_id)
 
         # Create response with detected address
         response_pkt = self.my_hello_packet()
@@ -297,22 +302,7 @@ class DSNode:
         pkt = StatePacket.from_bytes(data)
         self.logger.info(f"Received UPDATE from {pkt.node_id}")
         
-        # ignore if we accidentally sent an update to ourselves
-        if pkt.node_id == self.config.node_id:
-            raise Exception(406, "Origin and destination are the same")  # Not acceptable
-        
-        # don't use packets older than last update
-        if pkt.node_id in self.node_states and self.node_states[pkt.node_id].last_update > pkt.last_update:
-            raise Exception(406, "Update is stale")  # Not acceptable
-        
-        if not pkt.verify_signature(self.cred_manager.read_public(pkt.node_id)):
-            raise Exception(401, "Could not verify ECDSA signature")  # Not authorized
-        
-        if pkt.node_id not in self.node_states:
-            self.node_states[pkt.node_id] = pkt
-
-        if get_dict_hash(self.node_states[pkt.node_id].state_data) != get_dict_hash(pkt.state_data):
-            self.node_states[pkt.node_id] = pkt
+        self.update_state(pkt)
 
         if self.update_cb is not None:
             try:
@@ -325,6 +315,25 @@ class DSNode:
 
     def my_state(self):
         return self.node_states[self.config.node_id]
+    
+    def update_state(self, pkt: StatePacket):
+        # ignore if we accidentally sent an update to ourselves
+        if pkt.node_id == self.config.node_id:
+            raise Exception(406, "Origin and destination are the same")  # Not acceptable
+
+        if pkt.node_id in self.address_book and not pkt.verify_signature(self.cred_manager.read_public(pkt.node_id)):
+            raise Exception(401, "Could not verify ECDSA signature")  # Not authorized
+
+        if pkt.node_id in self.node_states:
+            current_state = self.node_states[pkt.node_id]
+
+            if current_state.last_update > pkt.last_update:
+                raise Exception(406, "Update is stale") 
+
+            if len(pkt.state_data.keys()) > 0 and get_dict_hash(self.node_states[pkt.node_id].state_data) == get_dict_hash(pkt.state_data):
+                raise Exception(406, "Received duplicate packet")
+
+        self.node_states[pkt.node_id] = pkt
 
     def bootstrap(self, con: Endpoint):
         bootstrap_id = self.send_hello(con)

{distributed_state_network-0.5.4 → distributed_state_network-0.5.6}/src/distributed_state_network/handler.py

@@ -8,7 +8,7 @@ from distributed_state_network.objects.config import DSNodeConfig
 from distributed_state_network.util.aes import generate_aes_key
 from distributed_state_network.util import stop_thread
 
-VERSION = "0.5.4"
+VERSION = "0.5.6"
 logging.basicConfig(level=logging.INFO)
 
 # Silence Flask and Werkzeug logging