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

Avoid xattr printed out as HTTP headers

Browse Source 
fix https://github.com/chrislusf/seaweedfs/issues/2336
This commit is contained in:
Chris Lu 2021-09-13 04:00:57 -07:00
parent 96514f0f00
commit 7504be58f9
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
weed/filesys/xattr.go
View File

@ -2,6 +2,7 @@ package filesys
import ( import (
"context" "context"
"strings"
"github.com/seaweedfs/fuse" "github.com/seaweedfs/fuse"
@ -10,6 +11,10 @@ import (
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"
) )
const (
XATTR_PREFIX = "xattr-" // same as filer
)
func getxattr(entry *filer_pb.Entry, req *fuse.GetxattrRequest, resp *fuse.GetxattrResponse) error { func getxattr(entry *filer_pb.Entry, req *fuse.GetxattrRequest, resp *fuse.GetxattrResponse) error {
if entry == nil { if entry == nil {
@ -18,7 +23,7 @@ func getxattr(entry *filer_pb.Entry, req *fuse.GetxattrRequest, resp *fuse.Getxa
if entry.Extended == nil { if entry.Extended == nil {
return fuse.ErrNoXattr return fuse.ErrNoXattr
} }
data, found := entry.Extended[req.Name] data, found := entry.Extended[XATTR_PREFIX+req.Name]
if !found { if !found {
return fuse.ErrNoXattr return fuse.ErrNoXattr
} }
@ -47,7 +52,7 @@ func setxattr(entry *filer_pb.Entry, req *fuse.SetxattrRequest) error {
if entry.Extended == nil { if entry.Extended == nil {
entry.Extended = make(map[string][]byte) entry.Extended = make(map[string][]byte)
} }
data, _ := entry.Extended[req.Name] data, _ := entry.Extended[XATTR_PREFIX+req.Name]
newData := make([]byte, int(req.Position)+len(req.Xattr)) newData := make([]byte, int(req.Position)+len(req.Xattr))
@ -55,7 +60,7 @@ func setxattr(entry *filer_pb.Entry, req *fuse.SetxattrRequest) error {
copy(newData[int(req.Position):], req.Xattr) copy(newData[int(req.Position):], req.Xattr)
entry.Extended[req.Name] = newData entry.Extended[XATTR_PREFIX+req.Name] = newData
return nil return nil
@ -71,13 +76,13 @@ func removexattr(entry *filer_pb.Entry, req *fuse.RemovexattrRequest) error {
return fuse.ErrNoXattr return fuse.ErrNoXattr
} }
_, found := entry.Extended[req.Name] _, found := entry.Extended[XATTR_PREFIX+req.Name]
if !found { if !found {
return fuse.ErrNoXattr return fuse.ErrNoXattr
} }
delete(entry.Extended, req.Name) delete(entry.Extended, XATTR_PREFIX+req.Name)
return nil return nil
@ -90,7 +95,9 @@ func listxattr(entry *filer_pb.Entry, req *fuse.ListxattrRequest, resp *fuse.Lis
} }
for k := range entry.Extended { for k := range entry.Extended {
resp.Append(k) if strings.HasPrefix(k, XATTR_PREFIX) {
resp.Append(k[len(XATTR_PREFIX):])
}
} }
size := req.Size size := req.Size

5
weed/server/filer_server_handlers_read.go
View File

@ -97,7 +97,10 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request)
// print out the header from extended properties // print out the header from extended properties
for k, v := range entry.Extended { for k, v := range entry.Extended {
w.Header().Set(k, string(v)) if !strings.HasPrefix(k, "xattr-") {
// "xattr-" prefix is set in filesys.XATTR_PREFIX
w.Header().Set(k, string(v))
}
} }
//Seaweed custom header are not visible to Vue or javascript //Seaweed custom header are not visible to Vue or javascript