cmd/server.go

@@ -32,6 +32,7 @@ func init() {
 	serverCmd.PersistentFlags().StringP("port", "p", "1302", "port to use for listening")
 	serverCmd.PersistentFlags().StringP("history", "r", "", "File to store and recover chat history from")
 	serverCmd.PersistentFlags().String("password", "", "Password for accessing the chat server")
+	serverCmd.Flags().Bool("insecure", false, "[UNSAFE] Do not use TLS encryption")
 }
 
 func setServerParameters(cmd *cobra.Command) error {
@@ -57,5 +58,9 @@ func setServerParameters(cmd *cobra.Command) error {
 	if parPassword != "" {
 		password = parPassword
 	}
+	insecure, err := cmd.Flags().GetBool("insecure")
+	if insecure == true {
+		servInsecure = true
+	}
 	return nil
 }

cmd/serverFunc.go

@@ -56,17 +56,6 @@ func startInsecureServer() (net.Listener, error) {
 }
 
 func startSecureServer() (net.Listener, error) {
-
-}
-
-func Server() {
-	var ln net.Listener
-	var err error
-	if servInsecure == true {
-		ln, err = startInsecureServer()
-	} else {
-		ln, err = startSecureServer()
-	}
 	cer, err := tls.LoadX509KeyPair("server.crt", "server.key")
 	if os.IsNotExist(err) {
 		createCerts()
@@ -76,8 +65,19 @@ func Server() {
 		log.Fatalf("Error happened loading certificates: %v\n", err)
 	}
 	config := &tls.Config{Certificates: []tls.Certificate{cer}}
-
 	ln, err := tls.Listen("tcp", ":"+listenPort, config)
+	return ln, err
+}
+
+func Server() {
+	var ln net.Listener
+	var err error
+	if servInsecure == true {
+		fmt.Println("[WARNING] Starting unencrypted server!")
+		ln, err = startInsecureServer()
+	} else {
+		ln, err = startSecureServer()
+	}
 
 	if err != nil {
 		log.Fatalf("Error happened trying to listen on port: %v\n", err)