We don't support IE / Edge at this time @@ -61,11 +64,9 @@ func IndexHandler(_path string) func(*App, http.ResponseWriter, *http.Request) { Please use either Chromium, Firefox or Chrome
`))) - return - } - srcPath := GetAbsolutePath(_path) - ServeFile(res, req, srcPath) + return } + ServeFile(res, req, "/index.html") } func NotFoundHandler(ctx *App, res http.ResponseWriter, req *http.Request) { @@ -130,6 +131,14 @@ func AboutHandler(ctx *App, res http.ResponseWriter, req *http.Request) { table a { color: inherit; text-decoration: none; } `)) + hashFileContent := func(path string, n int) string { + f, err := os.OpenFile(path, os.O_RDONLY, os.ModePerm) + if err != nil { + return "" + } + defer f.Close() + return HashStream(f, n) + } t.Execute(res, struct { Version string CommitHash string @@ -219,75 +228,43 @@ func CustomCssHandler(ctx *App, res http.ResponseWriter, req *http.Request) { } func ServeFile(res http.ResponseWriter, req *http.Request, filePath string) { - zFilePath := filePath + ".gz" - bFilePath := filePath + ".br" - - etagNormal := hashFile(filePath, 10) - etagGzip := hashFile(zFilePath, 10) - etagBr := hashFile(bFilePath, 10) - - if req.Header.Get("If-None-Match") != "" { - browserTag := req.Header.Get("If-None-Match") - if browserTag == etagNormal { - res.WriteHeader(http.StatusNotModified) - return - } else if browserTag == etagBr { - res.WriteHeader(http.StatusNotModified) - return - } else if browserTag == etagGzip { - res.WriteHeader(http.StatusNotModified) - return - } + staticConfig := []struct { + ContentType string + FileExt string + }{ + {"br", ".br"}, + {"gzip", ".gz"}, + {"", ""}, } + head := res.Header() acceptEncoding := req.Header.Get("Accept-Encoding") - if strings.Contains(acceptEncoding, "br") { - if file, err := os.OpenFile(bFilePath, os.O_RDONLY, os.ModePerm); err == nil { - head.Set("Content-Encoding", "br") - head.Set("Etag", etagBr) - io.Copy(res, file) - file.Close() - return + for _, cfg := range staticConfig { + if strings.Contains(acceptEncoding, cfg.ContentType) == false { + continue } - } else if strings.Contains(acceptEncoding, "gzip") { - if file, err := os.OpenFile(zFilePath, os.O_RDONLY, os.ModePerm); err == nil { - head.Set("Content-Encoding", "gzip") - head.Set("Etag", etagGzip) - io.Copy(res, file) - file.Close() - return + curPath := filePath + cfg.FileExt + file, err := WWWEmbed.Open("static/www" + curPath) + if err != nil { + continue } - } - - file, err := os.OpenFile(filePath, os.O_RDONLY, os.ModePerm) - if err != nil { - http.NotFound(res, req) + if stat, err := file.Stat(); err == nil { + etag := QuickHash(fmt.Sprintf( + "%s %d %d %s", + curPath, stat.Size(), stat.Mode(), stat.ModTime()), 10, + ) + if etag == req.Header.Get("If-None-Match") { + res.WriteHeader(http.StatusNotModified) + return + } + head.Set("Etag", etag) + } + if cfg.ContentType != "" { + head.Set("Content-Encoding", cfg.ContentType) + } + io.Copy(res, file) + file.Close() return } - head.Set("Etag", etagNormal) - io.Copy(res, file) - file.Close() -} - -func hashFile(path string, n int) string { - f, err := os.OpenFile(path, os.O_RDONLY, os.ModePerm) - if err != nil { - return "" - } - defer f.Close() - - stat, err := f.Stat() - if err != nil { - return "" - } - return QuickHash(fmt.Sprintf("%s %d %d %s", path, stat.Size(), stat.Mode(), stat.ModTime()), n) -} - -func hashFileContent(path string, n int) string { - f, err := os.OpenFile(path, os.O_RDONLY, os.ModePerm) - if err != nil { - return "" - } - defer f.Close() - return HashStream(f, n) + http.NotFound(res, req) } diff --git a/server/main.go b/server/main.go index 8736c658..3fb381b8 100644 --- a/server/main.go +++ b/server/main.go @@ -85,7 +85,7 @@ func Init(a App) { // Webdav server / Shared Link middlewares = []Middleware{IndexHeaders, SecureHeaders} - r.HandleFunc("/s/{share}", NewMiddlewareChain(IndexHandler(FILE_INDEX), middlewares, a)).Methods("GET") + r.HandleFunc("/s/{share}", NewMiddlewareChain(IndexHandler, middlewares, a)).Methods("GET") middlewares = []Middleware{WebdavBlacklist, SessionStart} r.PathPrefix("/s/{share}").Handler(NewMiddlewareChain(WebdavHandler, middlewares, a)) middlewares = []Middleware{ApiHeaders, SecureHeaders, RedirectSharedLoginIfNeeded, SessionStart, LoggedInOnly} @@ -97,9 +97,9 @@ func Init(a App) { r.HandleFunc("/api/backend", NewMiddlewareChain(AdminBackend, middlewares, a)).Methods("GET") r.HandleFunc("/api/middlewares/authentication", NewMiddlewareChain(AdminAuthenticationMiddleware, middlewares, a)).Methods("GET") middlewares = []Middleware{StaticHeaders, SecureHeaders} - r.PathPrefix("/assets").Handler(http.HandlerFunc(NewMiddlewareChain(StaticHandler(FILE_ASSETS), middlewares, a))).Methods("GET") - r.HandleFunc("/favicon.ico", NewMiddlewareChain(StaticHandler(FILE_ASSETS+"/assets/logo/"), middlewares, a)).Methods("GET") - r.HandleFunc("/sw_cache.js", NewMiddlewareChain(StaticHandler(FILE_ASSETS+"/assets/worker/"), middlewares, a)).Methods("GET") + r.PathPrefix("/assets").Handler(http.HandlerFunc(NewMiddlewareChain(StaticHandler("/"), middlewares, a))).Methods("GET") + r.HandleFunc("/favicon.ico", NewMiddlewareChain(StaticHandler("/assets/logo/"), middlewares, a)).Methods("GET") + r.HandleFunc("/sw_cache.js", NewMiddlewareChain(StaticHandler("/assets/worker/"), middlewares, a)).Methods("GET") // Other endpoints middlewares = []Middleware{ApiHeaders} @@ -118,8 +118,8 @@ func Init(a App) { } initPluginsRoutes(r, &a) - r.PathPrefix("/admin").Handler(http.HandlerFunc(NewMiddlewareChain(IndexHandler(FILE_INDEX), middlewares, a))).Methods("GET") - r.PathPrefix("/").Handler(http.HandlerFunc(NewMiddlewareChain(IndexHandler(FILE_INDEX), middlewares, a))).Methods("GET", "POST") + r.PathPrefix("/admin").Handler(http.HandlerFunc(NewMiddlewareChain(IndexHandler, middlewares, a))).Methods("GET") + r.PathPrefix("/").Handler(http.HandlerFunc(NewMiddlewareChain(IndexHandler, middlewares, a))).Methods("GET", "POST") // Routes are served via plugins to avoid getting stuck with plain HTTP. The idea is to // support many more protocols in the future: HTTPS, HTTP2, TOR or whatever that sounds diff --git a/webpack.config.js b/webpack.config.js index c56d21d6..3b75318b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -11,7 +11,7 @@ const config = { app: path.join(__dirname, "client", "index.js"), }, output: { - path: path.join(__dirname, "dist", "data", "public"), + path: path.join(__dirname, "server", "ctrl", "static", "www"), publicPath: "/", filename: "assets/js/[name]_[chunkhash].js", chunkFilename: "assets/js/chunk_[name]_[id]_[chunkhash].js",