IntenseWebs/boringproxy
3
0
Fork 0
mirror of https://github.com/boringproxy/boringproxy.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into oauth2

Browse Source
This commit is contained in:
Anders Pitman
2022-03-01 15:41:30 -07:00
parent 608b93a6c9 2e0ff06c33
commit f232e1db24
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
boringproxy.go
View File

@@ -170,11 +170,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
}
}
@@ -471,9 +469,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)
}

2
templates/tunnels.tmpl
View File

@@ -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>