From b1d92b395322f2164ccfb44b0f7caebbaece6b62 Mon Sep 17 00:00:00 2001
From: jwijenbergh <jeroenwijenbergh@protonmail.com>
Date: Fri, 22 Apr 2022 16:29:59 +0200
Subject: Refactor: Restructure project

- Add an internal folder where all the internal code lives
- Make a state.go and state_test.go for the public interface

This gives a more clear separation between functions and modules. It
also makes this a more typical Go project setup.
---
 src/wireguard.go | 52 ----------------------------------------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 src/wireguard.go

(limited to 'src/wireguard.go')

diff --git a/src/wireguard.go b/src/wireguard.go
deleted file mode 100644
index 2f1c41c..0000000
--- a/src/wireguard.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package eduvpn
-
-import (
-	"fmt"
-	"regexp"
-
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
-)
-
-func wireguardGenerateKey() (wgtypes.Key, error) {
-	key, error := wgtypes.GeneratePrivateKey()
-	return key, error
-}
-
-// FIXME: Instead of doing a regex replace, decide if we should use a parser
-func wireguardConfigAddKey(config string, key wgtypes.Key) string {
-	interface_section := "[Interface]"
-	interface_section_escaped := regexp.QuoteMeta(interface_section)
-
-	// (?m) enables multi line mode
-	// ^ match from beginning of line
-	// $ match till end of line
-	// So it matches [Interface] section exactly
-	interface_re := regexp.MustCompile(fmt.Sprintf("(?m)^%s$", interface_section_escaped))
-	to_replace := fmt.Sprintf("%s\nPrivateKey = %s", interface_section, key.String())
-	return interface_re.ReplaceAllString(config, to_replace)
-}
-
-func (server *Server) WireguardGetConfig() (string, error) {
-	profile_id := server.Profiles.Current
-	wireguardKey, wireguardErr := wireguardGenerateKey()
-
-	if wireguardErr != nil {
-		return "", wireguardErr
-	}
-
-	wireguardPublicKey := wireguardKey.PublicKey().String()
-	configWireguard, _, configErr := server.APIConnectWireguard(profile_id, wireguardPublicKey)
-
-	if configErr != nil {
-		return "", configErr
-	}
-
-	// FIXME: Store expiry
-	// This needs the go code a way to identify a connection
-	// Use the uuid of the connection e.g. on Linux
-	// This needs the client code to call the go code
-
-	configWireguardKey := wireguardConfigAddKey(configWireguard, wireguardKey)
-
-	return configWireguardKey, nil
-}
-- 
cgit v1.2.3