15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-25 17:12:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix: fix bug that image module read or write file ,module read all file content into memory (#2884) 

bugfix: fix bug that image module read or write file ,module read all file content into memory



bugfix: fix bug that image module read or write file ,module read all file content into memory

Signed-off-by: xuesongzuo@yunify.com <xuesongzuo@yunify.com>
This commit is contained in:
zuoxuesong-worker 2025-12-05 15:04:13 +08:00 committed by GitHub
parent b64db7134d
commit 94c5739a99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/modules/image.go
View File

@ -740,12 +740,6 @@ func (i imageTransport) post(request *http.Request) *http.Response {
// put method for http.MethodPut, create file in blobs dir or manifests dir
func (i imageTransport) put(request *http.Request) *http.Response {
if strings.HasSuffix(request.URL.Path, "/uploads") { // blobs
body, err := io.ReadAll(request.Body)
if err != nil {
klog.V(4).ErrorS(err, "failed to read request")
return responseServerError
}
defer request.Body.Close()
filename := filepath.Join(i.baseDir, "blobs", request.URL.Query().Get("digest"))
@ -755,7 +749,22 @@ func (i imageTransport) put(request *http.Request) *http.Response {
return responseServerError
}
if err := os.WriteFile(filename, body, os.ModePerm); err != nil {
file, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.ModePerm)
if err != nil {
klog.V(4).ErrorS(err, "failed to create file", "filename", filename)
return responseServerError
}
defer func() {
if err = file.Sync(); err != nil {
klog.V(4).ErrorS(err, "failed to sync file", "filename", filename)
}
if err = file.Close(); err != nil {
klog.V(4).ErrorS(err, "failed to close file", "filename", filename)
}
}()
if _, err = io.Copy(file, request.Body); err != nil {
klog.V(4).ErrorS(err, "failed to write file", "filename", filename)
return responseServerError
@ -800,7 +809,14 @@ func (i imageTransport) get(request *http.Request) *http.Response {
return responseNotFound
}
file, err := os.ReadFile(filename)
file, err := os.Open(filename)
if err != nil {
klog.V(4).ErrorS(err, "failed to read file", "filename", filename)
return responseServerError
}
fStat, err := file.Stat()
if err != nil {
klog.V(4).ErrorS(err, "failed to read file", "filename", filename)
@ -810,8 +826,8 @@ func (i imageTransport) get(request *http.Request) *http.Response {
return &http.Response{
Proto: "Local",
StatusCode: http.StatusOK,
ContentLength: int64(len(file)),
Body: io.NopCloser(bytes.NewReader(file)),
ContentLength: fStat.Size(),
Body: file,
}
} else if strings.HasSuffix(filepath.Dir(request.URL.Path), "manifests") { // manifests
filename := filepath.Join(i.baseDir, request.Host, strings.TrimPrefix(request.URL.Path, apiPrefix))