From 3c466dc88e40e598766631c80ece0acb57f29730 Mon Sep 17 00:00:00 2001 From: empathetic-alligator Date: Tue, 16 Dec 2014 19:59:52 -0500 Subject: [PATCH] Added timeout to github pubkey request. --- server.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server.go b/server.go index c425b80..702f7b5 100644 --- a/server.go +++ b/server.go @@ -296,7 +296,12 @@ func (s *Server) Whitelist(fingerprint string) error { var pubKeyRegex = regexp.MustCompile(`ssh-rsa ([A-Za-z0-9\+=\/]+)\s*`) // Returns an array of public keys for the given github user URL func getGithubPubKeys(url string) ([]ssh.PublicKey, error) { - resp, err := http.Get("http://" + url + ".keys") + timeout := time.Duration(10 * time.Second) + client := http.Client{ + Timeout: timeout, + } + resp, err := client.Get("http://" + url + ".keys") + if err != nil { return nil, err }