From 0f448360255d06ef6b812c30eb758a4644ebe22e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Mon, 20 May 2024 12:04:05 +0200
Subject: [PATCH] Move signature one layer down

---
 common/ip-packet-requests/src/v7/request.rs | 48 +++++++++++++--------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/common/ip-packet-requests/src/v7/request.rs b/common/ip-packet-requests/src/v7/request.rs
index a73b884972..b7cddc9215 100644
--- a/common/ip-packet-requests/src/v7/request.rs
+++ b/common/ip-packet-requests/src/v7/request.rs
@@ -14,7 +14,6 @@ fn generate_random() -> u64 {
 pub struct IpPacketRequest {
     pub version: u8,
     pub data: IpPacketRequestData,
-    pub signature: Option<Vec<u8>>,
 }
 
 impl IpPacketRequest {
@@ -26,19 +25,22 @@ impl IpPacketRequest {
         buffer_timeout: Option<u64>,
     ) -> (Self, u64) {
         let request_id = generate_random();
+        let request = StaticConnectRequest {
+            request_id,
+            ips,
+            reply_to,
+            reply_to_hops,
+            reply_to_avg_mix_delays,
+            buffer_timeout,
+            timestamp: OffsetDateTime::now_utc(),
+        };
         (
             Self {
                 version: CURRENT_VERSION,
-                data: IpPacketRequestData::StaticConnect(StaticConnectRequest {
-                    request_id,
-                    ips,
-                    reply_to,
-                    reply_to_hops,
-                    reply_to_avg_mix_delays,
-                    buffer_timeout,
-                    timestamp: OffsetDateTime::now_utc(),
+                data: IpPacketRequestData::StaticConnect(SignedStaticConnectRequest {
+                    request,
+                    signature: None,
                 }),
-                signature: None,
             },
             request_id,
         )
@@ -62,7 +64,6 @@ impl IpPacketRequest {
                     buffer_timeout,
                     timestamp: OffsetDateTime::now_utc(),
                 }),
-                signature: None,
             },
             request_id,
         )
@@ -78,7 +79,6 @@ impl IpPacketRequest {
                     reply_to,
                     timestamp: OffsetDateTime::now_utc(),
                 }),
-                signature: None,
             },
             request_id,
         )
@@ -88,7 +88,6 @@ impl IpPacketRequest {
         Self {
             version: CURRENT_VERSION,
             data: IpPacketRequestData::Data(DataRequest { ip_packets }),
-            signature: None,
         }
     }
 
@@ -102,7 +101,6 @@ impl IpPacketRequest {
                     reply_to,
                     timestamp: OffsetDateTime::now_utc(),
                 }),
-                signature: None,
             },
             request_id,
         )
@@ -118,7 +116,6 @@ impl IpPacketRequest {
                     reply_to,
                     timestamp: OffsetDateTime::now_utc(),
                 }),
-                signature: None,
             },
             request_id,
         )
@@ -126,7 +123,7 @@ impl IpPacketRequest {
 
     pub fn id(&self) -> Option<u64> {
         match &self.data {
-            IpPacketRequestData::StaticConnect(request) => Some(request.request_id),
+            IpPacketRequestData::StaticConnect(request) => Some(request.request.request_id),
             IpPacketRequestData::DynamicConnect(request) => Some(request.request_id),
             IpPacketRequestData::Disconnect(request) => Some(request.request_id),
             IpPacketRequestData::Data(_) => None,
@@ -137,7 +134,7 @@ impl IpPacketRequest {
 
     pub fn recipient(&self) -> Option<&Recipient> {
         match &self.data {
-            IpPacketRequestData::StaticConnect(request) => Some(&request.reply_to),
+            IpPacketRequestData::StaticConnect(request) => Some(&request.request.reply_to),
             IpPacketRequestData::DynamicConnect(request) => Some(&request.reply_to),
             IpPacketRequestData::Disconnect(request) => Some(&request.reply_to),
             IpPacketRequestData::Data(_) => None,
@@ -162,7 +159,7 @@ impl IpPacketRequest {
 #[allow(clippy::large_enum_variant)]
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub enum IpPacketRequestData {
-    StaticConnect(StaticConnectRequest),
+    StaticConnect(SignedStaticConnectRequest),
     DynamicConnect(DynamicConnectRequest),
     Disconnect(DisconnectRequest),
     Data(DataRequest),
@@ -175,6 +172,15 @@ impl IpPacketRequestData {
         use bincode::Options;
         make_bincode_serializer().serialize(self)
     }
+
+    pub fn add_signature(&mut self, signature: Vec<u8>) {
+        match self {
+            IpPacketRequestData::StaticConnect(request) => {
+                request.signature = Some(signature);
+            }
+            _ => panic!("Attempted to sign a non-signable request"),
+        }
+    }
 }
 
 // A static connect request is when the client provides the internal IP address it will use on the
@@ -204,6 +210,12 @@ pub struct StaticConnectRequest {
     pub timestamp: OffsetDateTime,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub struct SignedStaticConnectRequest {
+    pub request: StaticConnectRequest,
+    pub signature: Option<Vec<u8>>,
+}
+
 // A dynamic connect request is when the client does not provide the internal IP address it will use
 // on the ip packet router, and instead requests one to be assigned to it.
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]