aboutsummaryrefslogtreecommitdiffstats
path: root/swarm
diff options
context:
space:
mode:
Diffstat (limited to 'swarm')
-rw-r--r--swarm/api/api.go13
-rw-r--r--swarm/api/config.go14
-rw-r--r--swarm/api/http/server.go32
-rw-r--r--swarm/api/http/server_test.go117
-rw-r--r--swarm/api/manifest.go5
5 files changed, 168 insertions, 13 deletions
diff --git a/swarm/api/api.go b/swarm/api/api.go
index 3f48437a5..f92a14653 100644
--- a/swarm/api/api.go
+++ b/swarm/api/api.go
@@ -19,6 +19,7 @@ package api
import (
"fmt"
"io"
+ "net/http"
"regexp"
"strings"
"sync"
@@ -71,6 +72,7 @@ type ErrResolve error
// DNS Resolver
func (self *Api) Resolve(hostPort string, nameresolver bool) (storage.Key, error) {
+ glog.V(logger.Detail).Infof("Resolving : %v", hostPort)
if hashMatcher.MatchString(hostPort) || self.dns == nil {
glog.V(logger.Detail).Infof("host is a contentHash: '%v'", hostPort)
return storage.Key(common.Hex2Bytes(hostPort)), nil
@@ -86,8 +88,10 @@ func (self *Api) Resolve(hostPort string, nameresolver bool) (storage.Key, error
glog.V(logger.Detail).Infof("host lookup: %v -> %v", err)
return contentHash[:], err
}
-
-func parse(uri string) (hostPort, path string) {
+func Parse(uri string) (hostPort, path string) {
+ if uri == "" {
+ return
+ }
parts := slashes.Split(uri, 3)
var i int
if len(parts) == 0 {
@@ -111,7 +115,7 @@ func parse(uri string) (hostPort, path string) {
}
func (self *Api) parseAndResolve(uri string, nameresolver bool) (key storage.Key, hostPort, path string, err error) {
- hostPort, path = parse(uri)
+ hostPort, path = Parse(uri)
//resolving host and port
contentHash, err := self.Resolve(hostPort, nameresolver)
glog.V(logger.Debug).Infof("Resolved '%s' to contentHash: '%s', path: '%s'", uri, contentHash, path)
@@ -153,7 +157,9 @@ func (self *Api) Get(uri string, nameresolver bool) (reader storage.LazySectionR
}
glog.V(logger.Detail).Infof("getEntry(%s)", path)
+
entry, _ := trie.getEntry(path)
+
if entry != nil {
key = common.Hex2Bytes(entry.Hash)
status = entry.Status
@@ -161,6 +167,7 @@ func (self *Api) Get(uri string, nameresolver bool) (reader storage.LazySectionR
glog.V(logger.Detail).Infof("content lookup key: '%v' (%v)", key, mimeType)
reader = self.dpa.Retrieve(key)
} else {
+ status = http.StatusNotFound
err = fmt.Errorf("manifest entry for '%s' not found", path)
glog.V(logger.Warn).Infof("%v", err)
}
diff --git a/swarm/api/config.go b/swarm/api/config.go
index b4c6e3d4a..23a855500 100644
--- a/swarm/api/config.go
+++ b/swarm/api/config.go
@@ -85,10 +85,17 @@ func NewConfig(path string, contract common.Address, prvKey *ecdsa.PrivateKey, n
NetworkId: networkId,
}
data, err = ioutil.ReadFile(confpath)
+
+ // if not set in function param, then set default for swarm network, will be overwritten by config file if present
+ if networkId == 0 {
+ self.NetworkId = network.NetworkId
+ }
+
if err != nil {
if !os.IsNotExist(err) {
return
}
+
// file does not exist
// write out config file
err = self.Save()
@@ -97,6 +104,7 @@ func NewConfig(path string, contract common.Address, prvKey *ecdsa.PrivateKey, n
}
return
}
+
// file exists, deserialise
err = json.Unmarshal(data, self)
if err != nil {
@@ -109,6 +117,12 @@ func NewConfig(path string, contract common.Address, prvKey *ecdsa.PrivateKey, n
if keyhex != self.BzzKey {
return nil, fmt.Errorf("bzz key does not match the one in the config file %v != %v", keyhex, self.BzzKey)
}
+
+ // if set in function param, replace id set from config file
+ if networkId != 0 {
+ self.NetworkId = networkId
+ }
+
self.Swap.SetKey(prvKey)
if (self.EnsRoot == common.Address{}) {
diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go
index c8e79ab4e..afd867efc 100644
--- a/swarm/api/http/server.go
+++ b/swarm/api/http/server.go
@@ -32,6 +32,7 @@ import (
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/swarm/api"
+ "github.com/ethereum/go-ethereum/swarm/storage"
"github.com/rs/cors"
)
@@ -194,17 +195,34 @@ func handler(w http.ResponseWriter, r *http.Request, a *api.Api) {
}
case r.Method == "GET" || r.Method == "HEAD":
path = trailingSlashes.ReplaceAllString(path, "")
+ if path == "" {
+ http.Error(w, "Empty path not allowed", http.StatusBadRequest)
+ return
+ }
if raw {
- // resolving host
- key, err := a.Resolve(path, nameresolver)
- if err != nil {
- glog.V(logger.Error).Infof("%v", err)
- http.Error(w, err.Error(), http.StatusBadRequest)
- return
+ var reader storage.LazySectionReader
+ parsedurl, _ := api.Parse(path)
+
+ if parsedurl == path {
+ key, err := a.Resolve(parsedurl, nameresolver)
+ if err != nil {
+ glog.V(logger.Error).Infof("%v", err)
+ http.Error(w, err.Error(), http.StatusBadRequest)
+ return
+ }
+ reader = a.Retrieve(key)
+ } else {
+ var status int
+ readertmp, _, status, err := a.Get(path, nameresolver)
+ if err != nil {
+ http.Error(w, err.Error(), status)
+ return
+ }
+ reader = readertmp
}
// retrieving content
- reader := a.Retrieve(key)
+
quitC := make(chan bool)
size, err := reader.Size(quitC)
if err != nil {
diff --git a/swarm/api/http/server_test.go b/swarm/api/http/server_test.go
new file mode 100644
index 000000000..664313afa
--- /dev/null
+++ b/swarm/api/http/server_test.go
@@ -0,0 +1,117 @@
+package http
+
+import (
+ "bytes"
+ "io/ioutil"
+ "net/http"
+ "sync"
+ "testing"
+ "time"
+
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/swarm/api"
+ "github.com/ethereum/go-ethereum/swarm/storage"
+)
+
+func TestBzzrGetPath(t *testing.T) {
+
+ var err error
+
+ maxproxyattempts := 3
+
+ testmanifest := []string{
+ `{"entries":[{"path":"a/","hash":"674af7073604ebfc0282a4ab21e5ef1a3c22913866879ebc0816f8a89896b2ed","contentType":"application/bzz-manifest+json","status":0}]}`,
+ `{"entries":[{"path":"a","hash":"011b4d03dd8c01f1049143cf9c4c817e4b167f1d1b83e5c6f0f10d89ba1e7bce","contentType":"","status":0},{"path":"b/","hash":"0a87b1c3e4bf013686cdf107ec58590f2004610ee58cc2240f26939f691215f5","contentType":"application/bzz-manifest+json","status":0}]}`,
+ `{"entries":[{"path":"b","hash":"011b4d03dd8c01f1049143cf9c4c817e4b167f1d1b83e5c6f0f10d89ba1e7bce","contentType":"","status":0},{"path":"c","hash":"011b4d03dd8c01f1049143cf9c4c817e4b167f1d1b83e5c6f0f10d89ba1e7bce","contentType":"","status":0}]}`,
+ }
+
+ testrequests := make(map[string]int)
+ testrequests["/"] = 0
+ testrequests["/a"] = 1
+ testrequests["/a/b"] = 2
+ testrequests["/x"] = 0
+ testrequests[""] = 0
+
+ expectedfailrequests := []string{"", "/x"}
+
+ reader := [3]*bytes.Reader{}
+
+ key := [3]storage.Key{}
+
+ dir, _ := ioutil.TempDir("", "bzz-storage-test")
+
+ storeparams := &storage.StoreParams{
+ ChunkDbPath: dir,
+ DbCapacity: 5000000,
+ CacheCapacity: 5000,
+ Radius: 0,
+ }
+
+ localStore, err := storage.NewLocalStore(storage.MakeHashFunc("SHA3"), storeparams)
+ if err != nil {
+ t.Fatal(err)
+ }
+ chunker := storage.NewTreeChunker(storage.NewChunkerParams())
+ dpa := &storage.DPA{
+ Chunker: chunker,
+ ChunkStore: localStore,
+ }
+ dpa.Start()
+ defer dpa.Stop()
+
+ wg := &sync.WaitGroup{}
+
+ for i, mf := range testmanifest {
+ reader[i] = bytes.NewReader([]byte(mf))
+ key[i], err = dpa.Store(reader[i], int64(len(mf)), wg, nil)
+ if err != nil {
+ t.Fatal(err)
+ }
+ wg.Wait()
+ }
+
+ a := api.NewApi(dpa, nil)
+
+ /// \todo iterate port numbers up if fail
+ StartHttpServer(a, &Server{Addr: "127.0.0.1:8504", CorsString: ""})
+ // how to wait for ListenAndServe to have initialized? This is pretty cruuuude
+ // if we fix it we don't need maxproxyattempts anymore either
+ time.Sleep(1000 * time.Millisecond)
+ for i := 0; i <= maxproxyattempts; i++ {
+ _, err := http.Get("http://127.0.0.1:8504/bzzr:/" + common.ToHex(key[0])[2:] + "/a")
+ if i == maxproxyattempts {
+ t.Fatalf("Failed to connect to proxy after %v attempts: %v", i, err)
+ } else if err != nil {
+ time.Sleep(100 * time.Millisecond)
+ continue
+ }
+ break
+ }
+
+ for k, v := range testrequests {
+ var resp *http.Response
+ var respbody []byte
+
+ url := "http://127.0.0.1:8504/bzzr:/"
+ if k[:] != "" {
+ url += common.ToHex(key[0])[2:] + "/" + k[1:] + "?content_type=text/plain"
+ }
+ resp, err = http.Get(url)
+ defer resp.Body.Close()
+ respbody, err = ioutil.ReadAll(resp.Body)
+
+ if string(respbody) != testmanifest[v] {
+ isexpectedfailrequest := false
+
+ for _, r := range expectedfailrequests {
+ if k[:] == r {
+ isexpectedfailrequest = true
+ }
+ }
+ if isexpectedfailrequest == false {
+ t.Fatalf("Response body does not match, expected: %v, got %v", testmanifest[v], string(respbody))
+ }
+ }
+ }
+
+}
diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go
index d6dc24c48..36c0b0436 100644
--- a/swarm/api/manifest.go
+++ b/swarm/api/manifest.go
@@ -302,7 +302,8 @@ func (self *manifestTrie) findPrefixOf(path string, quitC chan bool) (entry *man
if (len(path) >= epl) && (path[:epl] == entry.Path) {
glog.V(logger.Detail).Infof("entry.ContentType = %v", entry.ContentType)
if entry.ContentType == manifestType {
- if self.loadSubTrie(entry, quitC) != nil {
+ err := self.loadSubTrie(entry, quitC)
+ if err != nil {
return nil, 0
}
entry, pos = entry.subtrie.findPrefixOf(path[epl:], quitC)
@@ -312,8 +313,6 @@ func (self *manifestTrie) findPrefixOf(path string, quitC chan bool) (entry *man
} else {
pos = epl
}
- } else {
- entry = nil
}
return
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 21:45:56 +0800