MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-27 06:33:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1060 from krishnasrinivas/cors-fixes

Browse Source 
CORS: cors handling should be before auth handling. cors should allow PUT.
This commit is contained in:
Harshavardhana 2016-01-28 10:49:09 -08:00
commit c4588b3cb9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
generic-handlers.go
View File

@ -126,7 +126,7 @@ func (h timeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
func CorsHandler(h http.Handler) http.Handler { func CorsHandler(h http.Handler) http.Handler {
c := cors.New(cors.Options{ c := cors.New(cors.Options{
AllowedOrigins: []string{"*"}, AllowedOrigins: []string{"*"},
AllowedMethods: []string{"GET", "HEAD", "POST"}, AllowedMethods: []string{"GET", "HEAD", "POST", "PUT"},
AllowedHeaders: []string{"*"}, AllowedHeaders: []string{"*"},
}) })
return c.Handler(h) return c.Handler(h)

4
routers.go
View File

@ -58,8 +58,8 @@ type WebAPI struct {
func getWebAPIHandler(web *WebAPI) http.Handler { func getWebAPIHandler(web *WebAPI) http.Handler {
var mwHandlers = []MiddlewareHandler{ var mwHandlers = []MiddlewareHandler{
TimeValidityHandler, // Validate time. TimeValidityHandler, // Validate time.
CorsHandler, // CORS added only for testing purposes.
AuthHandler, // Authentication handler for verifying tokens. AuthHandler, // Authentication handler for verifying tokens.
CorsHandler, // CORS added only for testing purposes.
} }
if web.AccessLog { if web.AccessLog {
mwHandlers = append(mwHandlers, AccessLogHandler) mwHandlers = append(mwHandlers, AccessLogHandler)
@ -157,7 +157,6 @@ func getNewCloudStorageAPI(conf cloudServerConfig) CloudStorageAPI {
func getCloudStorageAPIHandler(api CloudStorageAPI) http.Handler { func getCloudStorageAPIHandler(api CloudStorageAPI) http.Handler {
var mwHandlers = []MiddlewareHandler{ var mwHandlers = []MiddlewareHandler{
CorsHandler,
TimeValidityHandler, TimeValidityHandler,
IgnoreResourcesHandler, IgnoreResourcesHandler,
IgnoreSignatureV2RequestHandler, IgnoreSignatureV2RequestHandler,
@ -168,6 +167,7 @@ func getCloudStorageAPIHandler(api CloudStorageAPI) http.Handler {
if api.AccessLog { if api.AccessLog {
mwHandlers = append(mwHandlers, AccessLogHandler) mwHandlers = append(mwHandlers, AccessLogHandler)
} }
mwHandlers = append(mwHandlers, CorsHandler)
mux := router.NewRouter() mux := router.NewRouter()
registerCloudStorageAPI(mux, api) registerCloudStorageAPI(mux, api)
return registerCustomMiddleware(mux, mwHandlers...) return registerCustomMiddleware(mux, mwHandlers...)