doesnm/quickshare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(files): use name as home dir

Browse source
This commit is contained in:
hexxa 2021-08-14 09:59:17 +08:00 • committed by Hexxa
parent b6000771d7
commit 7b2c185686
5 changed files with 49 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/handlers/fileshdr/handlers.go
View file

@ -89,16 +89,16 @@ func (lk *AutoLocker) Exec(handler func()) {
} }
// related elements: role, user, action(listing, downloading)/sharing // related elements: role, user, action(listing, downloading)/sharing
func (h *FileHandlers) canAccess(userID, role, op, path string) bool { func (h *FileHandlers) canAccess(userName, role, op, path string) bool {
if role == userstore.AdminRole { if role == userstore.AdminRole {
return true return true
} }
// the file path must start with userID: <userID>/... // the file path must start with userName: <userName>/...
parts := strings.Split(path, "/") parts := strings.Split(path, "/")
if len(parts) < 2 { // the path must be longer than <userName>/files if len(parts) < 2 { // the path must be longer than <userName>/files
return false return false
} else if parts[0] == userID { } else if parts[0] == userName {
return true return true
} }
@ -130,12 +130,13 @@ func (h *FileHandlers) Create(c *gin.Context) {
} }
role := c.MustGet(q.RoleParam).(string) role := c.MustGet(q.RoleParam).(string)
userID := c.MustGet(q.UserIDParam).(string) userID := c.MustGet(q.UserIDParam).(string)
if !h.canAccess(userID, role, "create", req.Path) { userName := c.MustGet(q.UserParam).(string)
if !h.canAccess(userName, role, "create", req.Path) {
c.JSON(q.ErrResp(c, 403, q.ErrAccessDenied)) c.JSON(q.ErrResp(c, 403, q.ErrAccessDenied))
return return
} }
tmpFilePath := q.UploadPath(userID, req.Path) tmpFilePath := q.UploadPath(userName, req.Path)
locker := h.NewAutoLocker(c, lockName(tmpFilePath)) locker := h.NewAutoLocker(c, lockName(tmpFilePath))
locker.Exec(func() { locker.Exec(func() {
err := h.deps.FS().Create(tmpFilePath) err := h.deps.FS().Create(tmpFilePath)
@ -170,8 +171,8 @@ func (h *FileHandlers) Delete(c *gin.Context) {
return return
} }
role := c.MustGet(q.RoleParam).(string) role := c.MustGet(q.RoleParam).(string)
userID := c.MustGet(q.UserIDParam).(string) userName := c.MustGet(q.UserParam).(string)
if !h.canAccess(userID, role, "delete", filePath) { if !h.canAccess(userName, role, "delete", filePath) {
c.JSON(q.ErrResp(c, 403, q.ErrAccessDenied)) c.JSON(q.ErrResp(c, 403, q.ErrAccessDenied))
return return
} }
@ -199,8 +200,8 @@ func (h *FileHandlers) Metadata(c *gin.Context) {
return return
} }
role := c.MustGet(q.RoleParam).(string) role := c.MustGet(q.RoleParam).(string)
userID := c.MustGet(q.UserIDParam).(string) userName := c.MustGet(q.UserParam).(string)
if !h.canAccess(userID, role, "metadata", filePath) { if !h.canAccess(userName, role, "metadata", filePath) {
c.JSON(q.ErrResp(c, 403, q.ErrAccessDenied)) c.JSON(q.ErrResp(c, 403, q.ErrAccessDenied))
return return
} }
@ -230,8 +231,8 @@ func (h *FileHandlers) Mkdir(c *gin.Context) {
return return
} }
role := c.MustGet(q.RoleParam).(string) role := c.MustGet(q.RoleParam).(string)
userID := c.MustGet(q.UserIDParam).(string) userName := c.MustGet(q.UserParam).(string)
if !h.canAccess(userID, role, "mkdir", req.Path) { if !h.canAccess(userName, role, "mkdir", req.Path) {
c.JSON(q.ErrResp(c, 403, q.ErrAccessDenied)) c.JSON(q.ErrResp(c, 403, q.ErrAccessDenied))
return return
} }
@ -257,8 +258,8 @@ func (h *FileHandlers) Move(c *gin.Context) {
return return
} }
role := c.MustGet(q.RoleParam).(string) role := c.MustGet(q.RoleParam).(string)
userID := c.MustGet(q.UserIDParam).(string) userName := c.MustGet(q.UserParam).(string)
if !h.canAccess(userID, role, "move", req.OldPath) || !h.canAccess(userID, role, "move", req.NewPath) { if !h.canAccess(userName, role, "move", req.OldPath) || !h.canAccess(userName, role, "move", req.NewPath) {
c.JSON(q.ErrResp(c, 403, q.ErrAccessDenied)) c.JSON(q.ErrResp(c, 403, q.ErrAccessDenied))
return return
} }
@ -301,7 +302,8 @@ func (h *FileHandlers) UploadChunk(c *gin.Context) {
} }
role := c.MustGet(q.RoleParam).(string) role := c.MustGet(q.RoleParam).(string)
userID := c.MustGet(q.UserIDParam).(string) userID := c.MustGet(q.UserIDParam).(string)
if !h.canAccess(userID, role, "upload.chunk", req.Path) { userName := c.MustGet(q.UserParam).(string)
if !h.canAccess(userName, role, "upload.chunk", req.Path) {
c.JSON(q.ErrResp(c, 403, q.ErrAccessDenied)) c.JSON(q.ErrResp(c, 403, q.ErrAccessDenied))
return return
} }
@ -321,7 +323,8 @@ func (h *FileHandlers) UploadChunk(c *gin.Context) {
return return
} }
tmpFilePath := q.UploadPath(userID, req.Path) userName := c.MustGet(q.UserParam).(string)
tmpFilePath := q.UploadPath(userName, req.Path)
locker := h.NewAutoLocker(c, lockName(tmpFilePath)) locker := h.NewAutoLocker(c, lockName(tmpFilePath))
locker.Exec(func() { locker.Exec(func() {
var err error var err error
@ -426,13 +429,14 @@ func (h *FileHandlers) UploadStatus(c *gin.Context) {
c.JSON(q.ErrResp(c, 400, errors.New("invalid file name"))) c.JSON(q.ErrResp(c, 400, errors.New("invalid file name")))
} }
role := c.MustGet(q.RoleParam).(string) role := c.MustGet(q.RoleParam).(string)
userID := c.MustGet(q.UserIDParam).(string) userName := c.MustGet(q.UserParam).(string)
if !h.canAccess(userID, role, "upload.status", filePath) { if !h.canAccess(userName, role, "upload.status", filePath) {
c.JSON(q.ErrResp(c, 403, q.ErrAccessDenied)) c.JSON(q.ErrResp(c, 403, q.ErrAccessDenied))
return return
} }
tmpFilePath := q.UploadPath(userID, filePath) userID := c.MustGet(q.UserIDParam).(string)
tmpFilePath := q.UploadPath(userName, filePath)
locker := h.NewAutoLocker(c, lockName(tmpFilePath)) locker := h.NewAutoLocker(c, lockName(tmpFilePath))
locker.Exec(func() { locker.Exec(func() {
_, fileSize, uploaded, err := h.uploadMgr.GetInfo(userID, tmpFilePath) _, fileSize, uploaded, err := h.uploadMgr.GetInfo(userID, tmpFilePath)
@ -464,11 +468,12 @@ func (h *FileHandlers) Download(c *gin.Context) {
return return
} }
role := c.MustGet(q.RoleParam).(string) role := c.MustGet(q.RoleParam).(string)
userID := c.MustGet(q.UserIDParam).(string) userName := c.MustGet(q.UserParam).(string)
if !h.canAccess(userID, role, "download", filePath) { if !h.canAccess(userName, role, "download", filePath) {
c.JSON(q.ErrResp(c, 403, q.ErrAccessDenied)) c.JSON(q.ErrResp(c, 403, q.ErrAccessDenied))
return return
} }
userID := c.MustGet(q.UserIDParam).(string)
userIDInt, err := strconv.ParseUint(userID, 10, 64) userIDInt, err := strconv.ParseUint(userID, 10, 64)
if err != nil { if err != nil {
c.JSON(q.ErrResp(c, 500, err)) c.JSON(q.ErrResp(c, 500, err))
@ -560,8 +565,8 @@ func (h *FileHandlers) List(c *gin.Context) {
return return
} }
role := c.MustGet(q.RoleParam).(string) role := c.MustGet(q.RoleParam).(string)
userID := c.MustGet(q.UserIDParam).(string) userName := c.MustGet(q.UserParam).(string)
if !h.canAccess(userID, role, "list", dirPath) { if !h.canAccess(userName, role, "list", dirPath) {
c.JSON(q.ErrResp(c, 403, q.ErrAccessDenied)) c.JSON(q.ErrResp(c, 403, q.ErrAccessDenied))
return return
} }
@ -588,8 +593,8 @@ func (h *FileHandlers) List(c *gin.Context) {
} }
func (h *FileHandlers) ListHome(c *gin.Context) { func (h *FileHandlers) ListHome(c *gin.Context) {
userID := c.MustGet(q.UserIDParam).(string) userName := c.MustGet(q.UserParam).(string)
fsPath := q.FsRootPath(userID, "/") fsPath := q.FsRootPath(userName, "/")
infos, err := h.deps.FS().ListDir(fsPath) infos, err := h.deps.FS().ListDir(fsPath)
if err != nil { if err != nil {
c.JSON(q.ErrResp(c, 500, err)) c.JSON(q.ErrResp(c, 500, err))
@ -647,7 +652,8 @@ func (h *FileHandlers) DelUploading(c *gin.Context) {
userID := c.MustGet(q.UserIDParam).(string) userID := c.MustGet(q.UserIDParam).(string)
var err error var err error
tmpFilePath := q.UploadPath(userID, filePath) userName := c.MustGet(q.UserParam).(string)
tmpFilePath := q.UploadPath(userName, filePath)
locker := h.NewAutoLocker(c, lockName(tmpFilePath)) locker := h.NewAutoLocker(c, lockName(tmpFilePath))
locker.Exec(func() { locker.Exec(func() {
err = h.deps.FS().Remove(tmpFilePath) err = h.deps.FS().Remove(tmpFilePath)
@ -677,10 +683,10 @@ func (h *FileHandlers) AddSharing(c *gin.Context) {
} }
// TODO: move canAccess to authedFS // TODO: move canAccess to authedFS
userID := c.MustGet(q.UserIDParam).(string)
role := c.MustGet(q.RoleParam).(string) role := c.MustGet(q.RoleParam).(string)
userName := c.MustGet(q.UserParam).(string)
// op is empty, because users must be admin, or the path belongs to this user // op is empty, because users must be admin, or the path belongs to this user
if !h.canAccess(userID, role, "", req.SharingPath) { if !h.canAccess(userName, role, "", req.SharingPath) {
c.JSON(q.ErrResp(c, 403, errors.New("forbidden"))) c.JSON(q.ErrResp(c, 403, errors.New("forbidden")))
return return
} }
@ -701,9 +707,9 @@ func (h *FileHandlers) DelSharing(c *gin.Context) {
} }
// TODO: move canAccess to authedFS // TODO: move canAccess to authedFS
userID := c.MustGet(q.UserIDParam).(string) userName := c.MustGet(q.UserParam).(string)
role := c.MustGet(q.RoleParam).(string) role := c.MustGet(q.RoleParam).(string)
if !h.canAccess(userID, role, "", req.SharingPath) { if !h.canAccess(userName, role, "", req.SharingPath) {
c.JSON(q.ErrResp(c, 403, errors.New("forbidden"))) c.JSON(q.ErrResp(c, 403, errors.New("forbidden")))
return return
} }
@ -722,9 +728,9 @@ type SharingResp struct {
func (h *FileHandlers) ListSharings(c *gin.Context) { func (h *FileHandlers) ListSharings(c *gin.Context) {
// TODO: move canAccess to authedFS // TODO: move canAccess to authedFS
userID := c.MustGet(q.UserIDParam).(string) userName := c.MustGet(q.UserParam).(string)
sharingDirs, err := h.deps.FileInfos().ListSharings(q.FsRootPath(userID, "/")) sharingDirs, err := h.deps.FileInfos().ListSharings(q.FsRootPath(userName, "/"))
if err != nil { if err != nil {
c.JSON(q.ErrResp(c, 500, err)) c.JSON(q.ErrResp(c, 500, err))
return return

10
src/handlers/multiusers/handlers.go
View file

@ -115,12 +115,11 @@ func NewMultiUsersSvc(cfg gocfg.ICfg, deps *depidx.Deps) (*MultiUsersSvc, error)
func (h *MultiUsersSvc) Init(adminName, adminPwd string) (string, error) { func (h *MultiUsersSvc) Init(adminName, adminPwd string) (string, error) {
var err error var err error
userID := "0" fsPath := q.FsRootPath(adminName, "/")
fsPath := q.FsRootPath(userID, "/")
if err = h.deps.FS().MkdirAll(fsPath); err != nil { if err = h.deps.FS().MkdirAll(fsPath); err != nil {
return "", err return "", err
} }
uploadFolder := q.UploadFolder(userID) uploadFolder := q.UploadFolder(adminName)
if err = h.deps.FS().MkdirAll(uploadFolder); err != nil { if err = h.deps.FS().MkdirAll(uploadFolder); err != nil {
return "", err return "", err
} }
@ -348,13 +347,12 @@ func (h *MultiUsersSvc) AddUser(c *gin.Context) {
// TODO: following operations must be atomic // TODO: following operations must be atomic
// TODO: check if the folders already exists // TODO: check if the folders already exists
uidStr := fmt.Sprint(uid) fsRootFolder := q.FsRootPath(req.Name, "/")
fsRootFolder := q.FsRootPath(uidStr, "/")
if err = h.deps.FS().MkdirAll(fsRootFolder); err != nil { if err = h.deps.FS().MkdirAll(fsRootFolder); err != nil {
c.JSON(q.ErrResp(c, 500, err)) c.JSON(q.ErrResp(c, 500, err))
return return
} }
uploadFolder := q.UploadFolder(uidStr) uploadFolder := q.UploadFolder(req.Name)
if err = h.deps.FS().MkdirAll(uploadFolder); err != nil { if err = h.deps.FS().MkdirAll(uploadFolder); err != nil {
c.JSON(q.ErrResp(c, 500, err)) c.JSON(q.ErrResp(c, 500, err))
return return

12
src/handlers/util.go
View file

@ -128,16 +128,16 @@ func ErrResp(c *gin.Context, code int, err error) (int, interface{}) {
} }
func FsRootPath(userID, relFilePath string) string { func FsRootPath(userName, relFilePath string) string {
return filepath.Join(userID, FsRootDir, relFilePath) return filepath.Join(userName, FsRootDir, relFilePath)
} }
func UploadPath(userID, relFilePath string) string { func UploadPath(userName, relFilePath string) string {
return filepath.Join(UploadFolder(userID), fmt.Sprintf("%x", sha1.Sum([]byte(relFilePath)))) return filepath.Join(UploadFolder(userName), fmt.Sprintf("%x", sha1.Sum([]byte(relFilePath))))
} }
func UploadFolder(userID string) string { func UploadFolder(userName string) string {
return filepath.Join(userID, UploadDir) return filepath.Join(userName, UploadDir)
} }
func GetUserInfo(tokenStr string, tokenEncDec cryptoutil.ITokenEncDec) (map[string]string, error) { func GetUserInfo(tokenStr string, tokenEncDec cryptoutil.ITokenEncDec) (map[string]string, error) {

2
src/server/server_files_test.go
View file

@ -162,7 +162,7 @@ func TestFileHandlers(t *testing.T) {
} }
// check uploading file // check uploading file
uploadFilePath := q.UploadPath("0", filePath) uploadFilePath := q.UploadPath(adminName, filePath)
info, err := fs.Stat(uploadFilePath) info, err := fs.Stat(uploadFilePath)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)

2
src/server/server_users_test.go
View file

@ -121,7 +121,7 @@ func TestUsersHandlers(t *testing.T) {
fmt.Printf("new user id: %v\n", auResp) fmt.Printf("new user id: %v\n", auResp)
// check uploading file // check uploading file
userFsRootFolder := q.FsRootPath(auResp.ID, "/") userFsRootFolder := q.FsRootPath(userName, "/")
_, err = fs.Stat(userFsRootFolder) _, err = fs.Stat(userFsRootFolder)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)