gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adjust visibility

Browse Source
This commit is contained in:
chrislu
2024-06-24 17:14:52 -07:00
parent 07f47776c3
commit ded761ffc5
4 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
weed/server/common.go
View File

@@ -260,7 +260,7 @@ func handleStaticResources2(r *mux.Router) {
r.PathPrefix("/seaweedfsstatic/").Handler(http.StripPrefix("/seaweedfsstatic", http.FileServer(http.FS(StaticFS)))) r.PathPrefix("/seaweedfsstatic/").Handler(http.StripPrefix("/seaweedfsstatic", http.FileServer(http.FS(StaticFS))))
} }
func adjustPassthroughHeaders(w http.ResponseWriter, r *http.Request, filename string) { func AdjustPassthroughHeaders(w http.ResponseWriter, r *http.Request, filename string) {
for header, values := range r.Header { for header, values := range r.Header {
if normalizedHeader, ok := s3_constants.PassThroughHeaders[strings.ToLower(header)]; ok { if normalizedHeader, ok := s3_constants.PassThroughHeaders[strings.ToLower(header)]; ok {
w.Header()[normalizedHeader] = values w.Header()[normalizedHeader] = values
@@ -284,7 +284,7 @@ func adjustHeaderContentDisposition(w http.ResponseWriter, r *http.Request, file
} }
} }
func processRangeRequest(r *http.Request, w http.ResponseWriter, totalSize int64, mimeType string, prepareWriteFn func(offset int64, size int64) (filer.DoStreamContent, error)) error { func ProcessRangeRequest(r *http.Request, w http.ResponseWriter, totalSize int64, mimeType string, prepareWriteFn func(offset int64, size int64) (filer.DoStreamContent, error)) error {
rangeReq := r.Header.Get("Range") rangeReq := r.Header.Get("Range")
bufferedWriter := writePool.Get().(*bufio.Writer) bufferedWriter := writePool.Get().(*bufio.Writer)
bufferedWriter.Reset(w) bufferedWriter.Reset(w)
@@ -297,14 +297,14 @@ func processRangeRequest(r *http.Request, w http.ResponseWriter, totalSize int64
w.Header().Set("Content-Length", strconv.FormatInt(totalSize, 10)) w.Header().Set("Content-Length", strconv.FormatInt(totalSize, 10))
writeFn, err := prepareWriteFn(0, totalSize) writeFn, err := prepareWriteFn(0, totalSize)
if err != nil { if err != nil {
glog.Errorf("processRangeRequest: %v", err) glog.Errorf("ProcessRangeRequest: %v", err)
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return fmt.Errorf("processRangeRequest: %v", err) return fmt.Errorf("ProcessRangeRequest: %v", err)
} }
if err = writeFn(bufferedWriter); err != nil { if err = writeFn(bufferedWriter); err != nil {
glog.Errorf("processRangeRequest: %v", err) glog.Errorf("ProcessRangeRequest: %v", err)
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return fmt.Errorf("processRangeRequest: %v", err) return fmt.Errorf("ProcessRangeRequest: %v", err)
} }
return nil return nil
} }
@@ -313,9 +313,9 @@ func processRangeRequest(r *http.Request, w http.ResponseWriter, totalSize int64
//mostly copy from src/pkg/net/http/fs.go //mostly copy from src/pkg/net/http/fs.go
ranges, err := parseRange(rangeReq, totalSize) ranges, err := parseRange(rangeReq, totalSize)
if err != nil { if err != nil {
glog.Errorf("processRangeRequest headers: %+v err: %v", w.Header(), err) glog.Errorf("ProcessRangeRequest headers: %+v err: %v", w.Header(), err)
http.Error(w, err.Error(), http.StatusRequestedRangeNotSatisfiable) http.Error(w, err.Error(), http.StatusRequestedRangeNotSatisfiable)
return fmt.Errorf("processRangeRequest header: %v", err) return fmt.Errorf("ProcessRangeRequest header: %v", err)
} }
if sumRangesSize(ranges) > totalSize { if sumRangesSize(ranges) > totalSize {
// The total number of bytes in all the ranges // The total number of bytes in all the ranges
@@ -345,16 +345,16 @@ func processRangeRequest(r *http.Request, w http.ResponseWriter, totalSize int64
writeFn, err := prepareWriteFn(ra.start, ra.length) writeFn, err := prepareWriteFn(ra.start, ra.length)
if err != nil { if err != nil {
glog.Errorf("processRangeRequest range[0]: %+v err: %v", w.Header(), err) glog.Errorf("ProcessRangeRequest range[0]: %+v err: %v", w.Header(), err)
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return fmt.Errorf("processRangeRequest: %v", err) return fmt.Errorf("ProcessRangeRequest: %v", err)
} }
w.WriteHeader(http.StatusPartialContent) w.WriteHeader(http.StatusPartialContent)
err = writeFn(bufferedWriter) err = writeFn(bufferedWriter)
if err != nil { if err != nil {
glog.Errorf("processRangeRequest range[0]: %+v err: %v", w.Header(), err) glog.Errorf("ProcessRangeRequest range[0]: %+v err: %v", w.Header(), err)
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return fmt.Errorf("processRangeRequest range[0]: %v", err) return fmt.Errorf("ProcessRangeRequest range[0]: %v", err)
} }
return nil return nil
} }
@@ -369,9 +369,9 @@ func processRangeRequest(r *http.Request, w http.ResponseWriter, totalSize int64
} }
writeFn, err := prepareWriteFn(ra.start, ra.length) writeFn, err := prepareWriteFn(ra.start, ra.length)
if err != nil { if err != nil {
glog.Errorf("processRangeRequest range[%d] err: %v", i, err) glog.Errorf("ProcessRangeRequest range[%d] err: %v", i, err)
http.Error(w, "Internal Error", http.StatusInternalServerError) http.Error(w, "Internal Error", http.StatusInternalServerError)
return fmt.Errorf("processRangeRequest range[%d] err: %v", i, err) return fmt.Errorf("ProcessRangeRequest range[%d] err: %v", i, err)
} }
writeFnByRange[i] = writeFn writeFnByRange[i] = writeFn
} }
@@ -406,9 +406,9 @@ func processRangeRequest(r *http.Request, w http.ResponseWriter, totalSize int64
} }
w.WriteHeader(http.StatusPartialContent) w.WriteHeader(http.StatusPartialContent)
if _, err := io.CopyN(bufferedWriter, sendContent, sendSize); err != nil { if _, err := io.CopyN(bufferedWriter, sendContent, sendSize); err != nil {
glog.Errorf("processRangeRequest err: %v", err) glog.Errorf("ProcessRangeRequest err: %v", err)
http.Error(w, "Internal Error", http.StatusInternalServerError) http.Error(w, "Internal Error", http.StatusInternalServerError)
return fmt.Errorf("processRangeRequest err: %v", err) return fmt.Errorf("ProcessRangeRequest err: %v", err)
} }
return nil return nil
} }

10
weed/server/filer_server_handlers_read.go
View File

@@ -71,14 +71,14 @@ func checkPreconditions(w http.ResponseWriter, r *http.Request, entry *filer.Ent
ifModifiedSinceHeader := r.Header.Get("If-Modified-Since") ifModifiedSinceHeader := r.Header.Get("If-Modified-Since")
if ifNoneMatchETagHeader != "" { if ifNoneMatchETagHeader != "" {
if util.CanonicalizeETag(etag) == util.CanonicalizeETag(ifNoneMatchETagHeader) { if util.CanonicalizeETag(etag) == util.CanonicalizeETag(ifNoneMatchETagHeader) {
setEtag(w, etag) SetEtag(w, etag)
w.WriteHeader(http.StatusNotModified) w.WriteHeader(http.StatusNotModified)
return true return true
} }
} else if ifModifiedSinceHeader != "" { } else if ifModifiedSinceHeader != "" {
if t, parseError := time.Parse(http.TimeFormat, ifModifiedSinceHeader); parseError == nil { if t, parseError := time.Parse(http.TimeFormat, ifModifiedSinceHeader); parseError == nil {
if !t.Before(entry.Attr.Mtime) { if !t.Before(entry.Attr.Mtime) {
setEtag(w, etag) SetEtag(w, etag)
w.WriteHeader(http.StatusNotModified) w.WriteHeader(http.StatusNotModified)
return true return true
} }
@@ -220,10 +220,10 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request)
w.Header().Set(s3_constants.AmzTagCount, strconv.Itoa(tagCount)) w.Header().Set(s3_constants.AmzTagCount, strconv.Itoa(tagCount))
} }
setEtag(w, etag) SetEtag(w, etag)
filename := entry.Name() filename := entry.Name()
adjustPassthroughHeaders(w, r, filename) AdjustPassthroughHeaders(w, r, filename)
totalSize := int64(entry.Size()) totalSize := int64(entry.Size())
if r.Method == "HEAD" { if r.Method == "HEAD" {
@@ -252,7 +252,7 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request)
} }
} }
processRangeRequest(r, w, totalSize, mimeType, func(offset int64, size int64) (filer.DoStreamContent, error) { ProcessRangeRequest(r, w, totalSize, mimeType, func(offset int64, size int64) (filer.DoStreamContent, error) {
if offset+size <= int64(len(entry.Content)) { if offset+size <= int64(len(entry.Content)) {
return func(writer io.Writer) error { return func(writer io.Writer) error {
_, err := writer.Write(entry.Content[offset : offset+size]) _, err := writer.Write(entry.Content[offset : offset+size])

10
weed/server/volume_server_handlers_read.go
View File

@@ -186,7 +186,7 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request)
w.WriteHeader(http.StatusNotModified) w.WriteHeader(http.StatusNotModified)
return return
} }
setEtag(w, n.Etag()) SetEtag(w, n.Etag())
if n.HasPairs() { if n.HasPairs() {
pairMap := make(map[string]string) pairMap := make(map[string]string)
@@ -377,14 +377,14 @@ func writeResponseContent(filename, mimeType string, rs io.ReadSeeker, w http.Re
} }
w.Header().Set("Accept-Ranges", "bytes") w.Header().Set("Accept-Ranges", "bytes")
adjustPassthroughHeaders(w, r, filename) AdjustPassthroughHeaders(w, r, filename)
if r.Method == "HEAD" { if r.Method == "HEAD" {
w.Header().Set("Content-Length", strconv.FormatInt(totalSize, 10)) w.Header().Set("Content-Length", strconv.FormatInt(totalSize, 10))
return nil return nil
} }
return processRangeRequest(r, w, totalSize, mimeType, func(offset int64, size int64) (filer.DoStreamContent, error) { return ProcessRangeRequest(r, w, totalSize, mimeType, func(offset int64, size int64) (filer.DoStreamContent, error) {
return func(writer io.Writer) error { return func(writer io.Writer) error {
if _, e = rs.Seek(offset, 0); e != nil { if _, e = rs.Seek(offset, 0); e != nil {
return e return e
@@ -406,14 +406,14 @@ func (vs *VolumeServer) streamWriteResponseContent(filename string, mimeType str
w.Header().Set("Content-Type", mimeType) w.Header().Set("Content-Type", mimeType)
} }
w.Header().Set("Accept-Ranges", "bytes") w.Header().Set("Accept-Ranges", "bytes")
adjustPassthroughHeaders(w, r, filename) AdjustPassthroughHeaders(w, r, filename)
if r.Method == "HEAD" { if r.Method == "HEAD" {
w.Header().Set("Content-Length", strconv.FormatInt(totalSize, 10)) w.Header().Set("Content-Length", strconv.FormatInt(totalSize, 10))
return return
} }
processRangeRequest(r, w, totalSize, mimeType, func(offset int64, size int64) (filer.DoStreamContent, error) { ProcessRangeRequest(r, w, totalSize, mimeType, func(offset int64, size int64) (filer.DoStreamContent, error) {
return func(writer io.Writer) error { return func(writer io.Writer) error {
return vs.store.ReadVolumeNeedleDataInto(volumeId, n, readOption, writer, offset, size) return vs.store.ReadVolumeNeedleDataInto(volumeId, n, readOption, writer, offset, size)
}, nil }, nil

6
weed/server/volume_server_handlers_write.go
View File

@@ -53,7 +53,7 @@ func (vs *VolumeServer) PostHandler(w http.ResponseWriter, r *http.Request) {
// http 204 status code does not allow body // http 204 status code does not allow body
if writeError == nil && isUnchanged { if writeError == nil && isUnchanged {
setEtag(w, reqNeedle.Etag()) SetEtag(w, reqNeedle.Etag())
w.WriteHeader(http.StatusNoContent) w.WriteHeader(http.StatusNoContent)
return return
} }
@@ -65,7 +65,7 @@ func (vs *VolumeServer) PostHandler(w http.ResponseWriter, r *http.Request) {
ret.Size = uint32(originalSize) ret.Size = uint32(originalSize)
ret.ETag = reqNeedle.Etag() ret.ETag = reqNeedle.Etag()
ret.Mime = string(reqNeedle.Mime) ret.Mime = string(reqNeedle.Mime)
setEtag(w, ret.ETag) SetEtag(w, ret.ETag)
w.Header().Set("Content-MD5", contentMd5) w.Header().Set("Content-MD5", contentMd5)
writeJsonQuiet(w, r, httpStatus, ret) writeJsonQuiet(w, r, httpStatus, ret)
} }
@@ -147,7 +147,7 @@ func writeDeleteResult(err error, count int64, w http.ResponseWriter, r *http.Re
} }
} }
func setEtag(w http.ResponseWriter, etag string) { func SetEtag(w http.ResponseWriter, etag string) {
if etag != "" { if etag != "" {
if strings.HasPrefix(etag, "\"") { if strings.HasPrefix(etag, "\"") {
w.Header().Set("ETag", etag) w.Header().Set("ETag", etag)