ralsina
/
nano-run
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: fix default values for authorization parameters

This commit is contained in:
Alexander Baryshnikov 2020-10-01 21:49:06 +08:00
parent f30fa7d166
commit 143d907bef
2 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
server/auth.go
View File

@ -3,6 +3,7 @@ package server
import (
"errors"
"net/http"
"sort"
"github.com/dgrijalva/jwt-go"
"github.com/gin-gonic/gin"
@ -46,11 +47,15 @@ type JWT struct {
Secret string `yaml:"secret"` // key to verify JWT
}
func (cfg JWT) Create() AuthHandlerFunc {
header := cfg.Header
if header == "" {
header = "Authorization"
func (cfg JWT) GetHeader() string {
if cfg.Header == "" {
return "Authorization"
}
return cfg.Header
}
func (cfg JWT) Create() AuthHandlerFunc {
header := cfg.GetHeader()
return func(req *http.Request) bool {
rawToken := req.Header.Get(header)
@ -69,11 +74,15 @@ type QueryToken struct {
Tokens []string `yaml:"tokens"` // allowed tokens
}
func (cfg QueryToken) Create() AuthHandlerFunc {
param := cfg.Param
if param == "" {
param = "token"
func (cfg QueryToken) GetParam() string {
if cfg.Param == "" {
return "token"
}
return cfg.Param
}
func (cfg QueryToken) Create() AuthHandlerFunc {
param := cfg.GetParam()
tokens := map[string]bool{}
for _, k := range cfg.Tokens {
tokens[k] = true
@ -89,11 +98,15 @@ type HeaderToken struct {
Tokens []string `yaml:"tokens"` // allowed tokens
}
func (cfg HeaderToken) Create() AuthHandlerFunc {
header := cfg.Header
if header == "" {
header = "X-Api-Token"
func (cfg HeaderToken) GetHeader() string {
if cfg.Header == "" {
return "X-Api-Token"
}
return cfg.Header
}
func (cfg HeaderToken) Create() AuthHandlerFunc {
header := cfg.GetHeader()
tokens := map[string]bool{}
for _, k := range cfg.Tokens {
tokens[k] = true
@ -121,3 +134,12 @@ func (cfg Basic) Create() AuthHandlerFunc {
return bcrypt.CompareHashAndPassword([]byte(h), []byte(p)) == nil
}
}
func (cfg Basic) Logins() []string {
var ans []string
for name := range cfg.Users {
ans = append(ans, name)
}
sort.Strings(ans)
return ans
}

8
templates/unit-info.html
View File

@ -121,27 +121,27 @@
{{if .JWT.Enable}}
<dt class="col-sm-3">JWT</dt>
<dd class="col-sm-9">in
<code>{{.JWT.Header}}</code>
<code>{{.JWT.GetHeader}}</code>
header
</dd>
{{end}}
{{if .QueryToken.Enable}}
<dt class="col-sm-3">Query token</dt>
<dd class="col-sm-9">in
<code>{{.QueryToken.Param}}</code>
<code>{{.QueryToken.GetParam}}</code>
param
</dd>
{{end}}
{{if .HeaderToken.Enable}}
<dt class="col-sm-3">Header token</dt>
<dd class="col-sm-9">in
<code>{{.HeaderToken.Header}}</code>
<code>{{.HeaderToken.GetHeader}}</code>
header
</dd>
{{end}}
{{if .Basic.Enable}}
<dt class="col-sm-3">Basic</dt>
<dd class="col-sm-9">{{.Basic.Users | keys | join ", "}}</dd>
<dd class="col-sm-9">{{.Basic.Logins | join ", "}}</dd>
{{end}}
</dl>
{{end}}