mirror of
https://github.com/boringproxy/boringproxy.git
synced 2025-02-25 18:55:29 -06:00
Clean up menu stuff
Also only send /users page when isAdmin is true
This commit is contained in:
Anders Pitman
parent
7df93c0821
commit
2eafde030e
@ -19,12 +19,10 @@ type WebUiHandler struct {
|
|||||||
tunMan *TunnelManager
|
tunMan *TunnelManager
|
||||||
box *rice.Box
|
box *rice.Box
|
||||||
headHtml template.HTML
|
headHtml template.HTML
|
||||||
menuHtml template.HTML
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type IndexData struct {
|
type IndexData struct {
|
||||||
Head template.HTML
|
Head template.HTML
|
||||||
Menu template.HTML
|
|
||||||
Tunnels map[string]Tunnel
|
Tunnels map[string]Tunnel
|
||||||
Tokens map[string]TokenData
|
Tokens map[string]TokenData
|
||||||
Users map[string]User
|
Users map[string]User
|
||||||
@ -33,7 +31,6 @@ type IndexData struct {
|
|||||||
|
|
||||||
type TunnelsData struct {
|
type TunnelsData struct {
|
||||||
Head template.HTML
|
Head template.HTML
|
||||||
Menu template.HTML
|
|
||||||
Tunnels map[string]Tunnel
|
Tunnels map[string]Tunnel
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -64,13 +61,11 @@ type MenuData struct {
|
|||||||
|
|
||||||
type UsersData struct {
|
type UsersData struct {
|
||||||
Head template.HTML
|
Head template.HTML
|
||||||
Menu template.HTML
|
|
||||||
Users map[string]User
|
Users map[string]User
|
||||||
}
|
}
|
||||||
|
|
||||||
type TokensData struct {
|
type TokensData struct {
|
||||||
Head template.HTML
|
Head template.HTML
|
||||||
Menu template.HTML
|
|
||||||
Tokens map[string]TokenData
|
Tokens map[string]TokenData
|
||||||
Users map[string]User
|
Users map[string]User
|
||||||
}
|
}
|
||||||
@ -137,25 +132,6 @@ func (h *WebUiHandler) handleWebUiRequest(w http.ResponseWriter, r *http.Request
|
|||||||
|
|
||||||
h.headHtml = template.HTML(headBuilder.String())
|
h.headHtml = template.HTML(headBuilder.String())
|
||||||
|
|
||||||
menuTmplStr, err := box.String("menu.tmpl")
|
|
||||||
if err != nil {
|
|
||||||
w.WriteHeader(500)
|
|
||||||
io.WriteString(w, "Error loading menu.tmpl")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
menuTmpl, err := template.New("menu").Parse(menuTmplStr)
|
|
||||||
if err != nil {
|
|
||||||
w.WriteHeader(500)
|
|
||||||
h.alertDialog(w, r, "Failed to parse menu.tmpl", "/#/tunnels")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
var menuBuilder strings.Builder
|
|
||||||
menuTmpl.Execute(&menuBuilder, MenuData{IsAdmin: user.IsAdmin})
|
|
||||||
|
|
||||||
h.menuHtml = template.HTML(menuBuilder.String())
|
|
||||||
|
|
||||||
switch r.URL.Path {
|
switch r.URL.Path {
|
||||||
case "/login":
|
case "/login":
|
||||||
h.handleLogin(w, r)
|
h.handleLogin(w, r)
|
||||||
@ -214,7 +190,6 @@ func (h *WebUiHandler) handleWebUiRequest(w http.ResponseWriter, r *http.Request
|
|||||||
|
|
||||||
indexData := IndexData{
|
indexData := IndexData{
|
||||||
Head: h.headHtml,
|
Head: h.headHtml,
|
||||||
Menu: h.menuHtml,
|
|
||||||
Tunnels: h.api.GetTunnels(tokenData),
|
Tunnels: h.api.GetTunnels(tokenData),
|
||||||
Tokens: tokens,
|
Tokens: tokens,
|
||||||
Users: users,
|
Users: users,
|
||||||
|
|||||||
202
webui/index.tmpl
202
webui/index.tmpl
@ -6,114 +6,112 @@
|
|||||||
|
|
||||||
<body>
|
<body>
|
||||||
<main>
|
<main>
|
||||||
<input type='checkbox' id='menu-toggle'/>
|
<input type='checkbox' id='menu-toggle'/>
|
||||||
<label id='menu-label' for='menu-toggle'>Menu</label>
|
<label id='menu-label' for='menu-toggle'>Menu</label>
|
||||||
|
|
||||||
<div class='page' id='/tunnels'>
|
<div class='page' id='/tunnels'>
|
||||||
<div class='menu'>
|
<div class='menu'>
|
||||||
<a class='menu-item active-tab' href='/#/tunnels'>Tunnels</a>
|
<a class='menu-item active-tab' href='/#/tunnels'>Tunnels</a>
|
||||||
<a class='menu-item' href='/#/tokens'>Tokens</a>
|
<a class='menu-item' href='/#/tokens'>Tokens</a>
|
||||||
{{if .IsAdmin}}
|
{{if .IsAdmin}}
|
||||||
<a class='menu-item' href='/#/users'>Users</a>
|
<a class='menu-item' href='/#/users'>Users</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
<a class='menu-item' href='/confirm-logout'>Logout</a>
|
<a class='menu-item' href='/confirm-logout'>Logout</a>
|
||||||
</div>
|
</div>
|
||||||
<div class='content'>
|
<div class='content'>
|
||||||
<div class='list'>
|
<div class='list'>
|
||||||
{{range $domain, $tunnel:= .Tunnels}}
|
{{range $domain, $tunnel:= .Tunnels}}
|
||||||
<div class='list-item'>
|
<div class='list-item'>
|
||||||
<div>
|
<div>
|
||||||
<a href="https://{{$domain}}">{{$domain}}</a>:{{$tunnel.TunnelPort}} -> {{$tunnel.ClientName}}:{{$tunnel.ClientPort}}
|
<a href="https://{{$domain}}">{{$domain}}</a>:{{$tunnel.TunnelPort}} -> {{$tunnel.ClientName}}:{{$tunnel.ClientPort}}
|
||||||
</div>
|
|
||||||
<a href="/confirm-delete-tunnel?domain={{$domain}}">
|
|
||||||
<button class='button'>Delete</button>
|
|
||||||
</a>
|
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
<a href="/confirm-delete-tunnel?domain={{$domain}}">
|
||||||
</div>
|
<button class='button'>Delete</button>
|
||||||
|
</a>
|
||||||
<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' type="submit">Add/Update Tunnel</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
</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' type="submit">Add/Update Tunnel</button>
|
||||||
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class='page' id='/tokens'>
|
|
||||||
<div class='menu'>
|
|
||||||
<a class='menu-item' href='/#/tunnels'>Tunnels</a>
|
|
||||||
<a class='menu-item active-tab' href='/#/tokens'>Tokens</a>
|
|
||||||
{{if .IsAdmin}}
|
|
||||||
<a class='menu-item' href='/#/users'>Users</a>
|
|
||||||
{{end}}
|
|
||||||
<a class='menu-item' href='/confirm-logout'>Logout</a>
|
|
||||||
</div>
|
|
||||||
<div class='content'>
|
|
||||||
<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'>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' type="submit">Add Token</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class='page' id='/users'>
|
|
||||||
<div class='menu'>
|
|
||||||
<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>
|
|
||||||
{{end}}
|
|
||||||
<a class='menu-item' href='/confirm-logout'>Logout</a>
|
|
||||||
</div>
|
|
||||||
<div class='content'>
|
|
||||||
<div class='list'>
|
|
||||||
{{range $username, $user := .Users}}
|
|
||||||
<div class='list-item'>
|
|
||||||
{{$username}}
|
|
||||||
<a href="/confirm-delete-user?username={{$username}}">
|
|
||||||
<button class='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' type="submit">Add User</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class='page' id='/tokens'>
|
||||||
|
<div class='menu'>
|
||||||
|
<a class='menu-item' href='/#/tunnels'>Tunnels</a>
|
||||||
|
<a class='menu-item active-tab' href='/#/tokens'>Tokens</a>
|
||||||
|
{{if .IsAdmin}}
|
||||||
|
<a class='menu-item' href='/#/users'>Users</a>
|
||||||
|
{{end}}
|
||||||
|
<a class='menu-item' href='/confirm-logout'>Logout</a>
|
||||||
|
</div>
|
||||||
|
<div class='content'>
|
||||||
|
<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'>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' type="submit">Add Token</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{{if .IsAdmin}}
|
||||||
|
<div class='page' id='/users'>
|
||||||
|
<div class='menu'>
|
||||||
|
<a class='menu-item' href='/#/tunnels'>Tunnels</a>
|
||||||
|
<a class='menu-item' href='/#/tokens'>Tokens</a>
|
||||||
|
<a class='menu-item' href='/#/users'>Users</a>
|
||||||
|
<a class='menu-item' href='/confirm-logout'>Logout</a>
|
||||||
|
</div>
|
||||||
|
<div class='content'>
|
||||||
|
<div class='list'>
|
||||||
|
{{range $username, $user := .Users}}
|
||||||
|
<div class='list-item'>
|
||||||
|
{{$username}}
|
||||||
|
<a href="/confirm-delete-user?username={{$username}}">
|
||||||
|
<button class='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' type="submit">Add User</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
</main>
|
</main>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user