gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

swarm/api/http: add support for CORS headers (#3388)

Browse Source
This commit is contained in:
Maran
2017-01-05 11:57:41 +01:00
committed by Felix Lange
parent bbce726c8a
commit f087633efd
3 changed files with 49 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
swarm/swarm.go
View File

@ -52,6 +52,7 @@ type Swarm struct {
hive *network.Hive // the logistic manager
backend chequebook.Backend // simple blockchain Backend
privateKey *ecdsa.PrivateKey
corsString string
swapEnabled bool
}
@ -71,7 +72,7 @@ func (self *Swarm) API() *SwarmAPI {
// creates a new swarm service instance
// implements node.Service
func NewSwarm(ctx *node.ServiceContext, backend chequebook.Backend, config *api.Config, swapEnabled, syncEnabled bool) (self *Swarm, err error) {
func NewSwarm(ctx *node.ServiceContext, backend chequebook.Backend, config *api.Config, swapEnabled, syncEnabled bool, cors string) (self *Swarm, err error) {
if bytes.Equal(common.FromHex(config.PublicKey), storage.ZeroKey) {
return nil, fmt.Errorf("empty public key")
}
@ -84,6 +85,7 @@ func NewSwarm(ctx *node.ServiceContext, backend chequebook.Backend, config *api.
swapEnabled: swapEnabled,
backend: backend,
privateKey: config.Swap.PrivateKey(),
corsString: cors,
}
glog.V(logger.Debug).Infof("Setting up Swarm service components")
@ -188,10 +190,16 @@ func (self *Swarm) Start(net *p2p.Server) error {
// start swarm http proxy server
if self.config.Port != "" {
go httpapi.StartHttpServer(self.api, self.config.Port)
addr := ":" + self.config.Port
go httpapi.StartHttpServer(self.api, &httpapi.Server{Addr: addr, CorsString: self.corsString})
}
glog.V(logger.Debug).Infof("Swarm http proxy started on port: %v", self.config.Port)
if self.corsString != "" {
glog.V(logger.Debug).Infof("Swarm http proxy started with corsdomain:", self.corsString)
}
return nil
}