feat: add option --arhive-user and --archive-dir-user

Add ability to allow archiving for specified user

Author: marjune163

README.md

@@ -248,8 +248,10 @@ ghfs [options]
     A download link will appear on top part of the page.
     Make sure there is no circular symbol links.
 --archive <url-path> ...
+--archive-user <separator><url-path>[<separator><allowed-username>...] ...
     Allow user to download the whole contents of current directory for specific url paths(and sub paths).
 --archive-dir <fs-path> ...
+--archive-dir-user <separator><fs-path>[<separator><allowed-username>...] ...
     Similar to --archive, but use file system path instead of url path.
 
 --global-cors

README.zh-CN.md

@@ -238,8 +238,10 @@ ghfs [选项]
     页面顶部会出现下载链接。
     请确保符号链接没有循环引用。
 --archive <URL路径> ...
+--archive-user <分隔符><URL路径>[<分隔符><允许的用户名>...] ...
     对指定URL路径（及子路径）开启打包下载当前目录内容的功能。
 --archive-dir <文件系统路径> ...
+--archive-dir-user <分隔符><文件系统路径>[<分隔符><允许的用户名>...] ...
     与--archive类似，但指定的是文件系统路径，而不是URL路径。
 
 --global-cors

src/param/cli.go

@@ -138,9 +138,15 @@ func NewCliCmd() *goNixArgParser.Command {
 	err = options.AddFlagValues("archiveurls", "--archive", "", nil, "url path that enable download as archive for specific directories")
 	serverError.CheckFatal(err)
 
+	err = options.AddFlagValues("archiveurlsusers", "--archive-user", "", nil, "url path that allow archive files for specific users, <sep><url-path>[<sep><user>...]")
+	serverError.CheckFatal(err)
+
 	err = options.AddFlagValues("archivedirs", "--archive-dir", "", nil, "file system path that enable download as archive for specific directories")
 	serverError.CheckFatal(err)
 
+	err = options.AddFlagValues("archivedirsusers", "--archive-dir-user", "", nil, "file system path that allow archive files for specific users, <sep><fs-path>[<sep><user>...]")
+	serverError.CheckFatal(err)
+
 	err = options.AddFlag("globalcors", "--global-cors", "GHFS_GLOBAL_CORS", "enable CORS headers for all directories")
 	serverError.CheckFatal(err)
 
@@ -388,7 +394,7 @@ func CmdResultsToParams(results []*goNixArgParser.ParseResult) (params Params, e
 		param.CorsUrls, _ = result.GetStrings("corsurls")
 		param.CorsDirs, _ = result.GetStrings("corsdirs")
 
-		// auth/upload/mkdir/delete urls/dirs urls users
+		// auth/upload/mkdir/delete/archive urls/dirs urls users
 		authUrlsUsers, _ := result.GetStrings("authurlsusers")
 		param.AuthUrlsUsers = SplitAllKeyValues(authUrlsUsers)
 
@@ -419,6 +425,12 @@ func CmdResultsToParams(results []*goNixArgParser.ParseResult) (params Params, e
 		deleteDirsUsers, _ := result.GetStrings("deletedirsusers")
 		param.DeleteDirsUsers = SplitAllKeyValues(deleteDirsUsers)
 
+		archiveUrlsUsers, _ := result.GetStrings("archiveurlsusers")
+		param.ArchiveUrlsUsers = SplitAllKeyValues(archiveUrlsUsers)
+
+		archiveDirsUsers, _ := result.GetStrings("archivedirsusers")
+		param.ArchiveDirsUsers = SplitAllKeyValues(archiveDirsUsers)
+
 		// global restrict access
 		if result.HasKey("globalrestrictaccess") {
 			param.GlobalRestrictAccess, _ = result.GetStrings("globalrestrictaccess")

src/param/main.go

@@ -34,16 +34,6 @@ type Param struct {
 	AuthDirs      []string
 	AuthDirsUsers [][]string // [][path, user...]
 
-	GlobalRestrictAccess []string
-	// [][restrict-path, allow-hosts...]
-	RestrictAccessUrls [][]string
-	RestrictAccessDirs [][]string
-
-	GlobalHeaders [][2]string // [][name, value]
-	// [][path, (name, value)...]
-	HeadersUrls [][]string
-	HeadersDirs [][]string
-
 	IndexUrls      []string
 	IndexUrlsUsers [][]string // [][path, user...]
 	IndexDirs      []string
@@ -67,14 +57,26 @@ type Param struct {
 	DeleteDirs      []string
 	DeleteDirsUsers [][]string // [][path, user...]
 
-	GlobalArchive bool
-	ArchiveUrls   []string
-	ArchiveDirs   []string
+	GlobalArchive    bool
+	ArchiveUrls      []string
+	ArchiveUrlsUsers [][]string // [][path, user...]
+	ArchiveDirs      []string
+	ArchiveDirsUsers [][]string // [][path, user...]
 
 	GlobalCors bool
 	CorsUrls   []string
 	CorsDirs   []string
 
+	GlobalRestrictAccess []string
+	// [][restrict-path, allow-hosts...]
+	RestrictAccessUrls [][]string
+	RestrictAccessDirs [][]string
+
+	GlobalHeaders [][2]string // [][name, value]
+	// [][path, (name, value)...]
+	HeadersUrls [][]string
+	HeadersDirs [][]string
+
 	Certificates []tls.Certificate
 	Listens      []string
 	ListensPlain []string
@@ -165,7 +167,7 @@ func (param *Param) normalize() (errs []error) {
 	param.CorsUrls = NormalizeUrlPaths(param.CorsUrls)
 	param.CorsDirs = NormalizeFsPaths(param.CorsDirs)
 
-	// auth/index/upload/mkdir/delete urls/dirs users
+	// auth/index/upload/mkdir/delete/archive urls/dirs users
 	param.AuthUrlsUsers, es = normalizeAllPathValues(param.AuthUrlsUsers, true, util.NormalizeUrlPath, nil)
 	if len(es) == 0 {
 		dedupAllPathValues(param.AuthUrlsUsers)
@@ -231,6 +233,19 @@ func (param *Param) normalize() (errs []error) {
 		errs = append(errs, es...)
 	}
 
+	param.ArchiveUrlsUsers, es = normalizeAllPathValues(param.ArchiveUrlsUsers, false, util.NormalizeUrlPath, nil)
+	if len(es) == 0 {
+		dedupAllPathValues(param.ArchiveUrlsUsers)
+	} else {
+		errs = append(errs, es...)
+	}
+	param.ArchiveDirsUsers, es = normalizeAllPathValues(param.ArchiveDirsUsers, false, filepath.Abs, nil)
+	if len(es) == 0 {
+		dedupAllPathValues(param.ArchiveDirsUsers)
+	} else {
+		errs = append(errs, es...)
+	}
+
 	// global restrict access, nil to disable, non-nil to enable with allowed hosts
 	if param.GlobalRestrictAccess != nil {
 		param.GlobalRestrictAccess = util.ExtractHostsFromUrls(param.GlobalRestrictAccess)

src/serverHandler/aliasHandler.go

@@ -192,7 +192,7 @@ func newAliasHandler(
 		upload:  newHierarchyAvailability(currentAlias.url, currentAlias.fs, p.GlobalUpload, p.UploadUrls, vhostCtx.uploadUrlsUsers, p.UploadDirs, vhostCtx.uploadDirsUsers),
 		mkdir:   newHierarchyAvailability(currentAlias.url, currentAlias.fs, p.GlobalMkdir, p.MkdirUrls, vhostCtx.mkdirUrlsUsers, p.MkdirDirs, vhostCtx.mkdirDirsUsers),
 		delete:  newHierarchyAvailability(currentAlias.url, currentAlias.fs, p.GlobalDelete, p.DeleteUrls, vhostCtx.deleteUrlsUsers, p.DeleteDirs, vhostCtx.deleteDirsUsers),
-		archive: newHierarchyAvailability(currentAlias.url, currentAlias.fs, p.GlobalArchive, p.ArchiveUrls, nil, p.ArchiveDirs, nil),
+		archive: newHierarchyAvailability(currentAlias.url, currentAlias.fs, p.GlobalArchive, p.ArchiveUrls, vhostCtx.archiveUrlsUsers, p.ArchiveDirs, vhostCtx.archiveDirsUsers),
 		cors:    newHierarchyAvailability(currentAlias.url, currentAlias.fs, p.GlobalCors, p.CorsUrls, nil, p.CorsDirs, nil),
 
 		globalRestrictAccess: globalRestrictAccess,

src/serverHandler/perm.go

@@ -164,7 +164,7 @@ func (h *aliasHandler) getCanDelete(info os.FileInfo, rawReqPath, reqFsPath stri
 	return false
 }
 
-func (h *aliasHandler) getCanArchive(subInfos []os.FileInfo, rawReqPath, reqFsPath string) bool {
+func (h *aliasHandler) getCanArchive(subInfos []os.FileInfo, rawReqPath, reqFsPath string, userId int) bool {
 	if len(subInfos) == 0 {
 		return false
 	}
@@ -173,7 +173,17 @@ func (h *aliasHandler) getCanArchive(subInfos []os.FileInfo, rawReqPath, reqFsPa
 		return true
 	}
 
-	return hasUrlOrDirPrefix(h.archive.urls, rawReqPath, h.archive.dirs, reqFsPath)
+	if hasUrlOrDirPrefix(h.archive.urls, rawReqPath, h.archive.dirs, reqFsPath) {
+		return true
+	}
+
+	if userId >= 0 {
+		if _, match := hasUrlOrDirPrefixUsers(h.archive.urlsUsers, rawReqPath, h.archive.dirsUsers, reqFsPath, userId); match {
+			return true
+		}
+	}
+
+	return false
 }
 
 func (h *aliasHandler) getCanCors(rawReqPath, reqFsPath string) bool {

src/serverHandler/sessionData.go

@@ -457,7 +457,7 @@ func (h *aliasHandler) getSessionData(r *http.Request) (session *sessionContext,
 	canMkdir := allowAccess && authSuccess && h.getCanMkdir(item, vhostReqPath, fsPath, authUserId)
 	canDelete := allowAccess && authSuccess && h.getCanDelete(item, vhostReqPath, fsPath, authUserId)
 	hasDeletable := canDelete && len(subItems) > len(aliasSubItems)
-	canArchive := allowAccess && authSuccess && h.getCanArchive(subItems, vhostReqPath, fsPath)
+	canArchive := allowAccess && authSuccess && h.getCanArchive(subItems, vhostReqPath, fsPath, authUserId)
 	canCors := allowAccess && authSuccess && h.getCanCors(vhostReqPath, fsPath)
 	loginAvail := len(authUserName) == 0 && h.users.Len() > 0
 

src/serverHandler/vhostHandler.go

@@ -14,17 +14,19 @@ type vhostContext struct {
 	logger *serverLog.Logger
 	theme  theme.Theme
 
-	users           *user.List
-	authUrlsUsers   pathIntsList
-	authDirsUsers   pathIntsList
-	indexUrlsUsers  pathIntsList
-	indexDirsUsers  pathIntsList
-	uploadUrlsUsers pathIntsList
-	uploadDirsUsers pathIntsList
-	mkdirUrlsUsers  pathIntsList
-	mkdirDirsUsers  pathIntsList
-	deleteUrlsUsers pathIntsList
-	deleteDirsUsers pathIntsList
+	users            *user.List
+	authUrlsUsers    pathIntsList
+	authDirsUsers    pathIntsList
+	indexUrlsUsers   pathIntsList
+	indexDirsUsers   pathIntsList
+	uploadUrlsUsers  pathIntsList
+	uploadDirsUsers  pathIntsList
+	mkdirUrlsUsers   pathIntsList
+	mkdirDirsUsers   pathIntsList
+	deleteUrlsUsers  pathIntsList
+	deleteDirsUsers  pathIntsList
+	archiveUrlsUsers pathIntsList
+	archiveDirsUsers pathIntsList
 
 	shows     *regexp.Regexp
 	showDirs  *regexp.Regexp
@@ -89,17 +91,19 @@ func NewVhostHandler(
 		theme:  theme,
 		logger: logger,
 
-		users:           users,
-		authUrlsUsers:   pathUsernamesToPathUids(users, p.AuthUrlsUsers),
-		authDirsUsers:   pathUsernamesToPathUids(users, p.AuthDirsUsers),
-		indexUrlsUsers:  pathUsernamesToPathUids(users, p.IndexUrlsUsers),
-		indexDirsUsers:  pathUsernamesToPathUids(users, p.IndexDirsUsers),
-		uploadUrlsUsers: pathUsernamesToPathUids(users, p.UploadUrlsUsers),
-		uploadDirsUsers: pathUsernamesToPathUids(users, p.UploadDirsUsers),
-		mkdirUrlsUsers:  pathUsernamesToPathUids(users, p.MkdirUrlsUsers),
-		mkdirDirsUsers:  pathUsernamesToPathUids(users, p.MkdirDirsUsers),
-		deleteUrlsUsers: pathUsernamesToPathUids(users, p.DeleteUrlsUsers),
-		deleteDirsUsers: pathUsernamesToPathUids(users, p.DeleteDirsUsers),
+		users:            users,
+		authUrlsUsers:    pathUsernamesToPathUids(users, p.AuthUrlsUsers),
+		authDirsUsers:    pathUsernamesToPathUids(users, p.AuthDirsUsers),
+		indexUrlsUsers:   pathUsernamesToPathUids(users, p.IndexUrlsUsers),
+		indexDirsUsers:   pathUsernamesToPathUids(users, p.IndexDirsUsers),
+		uploadUrlsUsers:  pathUsernamesToPathUids(users, p.UploadUrlsUsers),
+		uploadDirsUsers:  pathUsernamesToPathUids(users, p.UploadDirsUsers),
+		mkdirUrlsUsers:   pathUsernamesToPathUids(users, p.MkdirUrlsUsers),
+		mkdirDirsUsers:   pathUsernamesToPathUids(users, p.MkdirDirsUsers),
+		deleteUrlsUsers:  pathUsernamesToPathUids(users, p.DeleteUrlsUsers),
+		deleteDirsUsers:  pathUsernamesToPathUids(users, p.DeleteDirsUsers),
+		archiveUrlsUsers: pathUsernamesToPathUids(users, p.ArchiveUrlsUsers),
+		archiveDirsUsers: pathUsernamesToPathUids(users, p.ArchiveDirsUsers),
 
 		shows:     shows,
 		showDirs:  showDirs,