diff --git a/bridge/config.yml b/bridge/config.yml new file mode 100644 index 0000000..aa4ba1c --- /dev/null +++ b/bridge/config.yml @@ -0,0 +1,2 @@ +allowedServers: + - "127.0.0.1:16000" diff --git a/bridge/go.mod b/bridge/go.mod index cbc46d7..66322d0 100644 --- a/bridge/go.mod +++ b/bridge/go.mod @@ -1,3 +1,19 @@ module git.vh7.uk/jakew/echo-web/bridge go 1.18 + +require ( + git.vh7.uk/jakew/echo-go v0.0.0-20220803185705-357282c0e444 + github.com/gorilla/websocket v1.5.0 + github.com/rs/zerolog v1.27.0 + github.com/samber/lo v1.27.0 + gopkg.in/yaml.v3 v3.0.1 +) + +require ( + github.com/mattn/go-colorable v0.1.12 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect + github.com/thoas/go-funk v0.9.2 // indirect + golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect + golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect +) diff --git a/bridge/go.sum b/bridge/go.sum new file mode 100644 index 0000000..0081e39 --- /dev/null +++ b/bridge/go.sum @@ -0,0 +1,38 @@ +git.vh7.uk/jakew/echo-go v0.0.0-20220803185705-357282c0e444 h1:/GiYRoIHnYqoF9bAHwYXlLCy4praom2KlwBed8pW3ZU= +git.vh7.uk/jakew/echo-go v0.0.0-20220803185705-357282c0e444/go.mod h1:Q4YqOodoX+qYvfM0gSf78cCk0o7dkg1GLNYUFgB6qhU= +github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.27.0 h1:1T7qCieN22GVc8S4Q2yuexzBb1EqjbgjSH9RohbMjKs= +github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U= +github.com/samber/lo v1.27.0 h1:GOyDWxsblvqYobqsmUuMddPa2/mMzkKyojlXol4+LaQ= +github.com/samber/lo v1.27.0/go.mod h1:it33p9UtPMS7z72fP4gw/EIfQB2eI8ke7GR2wc6+Rhg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/thoas/go-funk v0.9.2 h1:oKlNYv0AY5nyf9g+/GhMgS/UO2ces0QRdPKwkhY3VCk= +github.com/thoas/go-funk v0.9.2/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q= +golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM= +golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/bridge/main.go b/bridge/main.go index 06ab7d0..93bbeaa 100644 --- a/bridge/main.go +++ b/bridge/main.go @@ -1 +1,113 @@ package main + +import ( + echo "git.vh7.uk/jakew/echo-go" + "github.com/gorilla/websocket" + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + "github.com/samber/lo" + "gopkg.in/yaml.v3" + "io/ioutil" + "net/http" + "os" +) + +type Config struct { + AllowedServers []string `yaml:"allowedServers"` +} + +type websocketHandler struct { + config Config +} + +var upgrader = websocket.Upgrader{ + CheckOrigin: func(r *http.Request) bool { + return true + }, +} + +func (h *websocketHandler) socketHandler(w http.ResponseWriter, r *http.Request) { + conn, err := upgrader.Upgrade(w, r, nil) + if err != nil { + log.Warn().Err(err).Msg("failed to upgrade connection") + return + } + defer conn.Close() + + log.Info().Str("address", conn.RemoteAddr().String()).Msg("websocket connection opened") + + server := r.URL.Query().Get("server") + username := r.URL.Query().Get("username") + password := r.URL.Query().Get("password") + + if !lo.Contains[string](h.config.AllowedServers, server) { + _ = conn.WriteMessage(websocket.TextMessage, []byte("{\"error\": \"Server not allowed\"}")) + return + } + + log.Info().Str("dest", server).Str("user", username).Msg("creating echo client") + client, err := echo.New(server, username) + if err != nil { + log.Error().Err(err).Msg("failed to create echo client") + _ = conn.WriteMessage(websocket.TextMessage, []byte("{\"error\": \"Failed to connect\"}")) + return + } + defer client.Disconnect() + + err = client.HandshakeLoop(password) + if err != nil { + log.Error().Err(err).Msg("failed to handshake with server") + _ = conn.WriteMessage(websocket.TextMessage, []byte("{\"error\": \"Failed to connect\"}")) + return + } + + for { + messageType, message, err := conn.ReadMessage() + if err != nil { + log.Warn().Err(err).Msg("failed to receive websocket message") + break + } + + if messageType == websocket.CloseMessage { + break + } else if messageType == websocket.TextMessage { + err = conn.WriteMessage(messageType, message) + if err != nil { + log.Warn().Err(err).Msg("failed to send websocket message") + break + } + } else { + log.Warn().Int("type", messageType).Bytes("message", message).Msg("message type not implemented") + } + } + + log.Info().Str("address", conn.RemoteAddr().String()).Msg("websocket connection closed") +} + +func main() { + log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr}) + + log.Debug().Msg("loading config") + bytes, err := ioutil.ReadFile("config.yml") + if err != nil { + log.Fatal().Err(err).Msg("failed to load config file") + } + + var config Config + err = yaml.Unmarshal(bytes, &config) + if err != nil { + log.Fatal().Err(err).Msg("failed to load config file") + } + + handler := websocketHandler{ + config: config, + } + + http.HandleFunc("/", handler.socketHandler) + + log.Info().Msg("starting server") + err = http.ListenAndServe(":4000", nil) + if err != nil { + log.Fatal().Err(err).Msg("failed to start server") + } +}