mirror of
https://github.com/boringproxy/boringproxy.git
synced 2025-02-25 18:55:29 -06:00
Merge pull request #170 from WGrobler/update-upstream
Minor code fixes/updates
This commit is contained in:
commit
2e0ff06c33
@ -153,11 +153,9 @@ func Listen() {
|
||||
}
|
||||
|
||||
if *printLogin {
|
||||
tokens := db.GetTokens()
|
||||
|
||||
for token, tokenData := range tokens {
|
||||
if tokenData.Owner == "admin" {
|
||||
printLoginInfo(token, db.GetAdminDomain())
|
||||
for token, tokenData := range db.GetTokens() {
|
||||
if tokenData.Owner == "admin" && tokenData.Client == "" {
|
||||
printLoginInfo(token, db.GetAdminDomain(), *httpsPort)
|
||||
break
|
||||
}
|
||||
}
|
||||
@ -439,9 +437,13 @@ func prompt(promptText string) string {
|
||||
return strings.TrimSpace(text)
|
||||
}
|
||||
|
||||
func printLoginInfo(token, adminDomain string) {
|
||||
log.Println("Admin token: " + token)
|
||||
url := fmt.Sprintf("https://%s/login?access_token=%s", adminDomain, token)
|
||||
func printLoginInfo(token, adminDomain string, httpsPort int) {
|
||||
var url string
|
||||
if httpsPort != 443 {
|
||||
url = fmt.Sprintf("https://%s:%d/login?access_token=%s", adminDomain, httpsPort, token)
|
||||
} else {
|
||||
url = fmt.Sprintf("https://%s/login?access_token=%s", adminDomain, token)
|
||||
}
|
||||
log.Println(fmt.Sprintf("Admin login link: %s", url))
|
||||
qrterminal.GenerateHalfBlock(url, qrterminal.L, os.Stdout)
|
||||
}
|
||||
|
@ -36,7 +36,7 @@
|
||||
{{range $domain, $tunnel:= .Tunnels}}
|
||||
<tr>
|
||||
<td class='tn-tunnel-table__cell'>
|
||||
<a href='https://{{$domain}}'>{{$domain}}</a>
|
||||
<a href='https://{{$domain}}' target="_blank">{{$domain}}</a>
|
||||
</td>
|
||||
<td class='tn-tunnel-table__cell'>{{$tunnel.ClientName}}</td>
|
||||
<td class='tn-tunnel-table__cell'>{{$tunnel.ClientAddress}}:{{$tunnel.ClientPort}}</td>
|
||||
|
Loading…
Reference in New Issue
Block a user