nicoeri/filebrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check root dir name if present

Browse Source
This commit is contained in:
Weidi Deng 2020-12-16 11:57:58 +08:00
parent 341a465479
commit e669f3b3f4
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/views/Share.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div v-if="loaded"> <div v-if="loaded">
<div id="breadcrumbs"> <div id="breadcrumbs">
<router-link :to="'/share/' + hash + '/' + this.path.split('/')[0]" :aria-label="$t('files.home')" :title="$t('files.home')"> <router-link :to="'/share/' + hash" :aria-label="$t('files.home')" :title="$t('files.home')">
<i class="material-icons">home</i> <i class="material-icons">home</i>
</router-link> </router-link>

22
http/public.go
View File

@ -2,19 +2,25 @@ package http
import ( import (
"net/http" "net/http"
"path/filepath"
"strings" "strings"
"github.com/filebrowser/filebrowser/v2/files" "github.com/filebrowser/filebrowser/v2/files"
libErrors "github.com/filebrowser/filebrowser/v2/errors"
) )
var withHashFile = func(fn handleFunc) handleFunc { var withHashFile = func(fn handleFunc) handleFunc {
return func(w http.ResponseWriter, r *http.Request, d *data) (int, error) { return func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
id, path := ifPathWithName(r) id, rootName, path := ifPathWithName(r)
link, err := d.store.Share.GetByHash(id) link, err := d.store.Share.GetByHash(id)
if err != nil { if err != nil {
return errToStatus(err), err return errToStatus(err), err
} }
if rootName != "" && filepath.Base(rootName) != filepath.Base(link.Path) {
return errToStatus(libErrors.ErrNotExist), libErrors.ErrNotExist
}
user, err := d.store.Users.Get(d.server.Root, link.UserID) user, err := d.store.Users.Get(d.server.Root, link.UserID)
if err != nil { if err != nil {
return errToStatus(err), err return errToStatus(err), err
@ -24,7 +30,7 @@ var withHashFile = func(fn handleFunc) handleFunc {
file, err := files.NewFileInfo(files.FileOptions{ file, err := files.NewFileInfo(files.FileOptions{
Fs: d.user.Fs, Fs: d.user.Fs,
Path: link.Path + path, Path: filepath.Join(link.Path, path),
Modify: d.user.Perm.Modify, Modify: d.user.Perm.Modify,
Expand: true, Expand: true,
Checker: d, Checker: d,
@ -40,14 +46,18 @@ var withHashFile = func(fn handleFunc) handleFunc {
// ref to https://github.com/filebrowser/filebrowser/pull/727 // ref to https://github.com/filebrowser/filebrowser/pull/727
// `/api/public/dl/MEEuZK-v/file-name.txt` for old browsers to save file with correct name // `/api/public/dl/MEEuZK-v/file-name.txt` for old browsers to save file with correct name
func ifPathWithName(r *http.Request) (id, path string) { func ifPathWithName(r *http.Request) (id, rootName, path string) {
pathElements := strings.Split(r.URL.Path, "/") pathElements := strings.Split(r.URL.Path, "/")
// prevent maliciously constructed parameters like `/api/public/dl/XZzCDnK2_not_exists_hash_name` // prevent maliciously constructed parameters like `/api/public/dl/XZzCDnK2_not_exists_hash_name`
// len(pathElements) will be 1, and golang will panic `runtime error: index out of range` // len(pathElements) will be 1, and golang will panic `runtime error: index out of range`
if len(pathElements) <= 2 { //nolint: mnd switch len(pathElements) {
return pathElements[0], "" case 1:
return r.URL.Path, "", ""
case 2:
return pathElements[0], pathElements[1], ""
default:
return pathElements[0], pathElements[1], strings.Join(pathElements[2:], "/")
} }
return pathElements[0], strings.Join(pathElements[2:], "/")
} }
var publicShareHandler = withHashFile(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) { var publicShareHandler = withHashFile(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {