Initial import of rewrite

1 files changed, 23 insertions, 94 deletions

diff --git a/main.go b/main.go
index 1ac3351..3306a94 100644
--- a/main.go
+++ b/main.go
@@ -1,111 +1,40 @@
 package main
 
 import (
-        "context"
-        "errors"
-        "fmt"
+        "embed"
         "log"
-        "net/http"
-        "os"
-        "strings"
 
-        "github.com/spf13/cobra"
-)
-
-var version string
-
-var rootCmd = &cobra.Command{
-        Use:     "websocket-proxy",
-        Version: version,
-        Short:   "Proxy TCP connections over a websocket",
-}
-
-var clientCmd = &cobra.Command{
-        Use:   "client [server host]",
-        Short: "Act as a client for a websocket-proxy server",
-        Args: func(cmd *cobra.Command, args []string) error {
-                if len(args) != 1 || args[0] == "" {
-                        return errors.New("Server host is a required argument")
-                }
-                if !strings.HasPrefix(args[0], "ws://") && !strings.HasPrefix(args[0], "wss://") {
-                        return errors.New("Server host format is ws[s]://host[:port]/[path]")
-                }
-                return nil
-        },
-        Run: func(cmd *cobra.Command, args []string) {
-                listenOn := cmd.Flag("listen").Value.String()
-
-                // TODO: Handle signals
-                ctx, cancel := context.WithCancel(context.Background())
-                defer cancel()
-
-                h := &ClientHandler{
-                        SocketListenOn:  listenOn,
-                        WebsocketServer: args[0],
-                        Context:         ctx,
-                }
+        "code.crute.us/mcrute/ssh-proxy/app"
+        "code.crute.us/mcrute/ssh-proxy/cmd/client"
+        "code.crute.us/mcrute/ssh-proxy/cmd/register"
+        "code.crute.us/mcrute/ssh-proxy/cmd/web"
 
-                log.Printf("Serving on %s", listenOn)
-                h.Run()
-        },
-}
-
-var localClientCmd = &cobra.Command{
-        Use:   "localclient [server host]",
-        Short: "Act as a client for a websocket-proxy server",
-        Args: func(cmd *cobra.Command, args []string) error {
-                if len(args) != 1 || args[0] == "" {
-                        return errors.New("Server host is a required argument")
-                }
-                if !strings.HasPrefix(args[0], "ws://") && !strings.HasPrefix(args[0], "wss://") {
-                        return errors.New("Server host format is ws[s]://host[:port]/[path]")
-                }
-                return nil
-        },
-        Run: func(cmd *cobra.Command, args []string) {
-                // TODO: Handle signals
-                ctx, cancel := context.WithCancel(context.Background())
-                defer cancel()
+        "code.crute.us/mcrute/golib/cli"
 
-                h := &LocalClientHandler{
-                        WebsocketServer: args[0],
-                        Context:         ctx,
-                }
+        "github.com/spf13/cobra"
 
-                h.Run()
-        },
-}
+        // Import backup data. By default zoneinfo is installed in the docker image
+        // if something breaks this will still result in us having correct TZ info.
+        _ "time/tzdata"
+)
 
-var serverCmd = &cobra.Command{
-        Use:   "server [next-hop host]",
-        Short: "Serve websocket proxy client",
-        Args: func(cmd *cobra.Command, args []string) error {
-                if len(args) != 1 || args[0] == "" {
-                        return errors.New("Next-hop host is a required argument")
-                }
-                return nil
-        },
-        Run: func(cmd *cobra.Command, args []string) {
-                listenOn := cmd.Flag("listen").Value.String()
-                log.Printf("Serving on %s", listenOn)
+//go:embed templates
+var embeddedTemplates embed.FS
 
-                http.Handle("/", NewServerHandler(args[0]))
-                log.Fatal(http.ListenAndServe(listenOn, nil))
-        },
-}
+var appVersion string
 
 func main() {
-        log.SetOutput(os.Stderr)
-
-        rootCmd.AddCommand(clientCmd)
-        rootCmd.AddCommand(localClientCmd)
-        rootCmd.AddCommand(serverCmd)
+        rootCmd := &cobra.Command{
+                Use:   "web-server",
+                Short: "SSH proxy web server",
+        }
+        cli.AddFlags(rootCmd, &app.Config{}, app.DefaultConfig, "")
 
-        clientCmd.Flags().StringP("listen", "l", ":9013", "[address]:port to bind for serving clients")
-        serverCmd.Flags().StringP("listen", "l", ":9012", "[address]:port to bind for serving clients")
+        web.Register(rootCmd, embeddedTemplates, appVersion)
+        client.Register(rootCmd)
+        register.Register(rootCmd)
 
         if err := rootCmd.Execute(); err != nil {
-                fmt.Println(err)
-                os.Exit(1)
+                log.Fatalf("Error running root command: %s", err)
         }
 }