test net.Listen ipv6 then do ipv4

This commit is contained in:
Anthony Metzidis 2024-01-02 20:15:44 -08:00
parent 6636f7d2b4
commit 8d0e61bbc1

View File

@ -707,7 +707,7 @@ func configSetup(ctx context.Context, id, name string, m configmap.Mapper, oauth
} }
go server.Serve() go server.Serve()
defer server.Stop() defer server.Stop()
authURL = "http://" + bindAddress + "/auth?state=" + state authURL = "http://" + server.bindAddress + "/auth?state=" + state
if !authorizeNoAutoBrowser { if !authorizeNoAutoBrowser {
// Open the URL for the user to visit // Open the URL for the user to visit
@ -826,7 +826,6 @@ func (s *authServer) handleAuth(w http.ResponseWriter, req *http.Request) {
// Init gets the internal web server ready to receive config details // Init gets the internal web server ready to receive config details
func (s *authServer) Init() error { func (s *authServer) Init() error {
fs.Debugf(nil, "Starting auth server on %s", s.bindAddress)
mux := http.NewServeMux() mux := http.NewServeMux()
s.server = &http.Server{ s.server = &http.Server{
Addr: s.bindAddress, Addr: s.bindAddress,
@ -847,10 +846,14 @@ func (s *authServer) Init() error {
mux.HandleFunc("/", s.handleAuth) mux.HandleFunc("/", s.handleAuth)
var err error var err error
s.listener, err = net.Listen("tcp", s.bindAddress) if s.listener, err = net.Listen("tcp", "[::1]:"+bindPort); err != nil {
if err != nil { if s.listener, err = net.Listen("tcp", "127.0.0.1:"+bindPort); err != nil {
return err return err
}
} }
s.bindAddress = s.listener.Addr().String()
s.authURL = "http://" + s.bindAddress + "/"
fs.Debugf(nil, "Starting auth server on %s / %s", s.bindAddress, s.authURL)
return nil return nil
} }