Server auto-detects simple configuration (#84)

* initial --simple auto-detect

* updating logic to check for pubkey to run in simple mode

* resolving changes to add_server

* better error messages

* removing simple from commands

---------

Co-authored-by: Adam <[email protected]>

Author: ntozaks

src/cmd/add_server.go

@@ -389,7 +389,7 @@ func (c addServerCmdConfig) Run() {
 		defer file.Close()
 
 		data := []string{
-			peer.CreateServerFile(serverConfigRelay, serverConfigE2EE),
+			peer.CreateServerFile(serverConfigRelay, serverConfigE2EE, false),
 			"# POSIX Shell: " + peer.CreateServerCommand(serverConfigRelay, serverConfigE2EE, peer.POSIX, false, disableV6),
 			"# Powershell: " + peer.CreateServerCommand(serverConfigRelay, serverConfigE2EE, peer.PowerShell, false, disableV6),
 		}

src/cmd/configure.go

@@ -128,6 +128,7 @@ func init() {
 				"relay-output",
 				"e2ee-output",
 				"server-output",
+				"simple",
 			} {
 				err := cmd.Flags().MarkHidden(f)
 				if err != nil {
@@ -326,7 +327,7 @@ func (c configureCmdConfig) Run() {
 		defer file.Close()
 
 		data := []string{
-			peer.CreateServerFile(serverConfigRelay, serverConfigE2EE),
+			peer.CreateServerFile(serverConfigRelay, serverConfigE2EE, c.simple),
 			"# POSIX Shell: " + peer.CreateServerCommand(serverConfigRelay, serverConfigE2EE, peer.POSIX, c.simple, c.disableV6),
 			"# Powershell: " + peer.CreateServerCommand(serverConfigRelay, serverConfigE2EE, peer.PowerShell, c.simple, c.disableV6),
 		}
@@ -341,9 +342,6 @@ func (c configureCmdConfig) Run() {
 
 	// Make config file string
 	serverConfigFile := fmt.Sprintf("./wiretap serve -f %s", c.configFileServer)
-	if c.simple {
-		serverConfigFile = fmt.Sprintf("%s --simple", serverConfigFile)
-	}
 	if c.disableV6 {
 		serverConfigFile = fmt.Sprintf("%s --disable-ipv6", serverConfigFile)
 	}

src/cmd/serve.go

@@ -315,8 +315,20 @@ func (c serveCmdConfig) Run() {
 	}
 
 	// Check for required flags.
-	if !viper.IsSet("Relay.Peer.publickey") || (!viper.IsSet("simple") && !viper.IsSet("E2EE.Peer.publickey")) {
-		check("config error", errors.New("public key of peer is required"))
+	if !viper.IsSet("Relay.Peer.publickey") && !viper.IsSet("E2EE.Peer.publickey") {
+		check("config error", errors.New("no peer public keys provided"))
+	}
+
+	if viper.IsSet("E2EE.Peer.publickey") && !viper.IsSet("Relay.Peer.publickey") {
+		check("config error", errors.New("only E2EE public key provided"))
+	}
+
+	if !viper.IsSet("E2EE.Peer.publickey") {
+		fmt.Println("E2EE peer public key missing, running Wiretap in simple mode.")
+		serveCmd.simple = true
+		if !viper.IsSet("Relay.Peer.publickey") {
+			check("config error", errors.New("public key of Relay peer is required"))
+		}
 	}
 
 	if viper.IsSet("disableipv6") && netip.MustParseAddr(viper.GetString("E2EE.Interface.api")).Is6() {

src/peer/config.go

@@ -522,11 +522,7 @@ func CreateServerCommand(relayConfig Config, e2eeConfig Config, shell Shell, sim
 			keys = append(keys, "WIRETAP_E2EE_PEER_ENDPOINT")
 			vals = append(vals, e2eeConfig.GetPeerEndpoint(0))
 		}
-	} else {
-		keys = append(keys, "WIRETAP_SIMPLE")
-		vals = append(vals, "true")
-	}
-
+	} 
 	if disableV6 {
 		keys = append(keys, "WIRETAP_DISABLEIPV6")
 		vals = append(vals, "true")
@@ -553,7 +549,7 @@ func CreateServerCommand(relayConfig Config, e2eeConfig Config, shell Shell, sim
 	return s.String()
 }
 
-func CreateServerFile(relayConfig Config, e2eeConfig Config) string {
+func CreateServerFile(relayConfig Config, e2eeConfig Config, simple bool) string {
 	var s strings.Builder
 
 	// Relay Interface.
@@ -594,20 +590,21 @@ func CreateServerFile(relayConfig Config, e2eeConfig Config) string {
 	if len(relayConfig.GetPeerEndpoint(0)) > 0 {
 		s.WriteString(fmt.Sprintf("Endpoint = %s\n", relayConfig.GetPeerEndpoint(0)))
 	}
+	if !simple {
+		// E2EE Interface.
+		s.WriteString("\n[E2EE.Interface]\n")
+		s.WriteString(fmt.Sprintf("PrivateKey = %s\n", e2eeConfig.GetPrivateKey()))
 
-	// E2EE Interface.
-	s.WriteString("\n[E2EE.Interface]\n")
-	s.WriteString(fmt.Sprintf("PrivateKey = %s\n", e2eeConfig.GetPrivateKey()))
-
-	if len(e2eeConfig.addresses) == 1 {
-		s.WriteString(fmt.Sprintf("Api = %s\n", e2eeConfig.addresses[0].IP.String()))
-	}
+		if len(e2eeConfig.addresses) == 1 {
+			s.WriteString(fmt.Sprintf("Api = %s\n", e2eeConfig.addresses[0].IP.String()))
+		}
 
-	// E2EE Peer.
-	s.WriteString("\n[E2EE.Peer]\n")
-	s.WriteString(fmt.Sprintf("PublicKey = %s\n", e2eeConfig.GetPeerPublicKey(0)))
-	if len(e2eeConfig.GetPeerEndpoint(0)) > 0 {
-		s.WriteString(fmt.Sprintf("Endpoint = %s\n", e2eeConfig.GetPeerEndpoint(0)))
+		// E2EE Peer.
+		s.WriteString("\n[E2EE.Peer]\n")
+		s.WriteString(fmt.Sprintf("PublicKey = %s\n", e2eeConfig.GetPeerPublicKey(0)))
+		if len(e2eeConfig.GetPeerEndpoint(0)) > 0 {
+			s.WriteString(fmt.Sprintf("Endpoint = %s\n", e2eeConfig.GetPeerEndpoint(0)))
+		}
 	}
 
 	return s.String()