opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-01 19:24:14 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2021 from ipfs/fix/corsconfig

Browse Source 
Fix SetAllowedOrigins
This commit is contained in:
Juan Benet
2016-01-21 23:03:23 -08:00
parent 9c1375f668 f0801589b4
commit ffe6c8576e
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
commands/http/handler.go
View File

@ -332,7 +332,9 @@ func (cfg ServerConfig) AllowedOrigins() []string {
func (cfg *ServerConfig) SetAllowedOrigins(origins ...string) { func (cfg *ServerConfig) SetAllowedOrigins(origins ...string) {
cfg.cORSOptsRWMutex.Lock() cfg.cORSOptsRWMutex.Lock()
defer cfg.cORSOptsRWMutex.Unlock() defer cfg.cORSOptsRWMutex.Unlock()
cfg.cORSOpts.AllowedOrigins = origins o := make([]string, len(origins))
copy(o, origins)
cfg.cORSOpts.AllowedOrigins = o
} }
func (cfg *ServerConfig) AppendAllowedOrigins(origins ...string) { func (cfg *ServerConfig) AppendAllowedOrigins(origins ...string) {

13
test/sharness/t0060-daemon.sh
View File

@ -8,6 +8,9 @@ test_description="Test daemon command"
. lib/test-lib.sh . lib/test-lib.sh
gwyport=8080
apiport=5001
# TODO: randomize ports here once we add --config to ipfs daemon # TODO: randomize ports here once we add --config to ipfs daemon
# this needs to be in a different test than "ipfs daemon --init" below # this needs to be in a different test than "ipfs daemon --init" below
@ -44,6 +47,16 @@ test_expect_success "ipfs peer id looks good" '
test_check_peerid "$PEERID" test_check_peerid "$PEERID"
' '
# this is for checking SetAllowedOrigins race condition for the api and gateway
# See https://github.com/ipfs/go-ipfs/pull/1966
test_expect_success "ipfs API works with the correct allowed origin port" '
curl -s -X GET -H "Origin:http://localhost:$apiport" -I "http://localhost:$apiport/api/v0/version"
'
test_expect_success "ipfs gateway works with the correct allowed origin port" '
curl -s -X GET -H "Origin:http://localhost:$gwyport" -I "http://localhost:$gwyport/api/v0/version"
'
# This is like t0020-init.sh "ipfs init output looks good" # This is like t0020-init.sh "ipfs init output looks good"
# #
# Unfortunately the line: # Unfortunately the line: