MM-11160 Adding proper CORS support. (#9152)
* Adding proper CORS support. * Better CORS tests.
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
185ed89978
Коммит
bae26ec268
@@ -75,7 +75,7 @@ func StopTestStore() {
|
||||
}
|
||||
}
|
||||
|
||||
func setupTestHelper(enterprise bool) *TestHelper {
|
||||
func setupTestHelper(enterprise bool, updateConfig func(*model.Config)) *TestHelper {
|
||||
permConfig, err := os.Open(utils.FindConfigFile("config.json"))
|
||||
if err != nil {
|
||||
panic(err)
|
||||
@@ -115,6 +115,9 @@ func setupTestHelper(enterprise bool) *TestHelper {
|
||||
if testStore != nil {
|
||||
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = ":0" })
|
||||
}
|
||||
if updateConfig != nil {
|
||||
th.App.UpdateConfig(updateConfig)
|
||||
}
|
||||
serverErr := th.App.StartServer()
|
||||
if serverErr != nil {
|
||||
panic(serverErr)
|
||||
@@ -161,11 +164,15 @@ func setupTestHelper(enterprise bool) *TestHelper {
|
||||
}
|
||||
|
||||
func SetupEnterprise() *TestHelper {
|
||||
return setupTestHelper(true)
|
||||
return setupTestHelper(true, nil)
|
||||
}
|
||||
|
||||
func Setup() *TestHelper {
|
||||
return setupTestHelper(false)
|
||||
return setupTestHelper(false, nil)
|
||||
}
|
||||
|
||||
func SetupConfig(updateConfig func(cfg *model.Config)) *TestHelper {
|
||||
return setupTestHelper(false, updateConfig)
|
||||
}
|
||||
|
||||
func (me *TestHelper) TearDown() {
|
||||
|
||||
150
api4/cors_test.go
Обычный файл
150
api4/cors_test.go
Обычный файл
@@ -0,0 +1,150 @@
|
||||
package api4
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
"github.com/mattermost/mattermost-server/model"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
const (
|
||||
acAllowOrigin = "Access-Control-Allow-Origin"
|
||||
acExposeHeaders = "Access-Control-Expose-Headers"
|
||||
acMaxAge = "Access-Control-Max-Age"
|
||||
acAllowCredentials = "Access-Control-Allow-Credentials"
|
||||
acAllowMethods = "Access-Control-Allow-Methods"
|
||||
acAllowHeaders = "Access-Control-Allow-Headers"
|
||||
)
|
||||
|
||||
func TestCORSRequestHandling(t *testing.T) {
|
||||
for name, testcase := range map[string]struct {
|
||||
AllowCorsFrom string
|
||||
CorsExposedHeaders string
|
||||
CorsAllowCredentials bool
|
||||
ModifyRequest func(req *http.Request)
|
||||
ExpectedAllowOrigin string
|
||||
ExpectedExposeHeaders string
|
||||
ExpectedAllowCredentials string
|
||||
}{
|
||||
"NoCORS": {
|
||||
"",
|
||||
"",
|
||||
false,
|
||||
func(req *http.Request) {
|
||||
},
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
},
|
||||
"CORSEnabled": {
|
||||
"http://somewhere.com",
|
||||
"",
|
||||
false,
|
||||
func(req *http.Request) {
|
||||
},
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
},
|
||||
"CORSEnabledStarOrigin": {
|
||||
"*",
|
||||
"",
|
||||
false,
|
||||
func(req *http.Request) {
|
||||
req.Header.Set("Origin", "http://pre-release.mattermost.com")
|
||||
},
|
||||
"*",
|
||||
"",
|
||||
"",
|
||||
},
|
||||
"CORSEnabledStarNoOrigin": { // CORS spec requires this, not a bug.
|
||||
"*",
|
||||
"",
|
||||
false,
|
||||
func(req *http.Request) {
|
||||
},
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
},
|
||||
"CORSEnabledMatching": {
|
||||
"http://mattermost.com",
|
||||
"",
|
||||
false,
|
||||
func(req *http.Request) {
|
||||
req.Header.Set("Origin", "http://mattermost.com")
|
||||
},
|
||||
"http://mattermost.com",
|
||||
"",
|
||||
"",
|
||||
},
|
||||
"CORSEnabledMultiple": {
|
||||
"http://spinmint.com http://mattermost.com",
|
||||
"",
|
||||
false,
|
||||
func(req *http.Request) {
|
||||
req.Header.Set("Origin", "http://mattermost.com")
|
||||
},
|
||||
"http://mattermost.com",
|
||||
"",
|
||||
"",
|
||||
},
|
||||
"CORSEnabledWithCredentials": {
|
||||
"http://mattermost.com",
|
||||
"",
|
||||
true,
|
||||
func(req *http.Request) {
|
||||
req.Header.Set("Origin", "http://mattermost.com")
|
||||
},
|
||||
"http://mattermost.com",
|
||||
"",
|
||||
"true",
|
||||
},
|
||||
"CORSEnabledWithHeaders": {
|
||||
"http://mattermost.com",
|
||||
"x-my-special-header x-blueberry",
|
||||
true,
|
||||
func(req *http.Request) {
|
||||
req.Header.Set("Origin", "http://mattermost.com")
|
||||
},
|
||||
"http://mattermost.com",
|
||||
"X-My-Special-Header, X-Blueberry",
|
||||
"true",
|
||||
},
|
||||
} {
|
||||
t.Run(name, func(t *testing.T) {
|
||||
th := SetupConfig(func(cfg *model.Config) {
|
||||
*cfg.ServiceSettings.AllowCorsFrom = testcase.AllowCorsFrom
|
||||
*cfg.ServiceSettings.CorsExposedHeaders = testcase.CorsExposedHeaders
|
||||
*cfg.ServiceSettings.CorsAllowCredentials = testcase.CorsAllowCredentials
|
||||
})
|
||||
defer th.TearDown()
|
||||
|
||||
port := th.App.Srv.ListenAddr.Port
|
||||
host := fmt.Sprintf("http://localhost:%v", port)
|
||||
url := fmt.Sprintf("%v/api/v4/system/ping", host)
|
||||
|
||||
req, err := http.NewRequest("GET", url, nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
testcase.ModifyRequest(req)
|
||||
|
||||
client := &http.Client{}
|
||||
resp, err := client.Do(req)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
assert.Equal(t, http.StatusOK, resp.StatusCode)
|
||||
assert.Equal(t, testcase.ExpectedAllowOrigin, resp.Header.Get(acAllowOrigin))
|
||||
assert.Equal(t, testcase.ExpectedExposeHeaders, resp.Header.Get(acExposeHeaders))
|
||||
assert.Equal(t, "", resp.Header.Get(acMaxAge))
|
||||
assert.Equal(t, testcase.ExpectedAllowCredentials, resp.Header.Get(acAllowCredentials))
|
||||
assert.Equal(t, "", resp.Header.Get(acAllowMethods))
|
||||
assert.Equal(t, "", resp.Header.Get(acAllowHeaders))
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
Ссылка в новой задаче
Block a user