RusstopiaLabs
/
xs
mirror of https://gogs.blitter.com/RLabs/xs
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed bug in fallback from authtoken (-g) to password login

This commit is contained in:
Russ Magee 2018-09-16 17:30:02 -07:00
parent 19697d5164
commit d25b883873
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hkexauth.go
View File

@ -94,8 +94,8 @@ func AuthUserByToken(username string, connhostname string, auth string) (valid b
} }
record[0] = strings.TrimSpace(record[0]) record[0] = strings.TrimSpace(record[0])
record[1] = strings.TrimSpace(record[1]) record[1] = strings.TrimSpace(record[1])
fmt.Println("auth:", auth, "record:", //fmt.Println("auth:", auth, "record:",
strings.Join([]string{record[0], record[1]}, ":")) // strings.Join([]string{record[0], record[1]}, ":"))
if (connhostname == record[0]) && if (connhostname == record[0]) &&
(auth == strings.Join([]string{record[0], record[1]}, ":")) { (auth == strings.Join([]string{record[0], record[1]}, ":")) {

23
hkexsh/hkexsh.go
View File

@ -482,21 +482,20 @@ func main() {
idx := strings.Index(string(ab), remoteHost) idx := strings.Index(string(ab), remoteHost)
if idx >= 0 { if idx >= 0 {
ab = ab[idx:] ab = ab[idx:]
entries := strings.SplitN(string(ab), "\n", -1)
//if len(entries) > 0 {
//fmt.Println("entries[0]:", entries[0])
authCookie = strings.TrimSpace(entries[0])
//} else {
// fmt.Fprintln(os.Stderr, "ERROR: no matching authtoken")
// os.Exit(1)
//}
// Security scrub
ab = nil
runtime.GC()
} else { } else {
fmt.Fprintln(os.Stderr, "ERROR: no matching authtoken") fmt.Fprintln(os.Stderr, "ERROR: no matching authtoken")
os.Exit(1)
} }
entries := strings.SplitN(string(ab), "\n", -1)
//if len(entries) > 0 {
//fmt.Println("entries[0]:", entries[0])
authCookie = strings.TrimSpace(entries[0])
//} else {
// fmt.Fprintln(os.Stderr, "ERROR: no matching authtoken")
// os.Exit(1)
//}
// Security scrub
ab = nil
runtime.GC()
} }
} }