astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-07-22 05:30:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Disallow requests with SSE-KMS headers (#6587)

Browse Source 
Addresses issue #6582. Minio server currently does not
have SSE-KMS support. Reject requests with SSE-KMS headers
with NotImplementedErr
This commit is contained in:
poornas
2018-10-09 15:04:53 -07:00
committed by kannappanr
parent e3eec89d24
commit 110458cd10
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/object-handlers.go
+9 -6
View File
@@ -84,7 +84,10 @@ func (api objectAPIHandlers) SelectObjectContentHandler(w http.ResponseWriter, r
writeErrorResponse(w, ErrServerNotInitialized, r.URL) writeErrorResponse(w, ErrServerNotInitialized, r.URL)
return return
} }
if crypto.S3KMS.IsRequested(r.Header) { // SSE-KMS is not supported
writeErrorResponse(w, ErrNotImplemented, r.URL)
return
}
vars := mux.Vars(r) vars := mux.Vars(r)
bucket := vars["bucket"] bucket := vars["bucket"]
object := vars["object"] object := vars["object"]
@@ -620,7 +623,7 @@ func (api objectAPIHandlers) CopyObjectHandler(w http.ResponseWriter, r *http.Re
writeErrorResponse(w, ErrServerNotInitialized, r.URL) writeErrorResponse(w, ErrServerNotInitialized, r.URL)
return return
} }
if !objectAPI.IsEncryptionSupported() && crypto.S3KMS.IsRequested(r.Header) { if crypto.S3KMS.IsRequested(r.Header) {
writeErrorResponse(w, ErrNotImplemented, r.URL) // SSE-KMS is not supported writeErrorResponse(w, ErrNotImplemented, r.URL) // SSE-KMS is not supported
return return
} }
@@ -966,7 +969,7 @@ func (api objectAPIHandlers) PutObjectHandler(w http.ResponseWriter, r *http.Req
writeErrorResponse(w, ErrServerNotInitialized, r.URL) writeErrorResponse(w, ErrServerNotInitialized, r.URL)
return return
} }
if !objectAPI.IsEncryptionSupported() && crypto.S3KMS.IsRequested(r.Header) { if crypto.S3KMS.IsRequested(r.Header) {
writeErrorResponse(w, ErrNotImplemented, r.URL) // SSE-KMS is not supported writeErrorResponse(w, ErrNotImplemented, r.URL) // SSE-KMS is not supported
return return
} }
@@ -1218,7 +1221,7 @@ func (api objectAPIHandlers) NewMultipartUploadHandler(w http.ResponseWriter, r
writeErrorResponse(w, ErrServerNotInitialized, r.URL) writeErrorResponse(w, ErrServerNotInitialized, r.URL)
return return
} }
if !objectAPI.IsEncryptionSupported() && crypto.S3KMS.IsRequested(r.Header) { if crypto.S3KMS.IsRequested(r.Header) {
writeErrorResponse(w, ErrNotImplemented, r.URL) // SSE-KMS is not supported writeErrorResponse(w, ErrNotImplemented, r.URL) // SSE-KMS is not supported
return return
} }
@@ -1310,7 +1313,7 @@ func (api objectAPIHandlers) CopyObjectPartHandler(w http.ResponseWriter, r *htt
writeErrorResponse(w, ErrServerNotInitialized, r.URL) writeErrorResponse(w, ErrServerNotInitialized, r.URL)
return return
} }
if !objectAPI.IsEncryptionSupported() && crypto.S3KMS.IsRequested(r.Header) { if crypto.S3KMS.IsRequested(r.Header) {
writeErrorResponse(w, ErrNotImplemented, r.URL) // SSE-KMS is not supported writeErrorResponse(w, ErrNotImplemented, r.URL) // SSE-KMS is not supported
return return
} }
@@ -1532,7 +1535,7 @@ func (api objectAPIHandlers) PutObjectPartHandler(w http.ResponseWriter, r *http
writeErrorResponse(w, ErrServerNotInitialized, r.URL) writeErrorResponse(w, ErrServerNotInitialized, r.URL)
return return
} }
if !objectAPI.IsEncryptionSupported() && crypto.S3KMS.IsRequested(r.Header) { if crypto.S3KMS.IsRequested(r.Header) {
writeErrorResponse(w, ErrNotImplemented, r.URL) // SSE-KMS is not supported writeErrorResponse(w, ErrNotImplemented, r.URL) // SSE-KMS is not supported
return return
} }