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

Clean up menu stuff

Browse Source 
Also only send /users page when isAdmin is true
This commit is contained in:
Anders Pitman 2020-10-15 13:20:59 -06:00
parent 7df93c0821
commit 2eafde030e
2 changed files with 100 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ui_handler.go
View File

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

6
webui/index.tmpl
View File

@ -81,13 +81,12 @@
</div> </div>
</div> </div>
{{if .IsAdmin}}
<div class='page' id='/users'> <div class='page' id='/users'>
<div class='menu'> <div class='menu'>
<a class='menu-item' href='/#/tunnels'>Tunnels</a> <a class='menu-item' href='/#/tunnels'>Tunnels</a>
<a class='menu-item' href='/#/tokens'>Tokens</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}}
<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'>
@ -112,8 +111,7 @@
</div> </div>
</div> </div>
</div> </div>
{{end}}
</div>
</main> </main>
</body> </body>
</html> </html>