ProjectHentai/alist
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🎇 md5 and filename

Browse Source
This commit is contained in:
微凉 2021-12-02 18:57:29 +08:00
parent 1d7d37e642
commit d81ec0637d
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/check.go
View File

@ -55,7 +55,7 @@ func CheckParent(path string, password string) bool {
} }
} }
func CheckDownLink(path string, passwordMd5 string) bool { func CheckDownLink(path string, passwordMd5 string, name string) bool {
if !conf.CheckDown { if !conf.CheckDown {
return true return true
} }
@ -63,7 +63,7 @@ func CheckDownLink(path string, passwordMd5 string) bool {
log.Debugf("check down path: %s", path) log.Debugf("check down path: %s", path)
if err == nil { if err == nil {
log.Debugf("check down link: %s,%s", meta.Password, passwordMd5) log.Debugf("check down link: %s,%s", meta.Password, passwordMd5)
if meta.Password != "" && utils.Get16MD5Encode(meta.Password) != passwordMd5 { if meta.Password != "" && utils.Get16MD5Encode("alist"+meta.Password+name) != passwordMd5 {
return false return false
} }
return true return true
@ -74,6 +74,6 @@ func CheckDownLink(path string, passwordMd5 string) bool {
if path == "/" { if path == "/" {
return true return true
} }
return CheckDownLink(utils.Dir(path), passwordMd5) return CheckDownLink(utils.Dir(path), passwordMd5, name)
} }
} }

4
server/down.go
View File

@ -18,7 +18,7 @@ func Down(c *gin.Context) {
rawPath = utils.ParsePath(rawPath) rawPath = utils.ParsePath(rawPath)
log.Debugf("down: %s", rawPath) log.Debugf("down: %s", rawPath)
pw := c.Query("pw") pw := c.Query("pw")
if !CheckDownLink(utils.Dir(rawPath), pw) { if !CheckDownLink(utils.Dir(rawPath), pw, utils.Base(rawPath)) {
ErrorResp(c, fmt.Errorf("wrong password"), 401) ErrorResp(c, fmt.Errorf("wrong password"), 401)
return return
} }
@ -50,7 +50,7 @@ func Proxy(c *gin.Context) {
rawPath = utils.ParsePath(rawPath) rawPath = utils.ParsePath(rawPath)
log.Debugf("proxy: %s", rawPath) log.Debugf("proxy: %s", rawPath)
pw := c.Query("pw") pw := c.Query("pw")
if !CheckDownLink(utils.Dir(rawPath), pw) { if !CheckDownLink(utils.Dir(rawPath), pw, utils.Base(rawPath)) {
ErrorResp(c, fmt.Errorf("wrong password"), 401) ErrorResp(c, fmt.Errorf("wrong password"), 401)
return return
} }

8
server/webdav/file.go
View File

@ -80,14 +80,14 @@ func (fs *FileSystem) Files(rawPath string) ([]model.File, error) {
return driver.Files(path_, account) return driver.Files(path_, account)
} }
func GetPW(path string) string { func GetPW(path string, name string) string {
if !conf.CheckDown { if !conf.CheckDown {
return "" return ""
} }
meta, err := model.GetMetaByPath(path) meta, err := model.GetMetaByPath(path)
if err == nil { if err == nil {
if meta.Password != "" { if meta.Password != "" {
utils.Get16MD5Encode(meta.Password) utils.Get16MD5Encode("alist" + meta.Password + name)
} }
return "" return ""
} else { } else {
@ -97,7 +97,7 @@ func GetPW(path string) string {
if path == "/" { if path == "/" {
return "" return ""
} }
return GetPW(utils.Dir(path)) return GetPW(utils.Dir(path), name)
} }
} }
@ -119,7 +119,7 @@ func (fs *FileSystem) Link(r *http.Request, rawPath string) (string, error) {
if driver.Config().OnlyProxy || account.WebdavProxy { if driver.Config().OnlyProxy || account.WebdavProxy {
link = fmt.Sprintf("%s://%s/p%s", protocol, r.Host, rawPath) link = fmt.Sprintf("%s://%s/p%s", protocol, r.Host, rawPath)
if conf.CheckDown { if conf.CheckDown {
pw := GetPW(utils.Dir(rawPath)) pw := GetPW(utils.Dir(rawPath), utils.Base(rawPath))
link += "?pw" + pw link += "?pw" + pw
} }
} else { } else {

8
utils/file.go
View File

@ -105,4 +105,12 @@ func Dir(path string) string {
return path return path
} }
return path[:idx] return path[:idx]
}
func Base(path string) string {
idx := strings.LastIndex(path, "/")
if idx == -1 {
return path
}
return path[idx+1:]
} }