archive/webdav
1
0
Fork 0
mirror of https://github.com/hacdias/webdav.git synced 2026-09-22 03:20:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: pass through linters

Browse Source 
License: MIT
Signed-off-by: Henrique Dias <[email protected]>
This commit is contained in:
Henrique Dias
2019-05-24 14:47:05 +01:00
parent e5b3946388
commit 60f2697615
4 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/cmd.go
+1 -1
View File
@@ -9,4 +9,4 @@ func Execute() {
if err := rootCmd.Execute(); err != nil { if err := rootCmd.Execute(); err != nil {
log.Fatal(err) log.Fatal(err)
} }
} }
cmd/config.go
+5 -7
View File
@@ -126,14 +126,12 @@ func parseCors(raw []interface{}, c *webdav.Config) {
if cfg, ok := v.(map[interface{}]interface{}); ok { if cfg, ok := v.(map[interface{}]interface{}); ok {
cors := webdav.CorsCfg{ cors := webdav.CorsCfg{
Enabled: cfg["enabled"].(bool), Enabled: cfg["enabled"].(bool),
AllowedHosts: []string{}, AllowedHosts: []string{},
} }
if allowed_hosts, ok := cfg["allowed_hosts"]; ok { if allowedHosts, ok := cfg["allowed_hosts"]; ok {
for _, host := range strings.Split(allowed_hosts.(string), ",") { hosts = append(hosts, strings.Split(allowedHosts.(string), ",")...)
hosts = append(hosts, host)
}
} }
if len(hosts) == 0 { if len(hosts) == 0 {
@@ -157,9 +155,9 @@ func readConfig(flags *pflag.FlagSet) *webdav.Config {
LockSystem: wd.NewMemLS(), LockSystem: wd.NewMemLS(),
}, },
}, },
Auth: getOptB(flags, "auth"), Auth: getOptB(flags, "auth"),
Cors: webdav.CorsCfg{ Cors: webdav.CorsCfg{
Enabled: false, Enabled: false,
AllowedHosts: []string{}, AllowedHosts: []string{},
}, },
Users: map[string]*webdav.User{}, Users: map[string]*webdav.User{},
webdav/utils.go
+6 -6
View File
@@ -16,10 +16,10 @@ func checkPassword(saved, input string) bool {
} }
func isAllowedHost(allowedHosts []string, origin string) bool { func isAllowedHost(allowedHosts []string, origin string) bool {
for _, host := range allowedHosts { for _, host := range allowedHosts {
if host == origin { if host == origin {
return true return true
} }
} }
return false return false
} }
webdav/webdav.go
+6 -6
View File
@@ -6,17 +6,17 @@ import (
"net/http" "net/http"
) )
// Config is the configuration of a WebDAV instance. // CorsCfg is the CORS config.
type CorsCfg struct { type CorsCfg struct {
Enabled bool Enabled bool
AllowedHosts []string AllowedHosts []string
} }
// Config is the configuration of a WebDAV instance.
type Config struct { type Config struct {
*User *User
Auth bool Auth bool
Cors CorsCfg Cors CorsCfg
Users map[string]*User Users map[string]*User
} }
@@ -30,11 +30,11 @@ func (c *Config) ServeHTTP(w http.ResponseWriter, r *http.Request) {
headers := w.Header() headers := w.Header()
if(len(c.Cors.AllowedHosts) == 1 && c.Cors.AllowedHosts[0] == "*") { if len(c.Cors.AllowedHosts) == 1 && c.Cors.AllowedHosts[0] == "*" {
headers.Set("Access-Control-Allow-Methods", "*") headers.Set("Access-Control-Allow-Methods", "*")
headers.Set("Access-Control-Allow-Headers", "*") headers.Set("Access-Control-Allow-Headers", "*")
headers.Set("Access-Control-Allow-Origin", "*") headers.Set("Access-Control-Allow-Origin", "*")
} else if(isAllowedHost(c.Cors.AllowedHosts, requestOrigin)) { } else if isAllowedHost(c.Cors.AllowedHosts, requestOrigin) {
headers.Set("Access-Control-Allow-Origin", requestOrigin) headers.Set("Access-Control-Allow-Origin", requestOrigin)
headers.Set("Access-Control-Allow-Headers", "*") headers.Set("Access-Control-Allow-Headers", "*")
headers.Set("Access-Control-Allow-Methods", "*") headers.Set("Access-Control-Allow-Methods", "*")