third-party-mirrors/ssh-chat
1
0
Fork 0
mirror of https://github.com/shazow/ssh-chat.git synced 2025-06-12 13:22:39 +03:00
Code Issues Projects Releases Wiki Activity

Fixed issues reported by golint.

Browse Source
This commit is contained in:
empathetic-alligator 2014-12-16 00:02:58 -05:00
parent 2a4a005b3c
commit da7ee40d95
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server.go
View File

@ -12,7 +12,6 @@ import (
"net/http" "net/http"
"io/ioutil" "io/ioutil"
"encoding/base64" "encoding/base64"
"errors"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
) )
@ -273,7 +272,7 @@ func (s *Server) Whitelist(fingerprint string) error {
return err return err
} }
if len(keys) == 0 { if len(keys) == 0 {
return errors.New(fmt.Sprintf("No github user %s", fingerprint)) return fmt.Errorf("No github user %s", fingerprint)
} }
for _, key := range keys { for _, key := range keys {
fingerprint = Fingerprint(key) fingerprint = Fingerprint(key)
@ -291,7 +290,7 @@ func (s *Server) Whitelist(fingerprint string) error {
return nil return nil
} }
var r *regexp.Regexp = regexp.MustCompile(`ssh-rsa ([A-Za-z0-9\+=\/]+)\s*`) var r = regexp.MustCompile(`ssh-rsa ([A-Za-z0-9\+=\/]+)\s*`)
func getGithubKey(url string) ([]ssh.PublicKey, error) { func getGithubKey(url string) ([]ssh.PublicKey, error) {
resp, err := http.Get("http://" + url + ".keys") resp, err := http.Get("http://" + url + ".keys")
if err != nil { if err != nil {
@ -302,20 +301,20 @@ func getGithubKey(url string) ([]ssh.PublicKey, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
body_str := string(body) bodyStr := string(body)
keys := r.FindAllStringSubmatch(body_str, -1) keys := r.FindAllStringSubmatch(bodyStr, -1)
pubs := make([]ssh.PublicKey, 0, 3) pubs := make([]ssh.PublicKey, 0, 3)
for _, key := range keys { for _, key := range keys {
if(len(key) < 2) { if(len(key) < 2) {
continue continue
} }
body_decoded, err := base64.StdEncoding.DecodeString(key[1]) bodyDecoded, err := base64.StdEncoding.DecodeString(key[1])
if err != nil { if err != nil {
return nil, err return nil, err
} }
pub, err := ssh.ParsePublicKey(body_decoded) pub, err := ssh.ParsePublicKey(bodyDecoded)
if err != nil { if err != nil {
return nil, err return nil, err
} }