distributed-state-network 0.1.2__tar.gz → 0.1.4__tar.gz

{distributed_state_network-0.1.2 → distributed_state_network-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: distributed-state-network
-Version: 0.1.2
+Version: 0.1.4
 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.1.2 → distributed_state_network-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "distributed-state-network"
-version = "0.1.2"
+version = "0.1.4"
 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.1.2 → distributed_state_network-0.1.4}/src/distributed_state_network/dsnode.py

@@ -150,10 +150,10 @@ class DSNode:
     def handle_peers(self, data: bytes):
         pkt = PeersPacket.from_bytes(data)
         if pkt.node_id not in self.address_book:
-            raise Exception(401) # Not Authorized
+            raise Exception(401, f"Could not find {pkt.node_id} in address book") # Not Authorized
         
         if not pkt.verify_signature(self.cred_manager.read_public(pkt.node_id)):
-            raise Exception(406) # Not Acceptable
+            raise Exception(406, "Could not verify ECDSA signature of packet") # Not Acceptable
 
         peers = { }
         for key in self.address_book.keys():
@@ -221,14 +221,14 @@ class DSNode:
         
         # ignore if we accidentally sent an update to ourselves
         if pkt.node_id == self.config.node_id:
-            raise Exception(406) # Not acceptable
+            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) # Not acceptable
+            raise Exception(406, "Update is stale") # Not acceptable
         
         if not pkt.verify_signature(self.cred_manager.read_public(pkt.node_id)):
-            raise Exception(401) # Not authorized
+            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
@@ -266,7 +266,10 @@ class DSNode:
         for key in list(self.node_states.keys())[:]:
             if key == self.config.node_id:
                 continue
-            self.send_update(key)
+            try:
+                self.send_update(key)
+            except Exception as e:
+                print(e)
 
     def my_con(self) -> Endpoint:
         return self.connection_from_node(self.config.node_id)

{distributed_state_network-0.1.2 → distributed_state_network-0.1.4}/src/distributed_state_network/handler.py

@@ -27,9 +27,11 @@ def graceful_fail(httpd: BaseHTTPRequestHandler, body: bytes, fn: Callable):
         else:
             respond_bytes(httpd, b'')
     except Exception as e:
-        httpd.server.node.logger.error(f"Sending Error: {e.args[0]}")
+        httpd.server.node.logger.error(f"Sending Error: {e.args[0]} {e.args[1]}")
         httpd.send_response(e.args[0])
         httpd.end_headers()
+        httpd.wfile.write(e.args[1].encode('utf-8'))
+        httpd.wfile.flush()
 
 class DSNodeHandler(BaseHTTPRequestHandler):
     server: "NodeServer"

{distributed_state_network-0.1.2 → distributed_state_network-0.1.4}/src/distributed_state_network/objects/hello_packet.py

@@ -55,6 +55,6 @@ class HelloPacket(SignedPacket):
         https_certificate = bts.read_bytes() or None
 
         if version == '' or node_id == '' or ecdsa_public_key == b'':
-            raise Exception(406) # Not acceptable
+            raise Exception(406, "Malformed packet") # Not acceptable
 
         return HelloPacket(version, node_id, connection, ecdsa_public_key, ecdsa_signature, https_certificate)

{distributed_state_network-0.1.2 → distributed_state_network-0.1.4}/src/distributed_state_network/objects/state_packet.py

@@ -55,7 +55,7 @@ class StatePacket(SignedPacket):
         node_id = bts.read_string()
         
         if node_id == '':
-            raise Exception(406) # Not acceptable
+            raise Exception(406, "Malformed packet") # Not acceptable
         
         last_update = bts.read_float()
         ecdsa_signature = bts.read_bytes()

{distributed_state_network-0.1.2 → distributed_state_network-0.1.4}/src/distributed_state_network/util/key_manager.py

@@ -32,7 +32,7 @@ class KeyManager:
 
     def read_public(self, node_id: str) -> bytes:
         if not os.path.exists(f'{self.folder}/{self.node_id}/{node_id}.{self.public_extension}'):
-            raise Exception(401)
+            raise Exception(401, f"Cannot find public ECDSA key for {node_id}")
         with open(f'{self.folder}/{self.node_id}/{node_id}.{self.public_extension}', 'rb') as f:
             return f.read()
 
@@ -42,7 +42,7 @@ class KeyManager:
     def ensure_public(self, node_id: str, public_key: bytes):
         if self.has_public(node_id):
             if not self.verify_public(node_id, public_key):
-                raise Exception(401)
+                raise Exception(401, f"Cannot verify ECDSA key for {node_id}")
         else:
             self.write_public(node_id, public_key)
 

{distributed_state_network-0.1.2 → distributed_state_network-0.1.4}/test.py

@@ -322,6 +322,7 @@ class TestNode(unittest.TestCase):
             cm.read_public('test')
         except Exception as e:
             self.assertEqual(e.args[0], 401)
+            self.assertEqual(e.args[1], "Cannot find public ECDSA key for test")
 
     def test_ensure_cert(self):
         if os.path.exists('certs'):