Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mybee
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
mybee
Commits
1a4197f4
Unverified
Commit
1a4197f4
authored
Jun 24, 2020
by
Janoš Guljaš
Committed by
GitHub
Jun 24, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
implement CORS headers in API (#358)
parent
ccdf8043
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
8 deletions
+35
-8
start.go
cmd/bee/cmd/start.go
+3
-0
api.go
pkg/api/api.go
+5
-4
router.go
pkg/api/router.go
+21
-0
node.go
pkg/node/node.go
+6
-4
No files found.
cmd/bee/cmd/start.go
View file @
1a4197f4
...
...
@@ -39,6 +39,7 @@ func (c *command) initStartCmd() (err error) {
optionNameDebugAPIAddr
=
"debug-api-addr"
optionNameBootnodes
=
"bootnode"
optionNameNetworkID
=
"network-id"
optionCORSAllowedOrigins
=
"cors-allowed-origins"
optionNameTracingEnabled
=
"tracing"
optionNameTracingEndpoint
=
"tracing-endpoint"
optionNameTracingServiceName
=
"tracing-service-name"
...
...
@@ -105,6 +106,7 @@ func (c *command) initStartCmd() (err error) {
DisableQUIC
:
c
.
config
.
GetBool
(
optionNameP2PDisableQUIC
),
NetworkID
:
c
.
config
.
GetUint64
(
optionNameNetworkID
),
Bootnodes
:
c
.
config
.
GetStringSlice
(
optionNameBootnodes
),
CORSAllowedOrigins
:
c
.
config
.
GetStringSlice
(
optionCORSAllowedOrigins
),
TracingEnabled
:
c
.
config
.
GetBool
(
optionNameTracingEnabled
),
TracingEndpoint
:
c
.
config
.
GetString
(
optionNameTracingEndpoint
),
TracingServiceName
:
c
.
config
.
GetString
(
optionNameTracingServiceName
),
...
...
@@ -166,6 +168,7 @@ func (c *command) initStartCmd() (err error) {
cmd
.
Flags
()
.
Bool
(
optionNameEnableDebugAPI
,
false
,
"enable debug HTTP API"
)
cmd
.
Flags
()
.
String
(
optionNameDebugAPIAddr
,
":6060"
,
"debug HTTP API listen address"
)
cmd
.
Flags
()
.
Uint64
(
optionNameNetworkID
,
1
,
"ID of the Swarm network"
)
cmd
.
Flags
()
.
StringSlice
(
optionCORSAllowedOrigins
,
[]
string
{},
"origins with CORS headers enabled"
)
cmd
.
Flags
()
.
Bool
(
optionNameTracingEnabled
,
false
,
"enable tracing"
)
cmd
.
Flags
()
.
String
(
optionNameTracingEndpoint
,
"127.0.0.1:6831"
,
"endpoint to send tracing data"
)
cmd
.
Flags
()
.
String
(
optionNameTracingServiceName
,
"bee"
,
"service name identifier for tracing"
)
...
...
pkg/api/api.go
View file @
1a4197f4
...
...
@@ -26,10 +26,11 @@ type server struct {
}
type
Options
struct
{
Tags
*
tags
.
Tags
Storer
storage
.
Storer
Logger
logging
.
Logger
Tracer
*
tracing
.
Tracer
Tags
*
tags
.
Tags
Storer
storage
.
Storer
CORSAllowedOrigins
[]
string
Logger
logging
.
Logger
Tracer
*
tracing
.
Tracer
}
func
New
(
o
Options
)
Service
{
...
...
pkg/api/router.go
View file @
1a4197f4
...
...
@@ -59,6 +59,27 @@ func (s *server) setupRouting() {
handlers
.
CompressHandler
,
// todo: add recovery handler
s
.
pageviewMetricsHandler
,
func
(
h
http
.
Handler
)
http
.
Handler
{
return
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
if
o
:=
r
.
Header
.
Get
(
"Origin"
);
o
!=
""
&&
(
s
.
CORSAllowedOrigins
==
nil
||
containsOrigin
(
o
,
s
.
CORSAllowedOrigins
))
{
w
.
Header
()
.
Set
(
"Access-Control-Allow-Credentials"
,
"true"
)
w
.
Header
()
.
Set
(
"Access-Control-Allow-Origin"
,
o
)
w
.
Header
()
.
Set
(
"Access-Control-Allow-Headers"
,
"Origin, Accept, Authorization, Content-Type, X-Requested-With, Access-Control-Request-Headers, Access-Control-Request-Method"
)
w
.
Header
()
.
Set
(
"Access-Control-Allow-Methods"
,
"GET, HEAD, OPTIONS, POST, PUT, DELETE"
)
w
.
Header
()
.
Set
(
"Access-Control-Max-Age"
,
"3600"
)
}
h
.
ServeHTTP
(
w
,
r
)
})
},
web
.
FinalHandler
(
router
),
)
}
func
containsOrigin
(
s
string
,
l
[]
string
)
(
ok
bool
)
{
for
_
,
e
:=
range
l
{
if
e
==
s
||
e
==
"*"
{
return
true
}
}
return
false
}
pkg/node/node.go
View file @
1a4197f4
...
...
@@ -78,6 +78,7 @@ type Options struct {
DisableQUIC
bool
NetworkID
uint64
Bootnodes
[]
string
CORSAllowedOrigins
[]
string
Logger
logging
.
Logger
TracingEnabled
bool
TracingEndpoint
string
...
...
@@ -291,10 +292,11 @@ func NewBee(o Options) (*Bee, error) {
if
o
.
APIAddr
!=
""
{
// API server
apiService
=
api
.
New
(
api
.
Options
{
Tags
:
tag
,
Storer
:
ns
,
Logger
:
logger
,
Tracer
:
tracer
,
Tags
:
tag
,
Storer
:
ns
,
CORSAllowedOrigins
:
o
.
CORSAllowedOrigins
,
Logger
:
logger
,
Tracer
:
tracer
,
})
apiListener
,
err
:=
net
.
Listen
(
"tcp"
,
o
.
APIAddr
)
if
err
!=
nil
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment