Chris Lu 4 years ago
parent
commit
310e31424e
  1. 15
      weed/s3api/s3err/error_handler.go
  2. 2
      weed/s3api/s3err/s3api_errors.go

15
weed/s3api/s3err/error_handler.go

@ -5,8 +5,10 @@ import (
"encoding/xml" "encoding/xml"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/gorilla/mux"
"net/http" "net/http"
"strconv" "strconv"
"strings"
"time" "time"
) )
@ -26,15 +28,24 @@ func WriteEmptyResponse(w http.ResponseWriter, statusCode int) {
} }
func WriteErrorResponse(w http.ResponseWriter, errorCode ErrorCode, r *http.Request) { func WriteErrorResponse(w http.ResponseWriter, errorCode ErrorCode, r *http.Request) {
vars := mux.Vars(r)
bucket := vars["bucket"]
object := vars["object"]
if !strings.HasPrefix(object, "/") {
object = "/" + object
}
apiError := GetAPIError(errorCode) apiError := GetAPIError(errorCode)
errorResponse := getRESTErrorResponse(apiError, r.URL.Path)
errorResponse := getRESTErrorResponse(apiError, r.URL.Path, bucket, object)
encodedErrorResponse := EncodeXMLResponse(errorResponse) encodedErrorResponse := EncodeXMLResponse(errorResponse)
WriteResponse(w, apiError.HTTPStatusCode, encodedErrorResponse, MimeXML) WriteResponse(w, apiError.HTTPStatusCode, encodedErrorResponse, MimeXML)
} }
func getRESTErrorResponse(err APIError, resource string) RESTErrorResponse {
func getRESTErrorResponse(err APIError, resource string, bucket, object string) RESTErrorResponse {
return RESTErrorResponse{ return RESTErrorResponse{
Code: err.Code, Code: err.Code,
BucketName: bucket,
Key: object[1:],
Message: err.Description, Message: err.Description,
Resource: resource, Resource: resource,
RequestID: fmt.Sprintf("%d", time.Now().UnixNano()), RequestID: fmt.Sprintf("%d", time.Now().UnixNano()),

2
weed/s3api/s3err/s3api_errors.go

@ -20,6 +20,8 @@ type RESTErrorResponse struct {
Message string `xml:"Message" json:"Message"` Message string `xml:"Message" json:"Message"`
Resource string `xml:"Resource" json:"Resource"` Resource string `xml:"Resource" json:"Resource"`
RequestID string `xml:"RequestId" json:"RequestId"` RequestID string `xml:"RequestId" json:"RequestId"`
Key string `xml:"Key,omitempty" json:"Key,omitempty"`
BucketName string `xml:"BucketName,omitempty" json:"BucketName,omitempty"`
// Underlying HTTP status code for the returned error // Underlying HTTP status code for the returned error
StatusCode int `xml:"-" json:"-"` StatusCode int `xml:"-" json:"-"`

Loading…
Cancel
Save