james/yarr
4
0
Fork 0
mirror of https://github.com/nkanaev/yarr.git synced 2025-05-24 21:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't serve templates

Browse Source
This commit is contained in:
Nazar Kanaev 2021-04-02 16:31:33 +01:00
parent d7ba203f28
commit 82fdb3be6c
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/routes.go
View File

@ -5,15 +5,17 @@ import (
"log" "log"
"math" "math"
"net/http" "net/http"
"path/filepath"
"reflect" "reflect"
"strings"
"github.com/nkanaev/yarr/src/assets" "github.com/nkanaev/yarr/src/assets"
"github.com/nkanaev/yarr/src/content/readability" "github.com/nkanaev/yarr/src/content/readability"
"github.com/nkanaev/yarr/src/content/sanitizer" "github.com/nkanaev/yarr/src/content/sanitizer"
"github.com/nkanaev/yarr/src/content/silo" "github.com/nkanaev/yarr/src/content/silo"
"github.com/nkanaev/yarr/src/server/router"
"github.com/nkanaev/yarr/src/server/auth" "github.com/nkanaev/yarr/src/server/auth"
"github.com/nkanaev/yarr/src/server/opml" "github.com/nkanaev/yarr/src/server/opml"
"github.com/nkanaev/yarr/src/server/router"
"github.com/nkanaev/yarr/src/storage" "github.com/nkanaev/yarr/src/storage"
"github.com/nkanaev/yarr/src/worker" "github.com/nkanaev/yarr/src/worker"
) )
@ -61,6 +63,12 @@ func (s *Server) handleIndex(c *router.Context) {
func (s *Server) handleStatic(c *router.Context) { func (s *Server) handleStatic(c *router.Context) {
// TODO: gzip? // TODO: gzip?
// don't serve templates
dir, name := filepath.Split(c.Vars["path"])
if dir == "" && strings.HasSuffix(name, ".html") {
c.Out.WriteHeader(http.StatusNotFound)
return
}
http.StripPrefix(s.BasePath+"/static/", http.FileServer(http.FS(assets.FS))).ServeHTTP(c.Out, c.Req) http.StripPrefix(s.BasePath+"/static/", http.FileServer(http.FS(assets.FS))).ServeHTTP(c.Out, c.Req)
} }

12
src/server/routes_test.go
View File

@ -31,3 +31,15 @@ func TestStaticWithBase(t *testing.T) {
t.FailNow() t.FailNow()
} }
} }
func TestStaticBanTemplates(t *testing.T) {
handler := NewServer(nil, "127.0.0.1:8000").handler()
url := "/static/login.html"
recorder := httptest.NewRecorder()
request := httptest.NewRequest("GET", url, nil)
handler.ServeHTTP(recorder, request)
if recorder.Result().StatusCode != 404 {
t.FailNow()
}
}