aboutsummaryrefslogtreecommitdiff
path: root/weed/iamapi
diff options
context:
space:
mode:
Diffstat (limited to 'weed/iamapi')
-rw-r--r--weed/iamapi/iamapi_handlers.go84
-rw-r--r--weed/iamapi/iamapi_management_handlers.go12
-rw-r--r--weed/iamapi/iamapi_server.go3
3 files changed, 13 insertions, 86 deletions
diff --git a/weed/iamapi/iamapi_handlers.go b/weed/iamapi/iamapi_handlers.go
index 2e5f709f3..7765d9e95 100644
--- a/weed/iamapi/iamapi_handlers.go
+++ b/weed/iamapi/iamapi_handlers.go
@@ -1,55 +1,13 @@
package iamapi
import (
- "bytes"
- "encoding/xml"
"fmt"
- "strconv"
-
- "net/http"
- "net/url"
- "time"
-
+ "github.com/aws/aws-sdk-go/service/iam"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/s3api/s3err"
-
- "github.com/aws/aws-sdk-go/service/iam"
-)
-
-type mimeType string
-
-const (
- mimeNone mimeType = ""
- mimeXML mimeType = "application/xml"
+ "net/http"
)
-func setCommonHeaders(w http.ResponseWriter) {
- w.Header().Set("x-amz-request-id", fmt.Sprintf("%d", time.Now().UnixNano()))
- w.Header().Set("Accept-Ranges", "bytes")
-}
-
-// Encodes the response headers into XML format.
-func encodeResponse(response interface{}) []byte {
- var bytesBuffer bytes.Buffer
- bytesBuffer.WriteString(xml.Header)
- e := xml.NewEncoder(&bytesBuffer)
- e.Encode(response)
- return bytesBuffer.Bytes()
-}
-
-// If none of the http routes match respond with MethodNotAllowed
-func notFoundHandler(w http.ResponseWriter, r *http.Request) {
- glog.V(0).Infof("unsupported %s %s", r.Method, r.RequestURI)
- writeErrorResponse(w, s3err.ErrMethodNotAllowed, r.URL)
-}
-
-func writeErrorResponse(w http.ResponseWriter, errorCode s3err.ErrorCode, reqURL *url.URL) {
- apiError := s3err.GetAPIError(errorCode)
- errorResponse := getRESTErrorResponse(apiError, reqURL.Path)
- encodedErrorResponse := encodeResponse(errorResponse)
- writeResponse(w, apiError.HTTPStatusCode, encodedErrorResponse, mimeXML)
-}
-
func writeIamErrorResponse(w http.ResponseWriter, err error, object string, value string, msg error) {
errCode := err.Error()
errorResp := ErrorResponse{}
@@ -64,42 +22,10 @@ func writeIamErrorResponse(w http.ResponseWriter, err error, object string, valu
case iam.ErrCodeNoSuchEntityException:
msg := fmt.Sprintf("The %s with name %s cannot be found.", object, value)
errorResp.Error.Message = &msg
- writeResponse(w, http.StatusNotFound, encodeResponse(errorResp), mimeXML)
+ s3err.WriteXMLResponse(w, http.StatusNotFound, errorResp)
case iam.ErrCodeServiceFailureException:
- writeResponse(w, http.StatusInternalServerError, encodeResponse(errorResp), mimeXML)
+ s3err.WriteXMLResponse(w, http.StatusInternalServerError, errorResp)
default:
- writeResponse(w, http.StatusInternalServerError, encodeResponse(errorResp), mimeXML)
- }
-}
-
-func getRESTErrorResponse(err s3err.APIError, resource string) s3err.RESTErrorResponse {
- return s3err.RESTErrorResponse{
- Code: err.Code,
- Message: err.Description,
- Resource: resource,
- RequestID: fmt.Sprintf("%d", time.Now().UnixNano()),
+ s3err.WriteXMLResponse(w, http.StatusInternalServerError, errorResp)
}
}
-
-func writeResponse(w http.ResponseWriter, statusCode int, response []byte, mType mimeType) {
- setCommonHeaders(w)
- if response != nil {
- w.Header().Set("Content-Length", strconv.Itoa(len(response)))
- }
- if mType != mimeNone {
- w.Header().Set("Content-Type", string(mType))
- }
- w.WriteHeader(statusCode)
- if response != nil {
- glog.V(4).Infof("status %d %s: %s", statusCode, mType, string(response))
- _, err := w.Write(response)
- if err != nil {
- glog.V(0).Infof("write err: %v", err)
- }
- w.(http.Flusher).Flush()
- }
-}
-
-func writeSuccessResponseXML(w http.ResponseWriter, response []byte) {
- writeResponse(w, http.StatusOK, response, mimeXML)
-}
diff --git a/weed/iamapi/iamapi_management_handlers.go b/weed/iamapi/iamapi_management_handlers.go
index 89d283138..0826ce336 100644
--- a/weed/iamapi/iamapi_management_handlers.go
+++ b/weed/iamapi/iamapi_management_handlers.go
@@ -362,7 +362,7 @@ func (iama *IamApiServer) DeleteAccessKey(s3cfg *iam_pb.S3ApiConfiguration, valu
func (iama *IamApiServer) DoActions(w http.ResponseWriter, r *http.Request) {
if err := r.ParseForm(); err != nil {
- writeErrorResponse(w, s3err.ErrInvalidRequest, r.URL)
+ s3err.WriteErrorResponse(w, s3err.ErrInvalidRequest, r)
return
}
values := r.PostForm
@@ -370,7 +370,7 @@ func (iama *IamApiServer) DoActions(w http.ResponseWriter, r *http.Request) {
s3cfgLock.RLock()
s3cfg := &iam_pb.S3ApiConfiguration{}
if err := iama.s3ApiConfig.GetS3ApiConfiguration(s3cfg); err != nil {
- writeErrorResponse(w, s3err.ErrInternalError, r.URL)
+ s3err.WriteErrorResponse(w, s3err.ErrInternalError, r)
return
}
s3cfgLock.RUnlock()
@@ -411,14 +411,14 @@ func (iama *IamApiServer) DoActions(w http.ResponseWriter, r *http.Request) {
response, err = iama.CreatePolicy(s3cfg, values)
if err != nil {
glog.Errorf("CreatePolicy: %+v", err)
- writeErrorResponse(w, s3err.ErrInvalidRequest, r.URL)
+ s3err.WriteErrorResponse(w, s3err.ErrInvalidRequest, r)
return
}
case "PutUserPolicy":
response, err = iama.PutUserPolicy(s3cfg, values)
if err != nil {
glog.Errorf("PutUserPolicy: %+v", err)
- writeErrorResponse(w, s3err.ErrInvalidRequest, r.URL)
+ s3err.WriteErrorResponse(w, s3err.ErrInvalidRequest, r)
return
}
case "GetUserPolicy":
@@ -437,7 +437,7 @@ func (iama *IamApiServer) DoActions(w http.ResponseWriter, r *http.Request) {
errorResponse := ErrorResponse{}
errorResponse.Error.Code = &errNotImplemented.Code
errorResponse.Error.Message = &errNotImplemented.Description
- writeResponse(w, errNotImplemented.HTTPStatusCode, encodeResponse(errorResponse), mimeXML)
+ s3err.WriteXMLResponse(w, errNotImplemented.HTTPStatusCode, errorResponse)
return
}
if changed {
@@ -449,5 +449,5 @@ func (iama *IamApiServer) DoActions(w http.ResponseWriter, r *http.Request) {
return
}
}
- writeSuccessResponseXML(w, encodeResponse(response))
+ s3err.WriteXMLResponse(w, http.StatusOK, response)
}
diff --git a/weed/iamapi/iamapi_server.go b/weed/iamapi/iamapi_server.go
index 18af1a919..eb18e996d 100644
--- a/weed/iamapi/iamapi_server.go
+++ b/weed/iamapi/iamapi_server.go
@@ -12,6 +12,7 @@ import (
"github.com/chrislusf/seaweedfs/weed/pb/iam_pb"
"github.com/chrislusf/seaweedfs/weed/s3api"
. "github.com/chrislusf/seaweedfs/weed/s3api/s3_constants"
+ "github.com/chrislusf/seaweedfs/weed/s3api/s3err"
"github.com/chrislusf/seaweedfs/weed/wdclient"
"github.com/gorilla/mux"
"google.golang.org/grpc"
@@ -71,7 +72,7 @@ func (iama *IamApiServer) registerRouter(router *mux.Router) {
apiRouter.Methods("POST").Path("/").HandlerFunc(iama.iam.Auth(iama.DoActions, ACTION_ADMIN))
//
// NotFound
- apiRouter.NotFoundHandler = http.HandlerFunc(notFoundHandler)
+ apiRouter.NotFoundHandler = http.HandlerFunc(s3err.NotFoundHandler)
}
func (iam IamS3ApiConfigure) GetS3ApiConfiguration(s3cfg *iam_pb.S3ApiConfiguration) (err error) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-21 12:14:59 +0000