lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-04-05 20:52:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix get file metadata bug (#5394)

Browse Source 
* Removed problematic if statement

This if statement was causing the value of option.AllowedOrigins to be always equal to "*". Now the values in the config file will be used when present. This allows for people who don't need this feature to not update their security.toml files.

* Update filer_server_handers_read.go

* Updated filer responses to invalid requests
This commit is contained in:
jerebear12 2024-03-18 13:08:16 -05:00 committed by GitHub
parent 8a2b3879b9
commit 7091269e65
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
weed/server/filer_server_handlers_read.go
View File

@ -3,6 +3,7 @@ package weed_server
import (
"bytes"
"context"
"errors"
"fmt"
"io"
"math"
@ -117,9 +118,12 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request)
w.WriteHeader(http.StatusForbidden)
return
}
if query.Get("metadata") == "true" && fs.option.ExposeDirectoryData != false {
writeJsonQuiet(w, r, http.StatusOK, entry)
return
if query.Get("metadata") == "true" {
// Don't return directory meta if config value is set to true
if fs.option.ExposeDirectoryData == false {
writeJsonError(w, r, http.StatusForbidden, errors.New("directory listing is disabled"))
return
}
}
if entry.Attr.Mime == "" || (entry.Attr.Mime == s3_constants.FolderMimeType && r.Header.Get(s3_constants.AmzIdentityId) == "") {
// return index of directory for non s3 gateway
@ -135,7 +139,7 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request)
return
}
if query.Get("metadata") == "true" && fs.option.ExposeDirectoryData != false {
if query.Get("metadata") == "true" {
if query.Get("resolveManifest") == "true" {
if entry.Chunks, _, err = filer.ResolveChunkManifest(
fs.filer.MasterClient.GetLookupFileIdFunction(),

5
weed/server/filer_server_handlers_read_dir.go
View File

@ -2,6 +2,7 @@ package weed_server
import (
"context"
"errors"
"net/http"
"strconv"
"strings"
@ -12,14 +13,14 @@ import (
"github.com/seaweedfs/seaweedfs/weed/util"
)
// listDirectoryHandler lists directories and folers under a directory
// listDirectoryHandler lists directories and folders under a directory
// files are sorted by name and paginated via "lastFileName" and "limit".
// sub directories are listed on the first page, when "lastFileName"
// is empty.
func (fs *FilerServer) listDirectoryHandler(w http.ResponseWriter, r *http.Request) {
if fs.option.ExposeDirectoryData == false {
http.NotFound(w, r)
writeJsonError(w, r, http.StatusForbidden, errors.New("ui is disabled"))
return
}