From 75732476be1ef6e04bce8a71add597b9634f4dda Mon Sep 17 00:00:00 2001 From: cheddar Date: Thu, 20 Feb 2025 21:51:48 -0500 Subject: [PATCH] Reformat the way I like it --- main.go | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/main.go b/main.go index e459015..b02e284 100644 --- a/main.go +++ b/main.go @@ -18,21 +18,13 @@ import ( func main() { useClient := flag.Bool("c", false, "Run client") - keyId := flag.String("id", "", "The key id to pass") - register := flag.Bool("r", false, "Register a key") - user := flag.String("user", "", "Username to register") - keyPath := flag.String("key", "", "Path to the private key (client mode) or public key (registration mode) to use") - baseUrlString := flag.String("base-url", "http://localhost:8080", "Base URL of the server") - simulateCaddy := flag.Bool("caddy", false, "Simulate caddy reverse proxy") - useTempDb := flag.Bool("temp-db", false, "Use a temporary in-memory database") - dbPath := flag.String("db", "", "Path to the sqlite database file") flag.Parse() @@ -97,23 +89,6 @@ func runClient(baseUrl *url.URL, keyFile string, keyId string, simulateCaddy boo fmt.Println(string(out[:])) } -func runServer(simulateCaddy bool, useTempDb bool, dbPath string) { - var keyDir keydirectory.RegistrationDirectory - - if useTempDb { - keyDir = keydirectory.CreateMemoryDirectory() - } else { - var err error - keyDir, err = keydirectory.InitSqlite(dbPath) - - if err != nil { - log.Fatal(err) - } - } - - server.Start(simulateCaddy, keyDir) -} - func loadPrivateKey(keyFile string) (crypto.PrivateKey, error) { keyBytes, err := os.ReadFile(keyFile) @@ -139,3 +114,20 @@ func registerKey(baseUrl *url.URL, keyFile string, userId string) { log.Fatal(err) } } + +func runServer(simulateCaddy bool, useTempDb bool, dbPath string) { + var keyDir keydirectory.RegistrationDirectory + + if useTempDb { + keyDir = keydirectory.CreateMemoryDirectory() + } else { + var err error + keyDir, err = keydirectory.InitSqlite(dbPath) + + if err != nil { + log.Fatal(err) + } + } + + server.Start(simulateCaddy, keyDir) +}