From 0a2cba647caa4fa9036d9669133b78de4b59892b Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Tue, 6 Dec 2022 11:55:33 +0000 Subject: [PATCH] fix: disabling tcp webserver sockets, fixes #434 --- config/config.go | 7 ++++--- main.go | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/config/config.go b/config/config.go index adc6f22..cc51fc6 100644 --- a/config/config.go +++ b/config/config.go @@ -4,8 +4,6 @@ import ( "encoding/json" "flag" "fmt" - "github.com/muety/wakapi/utils" - "github.com/robfig/cron/v3" "io/ioutil" "net/http" "os" @@ -14,6 +12,9 @@ import ( "strings" "time" + "github.com/muety/wakapi/utils" + "github.com/robfig/cron/v3" + "github.com/emvi/logbuch" "github.com/gorilla/securecookie" "github.com/jinzhu/configor" @@ -451,7 +452,7 @@ func Load(version string) *Config { } // some validation checks - if config.Server.ListenIpV4 == "" && config.Server.ListenIpV6 == "" && config.Server.ListenSocket == "" { + if config.Server.ListenIpV4 == "-" && config.Server.ListenIpV6 == "-" && config.Server.ListenSocket == "" { logbuch.Fatal("either of listen_ipv4 or listen_ipv6 or listen_socket must be set") } if config.Db.MaxConn <= 0 { diff --git a/main.go b/main.go index 883d3cb..3960c88 100644 --- a/main.go +++ b/main.go @@ -2,7 +2,6 @@ package main import ( "embed" - "github.com/muety/wakapi/static/docs" "io/fs" "log" "net" @@ -11,11 +10,13 @@ import ( "strconv" "time" + "github.com/muety/wakapi/static/docs" + "github.com/emvi/logbuch" "github.com/gorilla/handlers" "github.com/gorilla/mux" "github.com/lpar/gzipped/v2" - "github.com/swaggo/http-swagger" + httpSwagger "github.com/swaggo/http-swagger" conf "github.com/muety/wakapi/config" "github.com/muety/wakapi/middlewares" @@ -298,7 +299,7 @@ func listen(handler http.Handler) { var s4, s6, sSocket *http.Server // IPv4 - if config.Server.ListenIpV4 != "" { + if config.Server.ListenIpV4 != "-" { bindString4 := config.Server.ListenIpV4 + ":" + strconv.Itoa(config.Server.Port) s4 = &http.Server{ Handler: handler, @@ -309,7 +310,7 @@ func listen(handler http.Handler) { } // IPv6 - if config.Server.ListenIpV6 != "" { + if config.Server.ListenIpV6 != "-" { bindString6 := "[" + config.Server.ListenIpV6 + "]:" + strconv.Itoa(config.Server.Port) s6 = &http.Server{ Handler: handler,