+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`
+ return page
+}
+
+//This returns the HTML for a 404 Not Found error
+func GetNotFoundErrorPage() string {
+ page := `
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+ There was a problem serving the requested page
+
+
+ {{.Timestamp}}
+ | + Hmmmmm....Swarm was not able to serve your request! + | + + +
| + Error message: + | +
| + {{.Msg}} + | +
| + Error code: + | +
| + {{.Code}} + | +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`
+ return page
+}
diff --git a/vendor/github.com/ethereum/go-ethereum/swarm/api/http/server.go b/vendor/github.com/ethereum/go-ethereum/swarm/api/http/server.go
index 0f6d93dc0..a637b8735 100644
--- a/vendor/github.com/ethereum/go-ethereum/swarm/api/http/server.go
+++ b/vendor/github.com/ethereum/go-ethereum/swarm/api/http/server.go
@@ -28,7 +28,6 @@ import (
"io/ioutil"
"mime"
"mime/multipart"
- "net"
"net/http"
"os"
"path"
@@ -56,7 +55,7 @@ type ServerConfig struct {
// https://github.com/atom/electron/blob/master/docs/api/protocol.md
// starts up http server
-func StartHttpServer(api *api.Api, config *ServerConfig) (*Server, error) {
+func StartHttpServer(api *api.Api, config *ServerConfig) {
var allowedOrigins []string
for _, domain := range strings.Split(config.CorsString, ",") {
allowedOrigins = append(allowedOrigins, strings.TrimSpace(domain))
@@ -67,44 +66,17 @@ func StartHttpServer(api *api.Api, config *ServerConfig) (*Server, error) {
MaxAge: 600,
AllowedHeaders: []string{"*"},
})
- var (
- listener net.Listener
- err error
- )
- if listener, err = net.Listen("tcp", config.Addr); err != nil {
- return nil, err
- }
+ hdlr := c.Handler(NewServer(api))
- server := NewServer(api, config, listener)
- handler := c.Handler(server)
- httpServer := http.Server{Handler: hdlr}
- go httpServer.Serve(listener)
- log.Info(fmt.Sprintf("Swarm HTTP proxy started on localhost:%s", config.Addr))
-
- return server, nil
+ go http.ListenAndServe(config.Addr, hdlr)
}
-// StopHttpServer stops http server
-func (s *Server) StopHttpServer() {
- if s.listener != nil {
- s.listener.Close()
- s.listener = nil
- log.Info(fmt.Sprintf("Swarm HTTP proxy stopped on http://localhost:%s", s.config.Addr))
- }
-}
-
-func NewServer(api *api.Api, config *ServerConfig, listener net.Listener) *Server {
- return &Server{
- api: api,
- config: config,
- listener: listener,
- }
+func NewServer(api *api.Api) *Server {
+ return &Server{api}
}
type Server struct {
- api *api.Api
- config *ServerConfig
- listener net.Listener // HTTP listener socket
+ api *api.Api
}
// Request wraps http.Request and also includes the parsed bzz URI
@@ -252,7 +224,7 @@ func (s *Server) handleMultipartUpload(req *Request, boundary string, mw *api.Ma
if err != nil {
return fmt.Errorf("error copying multipart content: %s", err)
}
- if _, err := tmp.Seek(0, os.SEEK_SET); err != nil {
+ if _, err := tmp.Seek(0, io.SeekStart); err != nil {
return fmt.Errorf("error copying multipart content: %s", err)
}
reader = tmp
@@ -360,7 +332,7 @@ func (s *Server) HandleGetRaw(w http.ResponseWriter, r *Request) {
return api.SkipManifest
})
if entry == nil {
- http.NotFound(w, &r.Request)
+ s.NotFound(w, r, fmt.Errorf("Manifest entry could not be loaded"))
return
}
key = storage.Key(common.Hex2Bytes(entry.Hash))
@@ -369,8 +341,7 @@ func (s *Server) HandleGetRaw(w http.ResponseWriter, r *Request) {
// check the root chunk exists by retrieving the file's size
reader := s.api.Retrieve(key)
if _, err := reader.Size(nil); err != nil {
- s.logDebug("key not found %s: %s", key, err)
- http.NotFound(w, &r.Request)
+ s.NotFound(w, r, fmt.Errorf("Root chunk not found %s: %s", key, err))
return
}
@@ -550,22 +521,32 @@ func (s *Server) HandleGetList(w http.ResponseWriter, r *Request) {
// HandleGetFile handles a GET request to bzz://
+
+
+
+
+
+ Resource Not Found
+
+
+ {{.Timestamp}}
+ | + Unfortunately, the resource you were trying to access could not be found on swarm. + | + + +
| + | +
| + {{.Msg}} + | +
| + Error code: + | +
| + {{.Code}} + | +