gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2024-09-20 15:26:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

add timeout to http.get

Browse source
This commit is contained in:
Matthew R. Kasun 2022-05-13 06:04:27 -04:00
parent 4f0f3a1c15
commit c8ec507484
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
auth/google.go
View file

@ -5,6 +5,7 @@ import (
"fmt"
"io"
"net/http"
"time"
"github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/logic"
@ -99,7 +100,10 @@ func getGoogleUserInfo(state string, code string) (*googleOauthUser, error) {
if err != nil {
return nil, fmt.Errorf("failed to convert token to json: %s", err.Error())
}
response, err := http.Get("https://www.googleapis.com/oauth2/v2/userinfo?access_token=" + token.AccessToken)
client := &http.Client{
Timeout: time.Second * 30,
}
response, err := client.Get("https://www.googleapis.com/oauth2/v2/userinfo?access_token=" + token.AccessToken)
if err != nil {
return nil, fmt.Errorf("failed getting user info: %s", err.Error())
}

5
netclient/ncutils/netclientutils.go
View file

@ -130,7 +130,10 @@ func GetPublicIP() (string, error) {
endpoint := ""
var err error
for _, ipserver := range iplist {
resp, err := http.Get(ipserver)
client := &http.Client{
Timeout: time.Second * 10,
}
resp, err := client.Get(ipserver)
if err != nil {
continue
}

6
servercfg/serverconf.go
View file

@ -7,6 +7,7 @@ import (
"os"
"strconv"
"strings"
"time"
"github.com/gravitl/netmaker/config"
)
@ -411,7 +412,10 @@ func GetPublicIP() (string, error) {
iplist := []string{"https://ip.server.gravitl.com", "https://ifconfig.me", "https://api.ipify.org", "https://ipinfo.io/ip"}
for _, ipserver := range iplist {
resp, err := http.Get(ipserver)
client := &http.Client{
Timeout: time.Second * 10,
}
resp, err := client.Get(ipserver)
if err != nil {
continue
}