Compare commits

...
2 Commits
Author SHA1 Message Date
Henrique Dias ac0e137b1d Close #1 2017-08-29 15:14:41 +01:00
Henrique Dias 65fa394f98 Remove useless baseURL 2017-08-05 10:29:09 +01:00
2 changed files with 9 additions and 7 deletions
+8 -2
View File
@@ -19,7 +19,14 @@ import (
var ( var (
config string config string
defaultConfigs = []string{"config.json", "config.yaml", "config.yml"} defaultConfigs = []string{
"config.json",
"config.yaml",
"config.yml",
"/etc/webdav/config.json",
"/etc/webdav/config.yaml",
"/etc/webdav/config.yml",
}
) )
func init() { func init() {
@@ -161,7 +168,6 @@ func parseConfig() *cfg {
port: data.Port, port: data.Port,
auth: map[string]string{}, auth: map[string]string{},
webdav: &webdav.Config{ webdav: &webdav.Config{
BaseURL: "",
User: &webdav.User{ User: &webdav.User{
Scope: data.Scope, Scope: data.Scope,
Modify: data.Modify, Modify: data.Modify,
+1 -5
View File
@@ -12,8 +12,7 @@ import (
// Config is the configuration of a WebDAV instance. // Config is the configuration of a WebDAV instance.
type Config struct { type Config struct {
*User *User
BaseURL string Users map[string]*User
Users map[string]*User
} }
// ServeHTTP determines if the request is for this plugin, and if all prerequisites are met. // ServeHTTP determines if the request is for this plugin, and if all prerequisites are met.
@@ -28,9 +27,6 @@ func (c *Config) ServeHTTP(w http.ResponseWriter, r *http.Request) {
} }
} }
// Remove the BaseURL from the url path.
r.URL.Path = strings.TrimPrefix(r.URL.Path, c.BaseURL)
// Checks for user permissions relatively to this PATH. // Checks for user permissions relatively to this PATH.
if !u.Allowed(r.URL.Path) { if !u.Allowed(r.URL.Path) {
w.WriteHeader(http.StatusForbidden) w.WriteHeader(http.StatusForbidden)