feat(param): add allow CORS headers for file system paths

Author: marjune163

src/param/cli.go

@@ -44,7 +44,10 @@ func init() {
 	err = optionSet.AddFlag("globalcors", "--global-cors", "GHFS_GLOBAL_CORS", "enable CORS headers for all directories")
 	serverErrHandler.CheckFatal(err)
 
-	err = optionSet.AddFlagValues("corsurls", "--cors", "", nil, "url path that enable CORS headers for specific directories")
+	err = optionSet.AddFlagValues("corsurls", "--cors", "", nil, "url path that enable CORS headers")
+	serverErrHandler.CheckFatal(err)
+
+	err = optionSet.AddFlagValues("corsdirs", "--cors-dir", "", nil, "file system path that enable CORS headers")
 	serverErrHandler.CheckFatal(err)
 
 	err = optionSet.AddFlagsValue("key", []string{"-k", "--key"}, "GHFS_KEY", "", "TLS certificate key path")
@@ -192,6 +195,10 @@ func doParseCli() []*Param {
 		arrCorsUrls, _ := result.GetStrings("corsurls")
 		param.CorsUrls = normalizeUrlPaths(arrCorsUrls)
 
+		// normalize cors dirs
+		arrCorsDirs, _ := result.GetStrings("corsdirs")
+		param.CorsDirs = normalizeFsPaths(arrCorsDirs)
+
 		// shows
 		shows, err := getWildcardRegexp(result.GetStrings("shows"))
 		serverErrHandler.CheckFatal(err)

src/param/main.go

@@ -23,6 +23,7 @@ type Param struct {
 
 	GlobalCors bool
 	CorsUrls   []string
+	CorsDirs   []string
 
 	Key         string
 	Cert        string

src/serverHandler/main.go

@@ -24,6 +24,7 @@ type handler struct {
 
 	globalCors bool
 	corsUrls   []string
+	corsDirs   []string
 
 	shows     *regexp.Regexp
 	showDirs  *regexp.Regexp
@@ -135,6 +136,7 @@ func NewHandler(
 
 		globalCors: p.GlobalCors,
 		corsUrls:   p.CorsUrls,
+		corsDirs:   p.CorsDirs,
 
 		shows:     p.Shows,
 		showDirs:  p.ShowDirs,

src/serverHandler/pageData.go

@@ -246,66 +246,52 @@ func getItemName(item os.FileInfo, r *http.Request) (itemName string) {
 	return
 }
 
-func (h *handler) getCanUpload(item os.FileInfo, rawReqPath, reqFsPath string) bool {
-	if item == nil || !item.IsDir() {
-		return false
-	}
-
-	if h.globalUpload {
-		return true
-	}
-
-	for _, uploadUrl := range h.uploadUrls {
-		if util.HasUrlPrefixDir(rawReqPath, uploadUrl) {
+func hasUrlOrDirPrefix(urls []string, reqUrl string, dirs []string, reqDir string) bool {
+	for _, url := range urls {
+		if util.HasUrlPrefixDir(reqUrl, url) {
 			return true
 		}
 	}
 
-	for _, uploadDir := range h.uploadDirs {
-		if util.HasFsPrefixDir(reqFsPath, uploadDir) {
+	for _, dir := range dirs {
+		if util.HasFsPrefixDir(reqDir, dir) {
 			return true
 		}
 	}
 
 	return false
 }
 
-func (h *handler) getCanArchive(subItems []os.FileInfo, rawReqPath, reqFsPath string) bool {
-	if len(subItems) == 0 {
+func (h *handler) getCanUpload(item os.FileInfo, rawReqPath, reqFsPath string) bool {
+	if item == nil || !item.IsDir() {
 		return false
 	}
 
-	if h.globalArchive {
+	if h.globalUpload {
 		return true
 	}
 
-	for _, archiveUrl := range h.archiveUrls {
-		if util.HasUrlPrefixDir(rawReqPath, archiveUrl) {
-			return true
-		}
+	return hasUrlOrDirPrefix(h.uploadUrls, rawReqPath, h.uploadDirs, reqFsPath)
+}
+
+func (h *handler) getCanArchive(subItems []os.FileInfo, rawReqPath, reqFsPath string) bool {
+	if len(subItems) == 0 {
+		return false
 	}
 
-	for _, archiveDir := range h.archiveDirs {
-		if util.HasFsPrefixDir(reqFsPath, archiveDir) {
-			return true
-		}
+	if h.globalArchive {
+		return true
 	}
 
-	return false
+	return hasUrlOrDirPrefix(h.archiveUrls, rawReqPath, h.archiveDirs, reqFsPath)
 }
 
-func (h *handler) getCanCors(rawReqPath string) bool {
+func (h *handler) getCanCors(rawReqPath, reqFsPath string) bool {
 	if h.globalCors {
 		return true
 	}
 
-	for _, corsUrl := range h.corsUrls {
-		if util.HasUrlPrefixDir(rawReqPath, corsUrl) {
-			return true
-		}
-	}
-
-	return false
+	return hasUrlOrDirPrefix(h.corsUrls, rawReqPath, h.corsDirs, reqFsPath)
 }
 
 func (h *handler) getPageData(r *http.Request) (data *pageData, notFound, internalError bool) {
@@ -355,7 +341,7 @@ func (h *handler) getPageData(r *http.Request) (data *pageData, notFound, intern
 
 	canUpload := h.getCanUpload(item, rawReqPath, reqFsPath)
 	canArchive := h.getCanArchive(subItems, rawReqPath, reqFsPath)
-	canCors := h.getCanCors(rawReqPath)
+	canCors := h.getCanCors(rawReqPath, reqFsPath)
 
 	data = &pageData{
 		rawReqPath:     rawReqPath,