fix #8

codeskyblue · Dec 22, 2016 · 9af2b5b · 9af2b5b
1 parent 7e1387a
commit 9af2b5b
Show file tree

Hide file tree

Showing 152 changed files with 11,038 additions and 25,581 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/httpstaticserver.go b/httpstaticserver.go
@@ -403,7 +403,6 @@ func (c *AccessConf) canUpload(r *http.Request) bool {
 		return c.Upload
 	}
 	userInfo := val.(*UserInfo)
-	log.Println(userInfo)
 	for _, rule := range c.Users {
 		if rule.Email == userInfo.Email {
 			return rule.Upload
@@ -537,7 +536,13 @@ func (s *HTTPStaticServer) defaultAccessConf() AccessConf {
 }
 
 func (s *HTTPStaticServer) readAccessConf(requestPath string) (ac AccessConf) {
-	ac = s.defaultAccessConf()
+	requestPath = filepath.Clean(requestPath)
+	if requestPath == "/" || requestPath == "" || requestPath == "." {
+		ac = s.defaultAccessConf()
+	} else {
+		parentPath := filepath.Dir(requestPath)
+		ac = s.readAccessConf(parentPath)
+	}
 	relPath := filepath.Join(s.Root, requestPath)
 	if isFile(relPath) {
 		relPath = filepath.Dir(relPath)

diff --git a/main.go b/main.go
@@ -133,6 +133,7 @@ func main() {
 		data, _ := yaml.Marshal(gcfg)
 		fmt.Printf("--- config ---\n%s\n", string(data))
 	}
+	log.SetFlags(log.Lshortfile | log.LstdFlags)
 
 	ss := NewHTTPStaticServer(gcfg.Root)
 	ss.Theme = gcfg.Theme

diff --git a/testdata/uploadable/sub-upload/.gitkeep b/testdata/uploadable/sub-upload/.gitkeep
diff --git a/vendor/github.com/DHowett/go-plist/LICENSE b/vendor/github.com/DHowett/go-plist/LICENSE
diff --git a/vendor/github.com/DHowett/go-plist/README.md b/vendor/github.com/DHowett/go-plist/README.md