diff --git a/api.go b/api.go index a87643a..ada9033 100644 --- a/api.go +++ b/api.go @@ -238,16 +238,7 @@ func apiStart(br *broker) { }) go func() { - var err error - - if cfg.WebUISslCert != "" && cfg.WebUISslKey != "" { - log.Info().Msgf("Listen user on: %s SSL on", cfg.AddrUser) - err = r.RunTLS(cfg.AddrUser, cfg.WebUISslCert, cfg.WebUISslKey) - } else { - log.Info().Msgf("Listen user on: %s SSL off", cfg.AddrUser) - err = r.Run(cfg.AddrUser) - } - - log.Fatal().Err(err) + log.Info().Msgf("Listen user on: %s", cfg.AddrUser) + log.Fatal().Err(r.Run(cfg.AddrUser)) }() } diff --git a/config/config.go b/config/config.go index 428b208..986cb28 100644 --- a/config/config.go +++ b/config/config.go @@ -2,7 +2,6 @@ package config import ( "fmt" - "os" "strconv" "github.com/kylelemons/go-gypsy/yaml" @@ -17,15 +16,9 @@ type Config struct { HttpProxyRedirURL string HttpProxyRedirDomain string HttpProxyPort int - SslCert string - SslKey string - SslCacert string // mTLS for device - WebUISslCert string - WebUISslKey string Token string DevHookUrl string LocalAuth bool - SeparateSslConfig bool Password string AllowOrigins bool } @@ -57,15 +50,6 @@ func parseYamlCfg(cfg *Config, conf string) error { getConfigOpt(yamlCfg, "addr-http-proxy", &cfg.AddrHttpProxy) getConfigOpt(yamlCfg, "http-proxy-redir-url", &cfg.HttpProxyRedirURL) getConfigOpt(yamlCfg, "http-proxy-redir-domain", &cfg.HttpProxyRedirDomain) - getConfigOpt(yamlCfg, "ssl-cert", &cfg.SslCert) - getConfigOpt(yamlCfg, "ssl-key", &cfg.SslKey) - getConfigOpt(yamlCfg, "ssl-cacert", &cfg.SslCacert) - getConfigOpt(yamlCfg, "separate-ssl-config", &cfg.SeparateSslConfig) - - if cfg.SeparateSslConfig { - getConfigOpt(yamlCfg, "webui-ssl-cert", &cfg.WebUISslCert) - getConfigOpt(yamlCfg, "webui-ssl-key", &cfg.WebUISslKey) - } getConfigOpt(yamlCfg, "token", &cfg.Token) getConfigOpt(yamlCfg, "dev-hook-url", &cfg.DevHookUrl) @@ -118,48 +102,5 @@ func Parse(c *cli.Command) (*Config, error) { getFlagOpt(c, "password", &cfg.Password) getFlagOpt(c, "allow-origins", &cfg.AllowOrigins) - getFlagOpt(c, "ssl-cacert", &cfg.SslCacert) - getFlagOpt(c, "ssl-cert", &cfg.SslCert) - getFlagOpt(c, "ssl-key", &cfg.SslKey) - getFlagOpt(c, "separate-ssl-config", &cfg.SeparateSslConfig) - - if cfg.SeparateSslConfig { - getFlagOpt(c, "webui-ssl-cert", &cfg.WebUISslCert) - getFlagOpt(c, "webui-ssl-key", &cfg.WebUISslKey) - } else { - cfg.WebUISslCert = cfg.SslCert - cfg.WebUISslKey = cfg.SslKey - } - - if cfg.SslCacert != "" { - if _, err := os.Lstat(cfg.SslCacert); err != nil { - return nil, fmt.Errorf(`SslCacert "%s" not exist`, cfg.SslCacert) - } - } - - if cfg.SslCert != "" { - if _, err := os.Lstat(cfg.SslCert); err != nil { - return nil, fmt.Errorf(`SslCert "%s" not exist`, cfg.SslCert) - } - } - - if cfg.SslKey != "" { - if _, err := os.Lstat(cfg.SslKey); err != nil { - return nil, fmt.Errorf(`SslKey "%s" not exist`, cfg.SslKey) - } - } - - if cfg.WebUISslCert != "" { - if _, err := os.Lstat(cfg.WebUISslCert); err != nil { - return nil, fmt.Errorf(`WebUISslCert "%s" not exist`, cfg.WebUISslCert) - } - } - - if cfg.WebUISslKey != "" { - if _, err := os.Lstat(cfg.WebUISslKey); err != nil { - return nil, fmt.Errorf(`WebUISslKey "%s" not exist`, cfg.WebUISslKey) - } - } - return cfg, nil } diff --git a/device.go b/device.go index e269947..0b564d9 100644 --- a/device.go +++ b/device.go @@ -3,13 +3,9 @@ package main import ( "bufio" "bytes" - "crypto/rand" - "crypto/tls" - "crypto/x509" "encoding/binary" "io" "net" - "os" "rttys/client" "strings" "sync" @@ -432,39 +428,7 @@ func listenDevice(br *broker) { log.Fatal().Msg(err.Error()) } - if cfg.SslCert != "" && cfg.SslKey != "" { - crt, err := tls.LoadX509KeyPair(cfg.SslCert, cfg.SslKey) - if err != nil { - log.Fatal().Msg(err.Error()) - } - - tlsConfig := &tls.Config{} - tlsConfig.Certificates = []tls.Certificate{crt} - tlsConfig.Time = time.Now - tlsConfig.Rand = rand.Reader - tlsConfig.MinVersion = tls.VersionTLS12 - - if cfg.SslCacert == "" { - log.Warn().Msgf("mTLS not enabled") - } else { - caCert, err := os.ReadFile(cfg.SslCacert) - if err != nil { - log.Error().Msgf("mTLS not enabled: %s", err.Error()) - } else { - br.devCertPool = x509.NewCertPool() - br.devCertPool.AppendCertsFromPEM(caCert) - - // Create the TLS Config with the CA pool and enable Client certificate validation - tlsConfig.ClientCAs = br.devCertPool - tlsConfig.ClientAuth = tls.RequireAndVerifyClientCert - } - } - - ln = tls.NewListener(ln, tlsConfig) - log.Info().Msgf("Listen device on: %s SSL on", cfg.AddrDev) - } else { - log.Info().Msgf("Listen device on: %s SSL off", cfg.AddrDev) - } + log.Info().Msgf("Listen device on: %s", cfg.AddrDev) go func() { defer ln.Close() diff --git a/go.mod b/go.mod index c900aad..2bc54d2 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.24.4 require ( github.com/dwdcth/consoleEx v0.0.0-20180521133551-f56f6eb78b76 github.com/fanjindong/go-cache v0.0.6 - github.com/gin-contrib/cors v1.7.5 + github.com/gin-contrib/cors v1.7.6 github.com/gin-gonic/gin v1.10.1 github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.3 @@ -18,11 +18,11 @@ require ( ) require ( - github.com/bytedance/sonic v1.13.2 // indirect + github.com/bytedance/sonic v1.13.3 // indirect github.com/bytedance/sonic/loader v0.2.4 // indirect github.com/cloudwego/base64x v0.1.5 // indirect - github.com/gabriel-vasile/mimetype v1.4.8 // indirect - github.com/gin-contrib/sse v1.0.0 // indirect + github.com/gabriel-vasile/mimetype v1.4.9 // indirect + github.com/gin-contrib/sse v1.1.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.26.0 // indirect @@ -33,14 +33,14 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/pelletier/go-toml/v2 v2.2.3 // indirect + github.com/pelletier/go-toml/v2 v2.2.4 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect - github.com/ugorji/go/codec v1.2.12 // indirect - golang.org/x/arch v0.15.0 // indirect - golang.org/x/crypto v0.36.0 // indirect - golang.org/x/net v0.38.0 // indirect + github.com/ugorji/go/codec v1.3.0 // indirect + golang.org/x/arch v0.18.0 // indirect + golang.org/x/crypto v0.39.0 // indirect + golang.org/x/net v0.41.0 // indirect golang.org/x/sys v0.33.0 // indirect - golang.org/x/text v0.23.0 // indirect + golang.org/x/text v0.26.0 // indirect google.golang.org/protobuf v1.36.6 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 9d7c404..b59c827 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/bytedance/sonic v1.13.2 h1:8/H1FempDZqC4VqjptGo14QQlJx8VdZJegxs6wwfqpQ= -github.com/bytedance/sonic v1.13.2/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4= +github.com/bytedance/sonic v1.13.3 h1:MS8gmaH16Gtirygw7jV91pDCN33NyMrPbN7qiYhEsF0= +github.com/bytedance/sonic v1.13.3/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY= github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= @@ -15,12 +15,12 @@ github.com/dwdcth/consoleEx v0.0.0-20180521133551-f56f6eb78b76 h1:eObfFy0e/9OQCd github.com/dwdcth/consoleEx v0.0.0-20180521133551-f56f6eb78b76/go.mod h1:WPzFRpaqRmrZAD1vMpqUGZR24FE1EBoSG9lHKQyZOMM= github.com/fanjindong/go-cache v0.0.6 h1:4xl8MnfW8pFLH9cRjs0uNfVbFNqV342yl/pgX3Ql9gM= github.com/fanjindong/go-cache v0.0.6/go.mod h1:gxehZ3SqUVta6eFBJAcDlXDT2Q9piXkUqv7s4E0Vj6o= -github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM= -github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8= -github.com/gin-contrib/cors v1.7.5 h1:cXC9SmofOrRg0w9PigwGlHG3ztswH6bqq4vJVXnvYMk= -github.com/gin-contrib/cors v1.7.5/go.mod h1:4q3yi7xBEDDWKapjT2o1V7mScKDDr8k+jZ0fSquGoy0= -github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E= -github.com/gin-contrib/sse v1.0.0/go.mod h1:zNuFdwarAygJBht0NTKiSi3jRf6RbqeILZ9Sp6Slhe0= +github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY= +github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok= +github.com/gin-contrib/cors v1.7.6 h1:3gQ8GMzs1Ylpf70y8bMw4fVpycXIeX1ZemuSQIsnQQY= +github.com/gin-contrib/cors v1.7.6/go.mod h1:Ulcl+xN4jel9t1Ry8vqph23a60FwH9xVLd+3ykmTjOk= +github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w= +github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM= github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ= github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= @@ -34,8 +34,8 @@ github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAu github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -67,8 +67,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= -github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= +github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= +github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= 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= @@ -80,27 +80,25 @@ github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= -github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= -github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA= +github.com/ugorji/go/codec v1.3.0/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= github.com/urfave/cli/v3 v3.3.8 h1:BzolUExliMdet9NlJ/u4m5vHSotJ3PzEqSAZ1oPMa/E= github.com/urfave/cli/v3 v3.3.8/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo= -golang.org/x/arch v0.15.0 h1:QtOrQd0bTUnhNVNndMpLHNWrDmYzZ2KDqSrEymqInZw= -golang.org/x/arch v0.15.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE= -golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= -golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= -golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= -golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/arch v0.18.0 h1:WN9poc33zL4AzGxqf8VtpKUnGvMi8O9lhNyBMF/85qc= +golang.org/x/arch v0.18.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk= +golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM= +golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U= +golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= +golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -108,10 +106,8 @@ golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= -golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= -golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M= +golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/http.go b/http.go index b914238..63a0b38 100644 --- a/http.go +++ b/http.go @@ -2,7 +2,6 @@ package main import ( "bufio" - "crypto/tls" "encoding/binary" "errors" "fmt" @@ -244,24 +243,9 @@ func listenHttpProxy(brk *broker) { log.Fatal().Msg(err.Error()) } - if cfg.WebUISslCert != "" && cfg.WebUISslKey != "" { - crt, err := tls.LoadX509KeyPair(cfg.WebUISslCert, cfg.WebUISslKey) - if err != nil { - log.Fatal().Msg(err.Error()) - } - - tlsConfig := &tls.Config{Certificates: []tls.Certificate{crt}} - - ln = tls.NewListener(ln, tlsConfig) - } - cfg.HttpProxyPort = ln.Addr().(*net.TCPAddr).Port - if cfg.WebUISslCert != "" && cfg.WebUISslKey != "" { - log.Info().Msgf("Listen http proxy on: %s SSL on", ln.Addr().(*net.TCPAddr)) - } else { - log.Info().Msgf("Listen http proxy on: %s SSL off", ln.Addr().(*net.TCPAddr)) - } + log.Info().Msgf("Listen http proxy on: %s", ln.Addr().(*net.TCPAddr)) go func() { defer ln.Close() @@ -344,11 +328,7 @@ func httpProxyRedirect(br *broker, c *gin.Context) { host = c.Request.Host } - if cfg.WebUISslCert != "" && cfg.WebUISslKey != "" { - location = "https://" + host - } else { - location = "http://" + host - } + location = "http://" + host if cfg.HttpProxyPort != 80 { location += fmt.Sprintf(":%d", cfg.HttpProxyPort) diff --git a/main.go b/main.go index e24c2ac..7f8d9f6 100644 --- a/main.go +++ b/main.go @@ -112,18 +112,6 @@ func main() { Name: "http-proxy-redir-domain", Usage: "domain for HTTP proxy set cookie", }, - &cli.StringFlag{ - Name: "ssl-cert", - Usage: "ssl cert file Path", - }, - &cli.StringFlag{ - Name: "ssl-key", - Usage: "ssl key file Path", - }, - &cli.StringFlag{ - Name: "ssl-cacert", - Usage: "mtls CA storage in PEM file Path", - }, &cli.StringFlag{ Name: "token", Aliases: []string{"t"}, diff --git a/rttys.conf b/rttys.conf index 6d11a46..5b29799 100644 --- a/rttys.conf +++ b/rttys.conf @@ -9,15 +9,6 @@ # Used for set cookie #http-proxy-redir-domain: -#ssl-cacert: /etc/rttys/rttys.ca -#ssl-cert: /etc/rttys/rttys.crt -#ssl-key: /etc/rttys/rttys.key - -#if you want to use separate SSL config for webui, set this to True.otherwise, it will use the same SSL config for device and webui -#separate-ssl-config: True -#webui-ssl-cert: /etc/rttys/webui-rttys.crt -#webui-ssl-key: /etc/rttys/webui-rttys.key - #token: a1d4cdb1a3cd6a0e94aa3599afcddcf5 #dev-auth-url: http://127.0.0.1:8080/rttys-dev-auth