forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-24 21:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Changed protocol choice. Missing proper distinction between mutable and immutable Swarm protocols.

Browse source
This commit is contained in:
Daniel A. Nagy 2016-02-04 12:12:39 +01:00
parent 477d498181
commit 5189b7d6bc
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
swarm/api/http/server.go
View file

@ -22,8 +22,8 @@ const (
) )
var ( var (
bzzPrefix = regexp.MustCompile("^/+bzz:/+") // accepted protocols: bzz (traditional), bzzi (immutable) and bzzr (raw)
rawUrl = regexp.MustCompile("^/+raw/*") bzzPrefix = regexp.MustCompile("^/+bzz[ir]?:/+")
trailingSlashes = regexp.MustCompile("/+$") trailingSlashes = regexp.MustCompile("/+$")
// forever = func() time.Time { return time.Unix(0, 0) } // forever = func() time.Time { return time.Unix(0, 0) }
forever = time.Now forever = time.Now
@ -64,18 +64,36 @@ func handler(w http.ResponseWriter, r *http.Request, a *api.Api) {
// } // }
glog.V(logger.Debug).Infof("[BZZ] Swarm: HTTP request URL: '%s', Host: '%s', Path: '%s', Referer: '%s', Accept: '%s'", r.RequestURI, requestURL.Host, requestURL.Path, r.Referer(), r.Header.Get("Accept")) glog.V(logger.Debug).Infof("[BZZ] Swarm: HTTP request URL: '%s', Host: '%s', Path: '%s', Referer: '%s', Accept: '%s'", r.RequestURI, requestURL.Host, requestURL.Path, r.Referer(), r.Header.Get("Accept"))
uri := requestURL.Path uri := requestURL.Path
// TODO: var raw, nameresolver bool
var raw bool var raw bool
var proto string
// HTTP-based URL protocol handler // HTTP-based URL protocol handler
uri = bzzPrefix.ReplaceAllString(uri, "")
glog.V(logger.Debug).Infof("[BZZ] Swarm: BZZ request URI: '%s'", uri) glog.V(logger.Debug).Infof("[BZZ] Swarm: BZZ request URI: '%s'", uri)
path := rawUrl.ReplaceAllStringFunc(uri, func(string) string { path := bzzPrefix.ReplaceAllStringFunc(uri, func(p string) string {
raw = true proto = p
return "" return ""
}) })
glog.V(logger.Debug).Infof("[BZZ] Swarm: %s request '%s' received.", r.Method, uri) // protocol identification (ugly)
if proto == "" {
if glog.V(logger.Error) {
glog.Errorf(
"[BZZ] Swarm: Protocol error in request `%s`.",
uri,
)
http.Error(w, "BZZ protocol error", http.StatusBadRequest)
return
}
}
raw = proto[1:5] == "bzzr"
// TODO: nameresolver = proto[1:5] != "bzzi"
glog.V(logger.Debug).Infof(
"[BZZ] Swarm: %s request over protocol %s '%s' received.",
r.Method, proto, path,
)
switch { switch {
case r.Method == "POST" || r.Method == "PUT": case r.Method == "POST" || r.Method == "PUT":