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

Overhaul UI architecture

Browse Source 
Learned about the :target CSS selector, which can be used to
replace content depending on the current URL hash. This allows
making a sort of single page app without JavaScript.

Currently experimenting with returning all the pages in a single
request, then switching between them with :target. Seems to be
working quite well so far.
This commit is contained in:
Anders Pitman 2020-10-15 09:50:12 -06:00
parent 770440ef79
commit 4c78059e66
8 changed files with 260 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
todo.md
View File

@ -9,3 +9,6 @@
* Properly pick unused ports for tunnels
* Apparently multiple tunnels can bind to a single server port. Looks like
maybe only the first one is used to actually tunnel to the clients?
* Maybe add a DNS/Domains page and require users to add domains their before
they can use them for tunnels. This creates a natural place to explain what
is wrong when domain stuff breaks.

189
ui_handler.go
View File

@ -22,6 +22,14 @@ type WebUiHandler struct {
menuHtml template.HTML
}
type IndexData struct {
Head template.HTML
Menu template.HTML
Tunnels map[string]Tunnel
Tokens map[string]TokenData
Users map[string]User
}
type TunnelsData struct {
Head template.HTML
Menu template.HTML
@ -138,7 +146,7 @@ func (h *WebUiHandler) handleWebUiRequest(w http.ResponseWriter, r *http.Request
menuTmpl, err := template.New("menu").Parse(menuTmplStr)
if err != nil {
w.WriteHeader(500)
h.alertDialog(w, r, "Failed to parse menu.tmpl", "/")
h.alertDialog(w, r, "Failed to parse menu.tmpl", "/#/tunnels")
return
}
@ -152,10 +160,10 @@ func (h *WebUiHandler) handleWebUiRequest(w http.ResponseWriter, r *http.Request
h.handleLogin(w, r)
case "/users":
if user.IsAdmin {
h.usersPage(w, r)
h.handleUsers(w, r)
} else {
w.WriteHeader(403)
h.alertDialog(w, r, "Not authorized", "/")
h.alertDialog(w, r, "Not authorized", "/#/tunnels")
return
}
@ -166,11 +174,53 @@ func (h *WebUiHandler) handleWebUiRequest(w http.ResponseWriter, r *http.Request
h.deleteUser(w, r)
} else {
w.WriteHeader(403)
h.alertDialog(w, r, "Not authorized", "/")
h.alertDialog(w, r, "Not authorized", "/#/tunnels")
return
}
case "/":
http.Redirect(w, r, "/tunnels", 302)
indexTmplStr, err := h.box.String("index.tmpl")
if err != nil {
w.WriteHeader(500)
h.alertDialog(w, r, "Error reading index.tmpl", "/#/tunnels")
return
}
tmpl, err := template.New("index").Parse(indexTmplStr)
if err != nil {
w.WriteHeader(500)
h.alertDialog(w, r, "Error compiling index.tmpl", "/#/tunnels")
return
}
var tokens map[string]TokenData
var users map[string]User
if user.IsAdmin {
tokens = h.db.GetTokens()
users = h.db.GetUsers()
} else {
tokens = make(map[string]TokenData)
for token, td := range h.db.GetTokens() {
if tokenData.Owner == td.Owner {
tokens[token] = td
}
}
users = make(map[string]User)
users[tokenData.Owner] = user
}
indexData := IndexData{
Head: h.headHtml,
Menu: h.menuHtml,
Tunnels: h.api.GetTunnels(tokenData),
Tokens: tokens,
Users: users,
}
tmpl.Execute(w, indexData)
case "/tunnels":
h.handleTunnels(w, r, tokenData)
case "/confirm-delete-tunnel":
@ -195,7 +245,7 @@ func (h *WebUiHandler) handleWebUiRequest(w http.ResponseWriter, r *http.Request
Head: h.headHtml,
Message: fmt.Sprintf("Are you sure you want to delete %s?", domain),
ConfirmUrl: fmt.Sprintf("/delete-tunnel?domain=%s", domain),
CancelUrl: "/",
CancelUrl: "/#/tunnels",
}
tmpl.Execute(w, data)
@ -207,14 +257,14 @@ func (h *WebUiHandler) handleWebUiRequest(w http.ResponseWriter, r *http.Request
err := h.api.DeleteTunnel(tokenData, r.Form)
if err != nil {
w.WriteHeader(400)
h.alertDialog(w, r, err.Error(), "/tunnels")
h.alertDialog(w, r, err.Error(), "/#/tunnels")
return
}
http.Redirect(w, r, "/", 307)
http.Redirect(w, r, "/#/tunnels", 307)
case "/tokens":
h.tokensPage(w, r, user, tokenData)
h.handleTokens(w, r, user, tokenData)
case "/confirm-delete-token":
h.confirmDeleteToken(w, r)
case "/delete-token":
@ -222,19 +272,24 @@ func (h *WebUiHandler) handleWebUiRequest(w http.ResponseWriter, r *http.Request
default:
w.WriteHeader(404)
h.alertDialog(w, r, "Unknown page "+r.URL.Path, "/")
h.alertDialog(w, r, "Unknown page "+r.URL.Path, "/#/tunnels")
return
}
}
func (h *WebUiHandler) tokensPage(w http.ResponseWriter, r *http.Request, user User, tokenData TokenData) {
func (h *WebUiHandler) handleTokens(w http.ResponseWriter, r *http.Request, user User, tokenData TokenData) {
if r.Method != "POST" {
w.WriteHeader(405)
h.alertDialog(w, r, "Invalid method for tokens", "/#/tokens")
return
}
if r.Method == "POST" {
r.ParseForm()
if len(r.Form["owner"]) != 1 {
w.WriteHeader(400)
h.alertDialog(w, r, "Invalid owner parameter", "/tokens")
h.alertDialog(w, r, "Invalid owner parameter", "/#/tokens")
return
}
owner := r.Form["owner"][0]
@ -244,52 +299,18 @@ func (h *WebUiHandler) tokensPage(w http.ResponseWriter, r *http.Request, user U
_, exists := users[owner]
if !exists {
w.WriteHeader(400)
h.alertDialog(w, r, "Owner doesn't exist", "/tokens")
h.alertDialog(w, r, "Owner doesn't exist", "/#/tokens")
return
}
_, err := h.db.AddToken(owner)
if err != nil {
w.WriteHeader(500)
h.alertDialog(w, r, "Failed creating token", "/tokens")
h.alertDialog(w, r, "Failed creating token", "/#/tokens")
return
}
http.Redirect(w, r, "/tokens", 303)
}
tmpl, err := h.loadTemplate("tokens.tmpl")
if err != nil {
w.WriteHeader(500)
io.WriteString(w, err.Error())
return
}
var tokens map[string]TokenData
var users map[string]User
if user.IsAdmin {
tokens = h.db.GetTokens()
users = h.db.GetUsers()
} else {
tokens = make(map[string]TokenData)
for token, td := range h.db.GetTokens() {
if tokenData.Owner == td.Owner {
tokens[token] = td
}
}
users = make(map[string]User)
users[tokenData.Owner] = user
}
tmpl.Execute(w, TokensData{
Head: h.headHtml,
Menu: h.menuHtml,
Tokens: tokens,
Users: users,
})
http.Redirect(w, r, "/#/tokens", 303)
}
func (h *WebUiHandler) handleLogin(w http.ResponseWriter, r *http.Request) {
@ -314,7 +335,7 @@ func (h *WebUiHandler) handleLogin(w http.ResponseWriter, r *http.Request) {
if h.auth.Authorized(token) {
cookie := &http.Cookie{Name: "access_token", Value: token, Secure: true, HttpOnly: true}
http.SetCookie(w, cookie)
http.Redirect(w, r, "/", 303)
http.Redirect(w, r, "/#/tunnels", 303)
} else {
h.sendLoginPage(w, r, 403)
return
@ -324,34 +345,11 @@ func (h *WebUiHandler) handleLogin(w http.ResponseWriter, r *http.Request) {
func (h *WebUiHandler) handleTunnels(w http.ResponseWriter, r *http.Request, tokenData TokenData) {
switch r.Method {
case "GET":
tunnelsTemplate, err := h.box.String("tunnels.tmpl")
if err != nil {
w.WriteHeader(500)
io.WriteString(w, "Error reading tunnels.tmpl")
return
}
tmpl, err := template.New("tunnels").Parse(tunnelsTemplate)
if err != nil {
w.WriteHeader(500)
log.Println(err)
io.WriteString(w, "Error compiling tunnels.tmpl")
return
}
tunnelsData := TunnelsData{
Head: h.headHtml,
Menu: h.menuHtml,
Tunnels: h.api.GetTunnels(tokenData),
}
tmpl.Execute(w, tunnelsData)
case "POST":
h.handleCreateTunnel(w, r, tokenData)
default:
w.WriteHeader(405)
w.Write([]byte("Invalid method for /tunnels"))
w.Write([]byte("Invalid method for /#/tunnels"))
return
}
}
@ -363,11 +361,11 @@ func (h *WebUiHandler) handleCreateTunnel(w http.ResponseWriter, r *http.Request
_, err := h.api.CreateTunnel(tokenData, r.Form)
if err != nil {
w.WriteHeader(400)
h.alertDialog(w, r, err.Error(), "/")
h.alertDialog(w, r, err.Error(), "/#/tunnels")
return
}
http.Redirect(w, r, "/", 303)
http.Redirect(w, r, "/#/tunnels", 303)
}
func (h *WebUiHandler) sendLoginPage(w http.ResponseWriter, r *http.Request, code int) {
@ -396,9 +394,14 @@ func (h *WebUiHandler) sendLoginPage(w http.ResponseWriter, r *http.Request, cod
loginTemplate.Execute(w, loginData)
}
func (h *WebUiHandler) usersPage(w http.ResponseWriter, r *http.Request) {
func (h *WebUiHandler) handleUsers(w http.ResponseWriter, r *http.Request) {
if r.Method != "POST" {
w.WriteHeader(405)
h.alertDialog(w, r, "Invalid method for users", "/#/users")
return
}
if r.Method == "POST" {
r.ParseForm()
if len(r.Form["username"]) != 1 {
@ -412,7 +415,7 @@ func (h *WebUiHandler) usersPage(w http.ResponseWriter, r *http.Request) {
if len(username) < minUsernameLen {
w.WriteHeader(400)
errStr := fmt.Sprintf("Username must be at least %d characters", minUsernameLen)
h.alertDialog(w, r, errStr, "/users")
h.alertDialog(w, r, errStr, "/#/users")
return
}
@ -421,25 +424,11 @@ func (h *WebUiHandler) usersPage(w http.ResponseWriter, r *http.Request) {
err := h.db.AddUser(username, isAdmin)
if err != nil {
w.WriteHeader(500)
h.alertDialog(w, r, err.Error(), "/users")
h.alertDialog(w, r, err.Error(), "/#/users")
return
}
http.Redirect(w, r, "/users", 303)
}
tmpl, err := h.loadTemplate("users.tmpl")
if err != nil {
w.WriteHeader(500)
io.WriteString(w, err.Error())
return
}
tmpl.Execute(w, UsersData{
Head: h.headHtml,
Menu: h.menuHtml,
Users: h.db.GetUsers(),
})
http.Redirect(w, r, "/#/users", 303)
}
func (h *WebUiHandler) confirmDeleteUser(w http.ResponseWriter, r *http.Request) {
@ -464,7 +453,7 @@ func (h *WebUiHandler) confirmDeleteUser(w http.ResponseWriter, r *http.Request)
Head: h.headHtml,
Message: fmt.Sprintf("Are you sure you want to delete user %s?", username),
ConfirmUrl: fmt.Sprintf("/delete-user?username=%s", username),
CancelUrl: "/users",
CancelUrl: "/#/users",
}
tmpl.Execute(w, data)
@ -483,7 +472,7 @@ func (h *WebUiHandler) deleteUser(w http.ResponseWriter, r *http.Request) {
h.db.DeleteUser(username)
http.Redirect(w, r, "/users", 303)
http.Redirect(w, r, "/#/users", 303)
}
func (h *WebUiHandler) confirmDeleteToken(w http.ResponseWriter, r *http.Request) {
@ -508,7 +497,7 @@ func (h *WebUiHandler) confirmDeleteToken(w http.ResponseWriter, r *http.Request
Head: h.headHtml,
Message: fmt.Sprintf("Are you sure you want to delete token %s?", token),
ConfirmUrl: fmt.Sprintf("/delete-token?token=%s", token),
CancelUrl: "/tokens",
CancelUrl: "/#/tokens",
}
tmpl.Execute(w, data)
@ -526,7 +515,7 @@ func (h *WebUiHandler) deleteToken(w http.ResponseWriter, r *http.Request) {
h.db.DeleteTokenData(token)
http.Redirect(w, r, "/tokens", 303)
http.Redirect(w, r, "/#/tokens", 303)
}

88
webui/index.tmpl Normal file
View File

@ -0,0 +1,88 @@
<!doctype html>
<html>
<head>
{{.Head}}
</head>
<body>
<main>
{{.Menu}}
<div class='content'>
<div class='page' id='/tunnels'>
<div class='list'>
{{range $domain, $tunnel:= .Tunnels}}
<div class='list-item'>
<div>
<a href="https://{{$domain}}">{{$domain}}</a>:{{$tunnel.TunnelPort}} -> {{$tunnel.ClientName}}:{{$tunnel.ClientPort}}
</div>
<a href="/confirm-delete-tunnel?domain={{$domain}}">
<button class='button red-button'>Delete</button>
</a>
</div>
{{end}}
</div>
<div class='tunnel-adder'>
<form action="/tunnels" method="POST">
<label for="domain">Domain:</label>
<input type="text" id="domain" name="domain">
<label for="client-name">Client Name:</label>
<input type="text" id="client-name" name="client-name">
<label for="client-port">Client Port:</label>
<input type="text" id="client-port" name="client-port">
<button class='button green-button' type="submit">Add/Update Tunnel</button>
</form>
</div>
</div>
<div class='page' id='/tokens'>
<div class='list'>
{{range $token, $tokenData := .Tokens}}
<div class='list-item'>
<span class='token'>{{$token}}</span> ({{$tokenData.Owner}})
<a href="/confirm-delete-token?token={{$token}}">
<button class='button red-button'>Delete</button>
</a>
</div>
{{end}}
</div>
<div class='token-adder'>
<form action="/tokens" method="POST">
<label for="owner">Owner:</label>
<select id="owner" name="owner">
{{range $username, $user := .Users}}
<option value="{{$username}}">{{$username}}</option>
{{end}}
</select>
<button class='button green-button' type="submit">Add Token</button>
</form>
</div>
</div>
<div class='page' id='/users'>
<div class='list'>
{{range $username, $user := .Users}}
<div class='list-item'>
{{$username}}
<a href="/confirm-delete-user?username={{$username}}">
<button class='button red-button'>Delete</button>
</a>
</div>
{{end}}
</div>
<div class='user-adder'>
<form action="/users" method="POST">
<label for="username">Username:</label>
<input type="text" id="username" name="username">
<label for="is-admin">Is Admin:</label>
<input type="checkbox" id="is-admin" name="is-admin">
<button class='button green-button' type="submit">Add User</button>
</form>
</div>
</div>
</div>
</main>
</body>
</html>

8
webui/menu.tmpl
View File

@ -1,9 +1,9 @@
<label id='menu-label' for='menu-toggle'>Menu</label>
<input type='checkbox' id='menu-toggle'/>
<label id='menu-label' for='menu-toggle'>Menu</label>
<div class='menu'>
<a class='menu-item' href='/tunnels'>Tunnels</a>
<a class='menu-item' href='/tokens'>Tokens</a>
<a class='menu-item' href='/#/tunnels'>Tunnels</a>
<a class='menu-item' href='/#/tokens'>Tokens</a>
{{if .IsAdmin}}
<a class='menu-item' href='/users'>Users</a>
<a class='menu-item' href='/#/users'>Users</a>
{{end}}
</div>

43
webui/styles.css
View File

@ -16,7 +16,7 @@ main {
font-size: 18px;
font-weight: bold;
display: block;
width: 100%;
/*width: 100%;*/
border: 1px solid black;
cursor: pointer;
padding: 5px;
@ -32,7 +32,7 @@ main {
position: absolute;
background: #fff;
border: 1px solid black;
min-width: 256px;
/*min-width: 256px;*/
}
.menu-item {
@ -55,6 +55,15 @@ main {
display: flex;
}
#menu-toggle:checked ~ #menu-label {
color: #fff;
background: #000;
}
.content {
border: 1px solid black;
}
.button {
background: #ccc;
border: none;
@ -109,3 +118,33 @@ main {
.token {
font-family: Monospace;
}
.page {
display: none;
}
.content *:target {
display: block;
}
@media (min-width: 900px) {
main {
display: flex;
justify-content: flex-start;
}
#menu-label {
display: none;
}
.menu {
display: flex;
position: static;
}
.content {
width: 900px;
}
}

33
webui/tokens.tmpl
View File

@ -1,33 +0,0 @@
<!doctype html>
<html>
<head>
{{.Head}}
</head>
<body>
<main>
{{.Menu}}
<div class='list'>
{{range $token, $tokenData := .Tokens}}
<div class='list-item'>
<span class='token'>{{$token}}</span> ({{$tokenData.Owner}})
<a href="/confirm-delete-token?token={{$token}}">
<button class='button red-button'>Delete</button>
</a>
</div>
{{end}}
</div>
<div class='token-adder'>
<form action="/tokens" method="POST">
<label for="owner">Owner:</label>
<select id="owner" name="owner">
{{range $username, $user := .Users}}
<option value="{{$username}}">{{$username}}</option>
{{end}}
</select>
<button class='button green-button' type="submit">Add Token</button>
</form>
</div>
</main>
</body>
</html>

36
webui/tunnels.tmpl
View File

@ -1,36 +0,0 @@
<!doctype html>
<html>
<head>
{{.Head}}
</head>
<body>
<main>
{{.Menu}}
<div class='list'>
{{range $domain, $tunnel:= .Tunnels}}
<div class='list-item'>
<div>
<a href="https://{{$domain}}">{{$domain}}</a>:{{$tunnel.TunnelPort}} -> {{$tunnel.ClientName}}:{{$tunnel.ClientPort}}
</div>
<a href="/confirm-delete-tunnel?domain={{$domain}}">
<button class='button red-button'>Delete</button>
</a>
</div>
{{end}}
<div class='tunnel-adder'>
<form action="/tunnels" method="POST">
<label for="domain">Domain:</label>
<input type="text" id="domain" name="domain">
<label for="client-name">Client Name:</label>
<input type="text" id="client-name" name="client-name">
<label for="client-port">Client Port:</label>
<input type="text" id="client-port" name="client-port">
<button class='button green-button' type="submit">Add/Update Tunnel</button>
</form>
</div>
</div>
</main>
</body>
</html>

31
webui/users.tmpl
View File

@ -1,31 +0,0 @@
<!doctype html>
<html>
<head>
{{.Head}}
</head>
<body>
<main>
{{.Menu}}
<div class='list'>
{{range $username, $user := .Users}}
<div class='list-item'>
{{$username}}
<a href="/confirm-delete-user?username={{$username}}">
<button class='button red-button'>Delete</button>
</a>
</div>
{{end}}
</div>
<div class='user-adder'>
<form action="/users" method="POST">
<label for="username">Username:</label>
<input type="text" id="username" name="username">
<label for="is-admin">Is Admin:</label>
<input type="checkbox" id="is-admin" name="is-admin">
<button class='button green-button' type="submit">Add User</button>
</form>
</div>
</main>
</body>
</html>