fix headers

This commit is contained in:
2026-02-02 13:31:48 +02:00
parent fa8563848f
commit 8e9c270972
3 changed files with 21 additions and 20 deletions
+6 -5
View File
@@ -21,8 +21,9 @@ func (hand *Handler) FileExists(rctx *router.Context) {
rctx.SetStatus(code) rctx.SetStatus(code)
return return
} }
// TODO
rctx.SetHeader("X-Content-Type", res.ContentType) rctx.SetHeader("X-Content-Type", res.ContentType)
rctx.SetHeader("X-Content-Size", res.ContentSize) rctx.SetHeader("X-Content-Length", res.ContentLength)
rctx.SetHeader("X-Content-Digest", res.ContentDigest) rctx.SetHeader("X-Content-Digest", res.ContentDigest)
rctx.SetHeader("Content-Length", "0") rctx.SetHeader("Content-Length", "0")
rctx.SetStatus(code) rctx.SetStatus(code)
@@ -31,15 +32,15 @@ func (hand *Handler) FileExists(rctx *router.Context) {
func (hand *Handler) PutFile(rctx *router.Context) { func (hand *Handler) PutFile(rctx *router.Context) {
hand.logg.Debugf("Handle PutFile") hand.logg.Debugf("Handle PutFile")
contentSize := rctx.GetHeader("Content-Size") contentLength := rctx.GetHeader("Content-Length")
contentType := rctx.GetHeader("Content-Type") contentType := rctx.GetHeader("Content-Type")
filepath := rctx.PathMap["filepath"] filepath := rctx.PathMap["filepath"]
hand.logg.Debugf("%s", contentSize) hand.logg.Debugf("Content-Length=%s", rctx.GetHeader("Content-Length"))
params := &operator.PutFileParams{ params := &operator.PutFileParams{
Filepath: filepath, Filepath: filepath,
ContentSize: contentSize, ContentLength: contentLength,
ContentType: contentType, ContentType: contentType,
Source: rctx.Request.Body, Source: rctx.Request.Body,
} }
@@ -69,7 +70,7 @@ func (hand *Handler) GetFile(rctx *router.Context) {
} }
rctx.SetHeader("Content-Type", res.ContentType) rctx.SetHeader("Content-Type", res.ContentType)
rctx.SetHeader("Content-Length", res.ContentSize) rctx.SetHeader("Content-Length", res.ContentLength)
rctx.SetHeader("Content-Digest", res.ContentDigest) rctx.SetHeader("Content-Digest", res.ContentDigest)
rctx.SetStatus(code) rctx.SetStatus(code)
+8 -8
View File
@@ -21,7 +21,7 @@ type FileExistsParams struct {
} }
type FileExistsResult struct { type FileExistsResult struct {
ContentType string ContentType string
ContentSize string ContentLength string
ContentDigest string ContentDigest string
} }
@@ -54,7 +54,7 @@ func (oper *Operator) FileExists(param *FileExistsParams) (int, *FileExistsResul
return code, res, err return code, res, err
} }
res = &FileExistsResult{ res = &FileExistsResult{
ContentSize: strconv.FormatInt(fileDescr.Size, 10), ContentLength: strconv.FormatInt(fileDescr.Size, 10),
ContentType: fileDescr.Type, ContentType: fileDescr.Type,
ContentDigest: fileDescr.Checksum, ContentDigest: fileDescr.Checksum,
} }
@@ -64,7 +64,7 @@ func (oper *Operator) FileExists(param *FileExistsParams) (int, *FileExistsResul
// PutFile // PutFile
type PutFileParams struct { type PutFileParams struct {
ContentType string ContentType string
ContentSize string ContentLength string
Filepath string Filepath string
Source io.ReadCloser Source io.ReadCloser
} }
@@ -76,12 +76,12 @@ func (oper *Operator) PutFile(param *PutFileParams) (int, *PutFileResult, error)
var err error var err error
res := &PutFileResult{} res := &PutFileResult{}
if param.ContentSize == "" { if param.ContentLength == "" {
code := http.StatusLengthRequired code := http.StatusLengthRequired
err = fmt.Errorf("Content-Size is empty") err = fmt.Errorf("Content-Length is empty")
return code, res, err return code, res, err
} }
size, err := strconv.ParseInt(param.ContentSize, 10, 64) size, err := strconv.ParseInt(param.ContentLength, 10, 64)
if err != nil { if err != nil {
code := http.StatusLengthRequired code := http.StatusLengthRequired
return code, res, err return code, res, err
@@ -158,7 +158,7 @@ type GetFileParams struct {
} }
type GetFileResult struct { type GetFileResult struct {
ContentType string ContentType string
ContentSize string ContentLength string
ContentDigest string ContentDigest string
Source io.ReadCloser Source io.ReadCloser
} }
@@ -194,7 +194,7 @@ func (oper *Operator) GetFile(param *GetFileParams) (int, *GetFileResult, error)
return code, res, err return code, res, err
} }
res = &GetFileResult{ res = &GetFileResult{
ContentSize: strconv.FormatInt(fileDescr.Size, 10), ContentLength: strconv.FormatInt(fileDescr.Size, 10),
ContentType: fileDescr.Type, ContentType: fileDescr.Type,
ContentDigest: fileDescr.Checksum, ContentDigest: fileDescr.Checksum,
Source: reader, Source: reader,
+1 -1
View File
@@ -157,8 +157,8 @@ func (cli *Client) PutFile(ctx context.Context, filename, ref string) error {
} }
filesize := fileinfo.Size() filesize := fileinfo.Size()
req.ContentLength = filesize
req.Header.Set("Content-Type", "application/octet-stream") req.Header.Set("Content-Type", "application/octet-stream")
req.Header.Set("Content-Size", strconv.FormatInt(filesize, 10))
resp, err := client.Do(req) resp, err := client.Do(req)
if err != nil { if err != nil {