ostp.d: net: Refactor session request code

Signed-off-by: Ian Moffett <ian@osmora.org>

3 files changed, 110 insertions, 20 deletions

diff --git a/ostp.d/include/net/auth.h b/ostp.d/include/net/auth.h
new file mode 100644
index 0000000..752bfe2
--- /dev/null
+++ b/ostp.d/include/net/auth.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Hyra nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef NET_AUTH_H_
+#define NET_AUTH_H_
+
+#include <net/stpsession.h>
+
+int handle_srq(int client_fd, struct session_request *srq);
+
+#endif  /* NET_AUTH_H_ */
diff --git a/ostp.d/net/otd_auth.c b/ostp.d/net/otd_auth.c
new file mode 100644
index 0000000..9784356
--- /dev/null
+++ b/ostp.d/net/otd_auth.c
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Hyra nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <net/auth.h>
+#include <net/stpsession.h>
+#include <crypto/ecdh.h>
+#include <stdio.h>
+
+#define KEY_BYTE_WIDTH 32
+
+static void
+log_pubkey(char pubkey[KEY_BYTE_WIDTH])
+{
+    for (size_t i = 0; i < KEY_BYTE_WIDTH; ++i) {
+        printf("%02X ", pubkey[i] & 0xFF);
+        if (i != 0 && i % 4 == 0) {
+            printf("\n");
+        }
+    }
+}
+
+/*
+ * Verify the session request packet and handle
+ * the rest.
+ *
+ * @client_fd: File descriptor for client socket.
+ * @srq: Session request packet.
+ */
+int
+handle_srq(int client_fd, struct session_request *srq)
+{
+    struct x25519_keypair keypair;
+
+    printf("Got public key from peer: \n");
+    log_pubkey(srq->pubkey);
+    printf("Generating keys...\n");
+
+    if (gen_x25519_keypair(&keypair) < 0) {
+        printf("Key generation failed!\n");
+        return -1;
+    }
+
+    return 0;
+}
diff --git a/ostp.d/net/otd_listen.c b/ostp.d/net/otd_listen.c
index df4473b..3abcf24 100644
--- a/ostp.d/net/otd_listen.c
+++ b/ostp.d/net/otd_listen.c
@@ -29,8 +29,8 @@
 
 #include <sys/select.h>
 #include <arpa/inet.h>
+#include <net/auth.h>
 #include <net/stpsession.h>
-#include <crypto/ecdh.h>
 #include <defs.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -40,7 +40,6 @@
 #include <string.h>
 
 #define LISTEN_PORT 5352
-#define KEY_BYTE_WIDTH 32
 #define MAX_BACKLOG 4
 #define MAX_CLIENTS 32
 
@@ -60,22 +59,10 @@ signal_handle(int sig)
     exit(0);
 }
 
-static void
-log_pubkey(char pubkey[KEY_BYTE_WIDTH])
-{
-    for (size_t i = 0; i < KEY_BYTE_WIDTH; ++i) {
-        printf("%02X ", pubkey[i] & 0xFF);
-        if (i != 0 && i % 4 == 0) {
-            printf("\n");
-        }
-    }
-}
-
 static int
 handle_client(struct sockaddr_in *caddr, int clientno)
 {
     struct session_request srq;
-    struct x25519_keypair keypair;
     ssize_t nread;
     int client_fd;
 
@@ -104,12 +91,8 @@ handle_client(struct sockaddr_in *caddr, int clientno)
         return -1;
     }
 
-    printf("Got public key from peer: \n");
-    log_pubkey(srq.pubkey);
-    printf("Generating keys...\n");
-
-    if (gen_x25519_keypair(&keypair) < 0) {
-        printf("Key generation failed!\n");
+    /* Handle the session request */
+    if (handle_srq(client_fd, &srq) < 0) {
         close(client_fd);
         clients[clientno] = -1;
         return -1;