From c226ef71ff39805167ee652f94dd0da8e3d2dac9 Mon Sep 17 00:00:00 2001
From: Dylan Uys <dylan.uys@gmail.com>
Date: Tue, 18 Jun 2024 03:11:16 +0000
Subject: [PATCH] generating keys when server starts

---
 gen_keys.py | 65 ++++++++++++++++++++++++++++-------------------------
 server.py   | 13 +++++++----
 2 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/gen_keys.py b/gen_keys.py
index 32e830a..04a08dd 100644
--- a/gen_keys.py
+++ b/gen_keys.py
@@ -2,33 +2,38 @@
 from cryptography.hazmat.primitives import serialization
 
 
-# Generate private key
-private_key = Ed25519PrivateKey.generate()
-
-# Obtain the public key
-public_key = private_key.public_key()
-
-# Serialize the private key to PEM format
-private_pem = private_key.private_bytes(
-    encoding=serialization.Encoding.PEM,
-    format=serialization.PrivateFormat.PKCS8,
-    encryption_algorithm=serialization.NoEncryption()
-)
-
-# Serialize the public key to PEM format
-public_pem = public_key.public_bytes(
-    encoding=serialization.Encoding.PEM,
-    format=serialization.PublicFormat.SubjectPublicKeyInfo
-)
-
-# Print the keys
-print("Private Key:\n", private_pem.decode('utf-8'))
-print("Public Key:\n", public_pem.decode('utf-8'))
-
-# Save the private key to a file
-with open("private_key.pem", "wb") as f:
-    f.write(private_pem)
-
-# Save the public key to a file
-with open("public_key.pem", "wb") as f:
-    f.write(public_pem)
+def generate_keys(private_key_path="private_key.pem", public_key_path="public_key.pem"):
+    # Generate private key
+    private_key = Ed25519PrivateKey.generate()
+
+    # Obtain the public key
+    public_key = private_key.public_key()
+
+    # Serialize the private key to PEM format
+    private_pem = private_key.private_bytes(
+        encoding=serialization.Encoding.PEM,
+        format=serialization.PrivateFormat.PKCS8,
+        encryption_algorithm=serialization.NoEncryption()
+    )
+
+    # Serialize the public key to PEM format
+    public_pem = public_key.public_bytes(
+        encoding=serialization.Encoding.PEM,
+        format=serialization.PublicFormat.SubjectPublicKeyInfo
+    )
+
+    # Print the keys
+    print("Private Key:\n", private_pem.decode('utf-8'))
+    print("Public Key:\n", public_pem.decode('utf-8'))
+
+    # Save the private key to a file
+    with open(private_key_path, "wb") as f:
+        f.write(private_pem)
+
+    # Save the public key to a file
+    with open(public_key_path, "wb") as f:
+        f.write(public_pem)
+
+
+if __name__ == '__main__':
+    generate_keys()
\ No newline at end of file
diff --git a/server.py b/server.py
index 8a58152..91113bd 100644
--- a/server.py
+++ b/server.py
@@ -1,16 +1,19 @@
+from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
 from cryptography.hazmat.primitives import serialization
 from fastapi import FastAPI, HTTPException, Request, UploadFile, File
 from fastapi.exceptions import RequestValidationError
+from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
 from pydantic import BaseModel
-from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
+from io import BytesIO
+from PIL import Image
 import base64
 import logging
 import requests
 import random
-from io import BytesIO
-from PIL import Image
-from fastapi.middleware.cors import CORSMiddleware
+
+from gen_keys import generate_keys
+
 
 app = FastAPI()
 # Add CORS middleware
@@ -23,6 +26,8 @@
     allow_headers=["*"],
 )
 
+generate_keys()
+
 # Load the private key from a file
 with open("private_key.pem", "rb") as f:
     private_key = serialization.load_pem_private_key(f.read(), password=None)