1f349/bluebell
4
0
Fork 0
mirror of https://github.com/1f349/site-hosting.git synced 2025-04-12 22:56:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix using no-cache query parameter with url paths

Browse Source
This commit is contained in:
Melon 2025-03-30 00:07:13 +00:00
parent ccfac033df
commit bd87580001
Signed by: melon
GPG Key ID: 6C9D970C50D26A25
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
serve/serve.go
View File

@ -43,7 +43,7 @@ const (
BetaSwitchResetQuery = "__bluebell-reset-beta"
BetaExpiry = 24 * time.Hour
NoCacheQuery = "/?__bluebell-no-cache="
NoCacheQuery = "__bluebell-no-cache"
)
type serveQueries interface {
@ -60,11 +60,17 @@ type Handler struct {
}
func cacheBuster(rw http.ResponseWriter, req *http.Request) {
q := req.URL.Query()
q.Del(BetaSwitchQuery)
q.Del(BetaSwitchResetQuery)
q.Set(NoCacheQuery, strconv.FormatInt(time.Now().Unix(), 16))
req.URL.RawQuery = q.Encode()
header := rw.Header()
header.Set("Cache-Control", "no-cache, no-store, must-revalidate")
header.Set("Pragma", "no-cache")
header.Set("Expires", "0")
http.Redirect(rw, req, NoCacheQuery+strconv.FormatInt(time.Now().Unix(), 16), http.StatusFound)
http.Redirect(rw, req, req.URL.RequestURI(), http.StatusFound)
}
func (h *Handler) ServeHTTP(rw http.ResponseWriter, req *http.Request) {

14
serve/serve_test.go
View File

@ -46,7 +46,7 @@ func TestHandler_ServeHTTP(t *testing.T) {
})
for _, testPath := range []string{"/", "/posts/test", "/this-is-definitely-a-page-that-I-really-need-to-view-right-now"} {
t.Run("switch to "+branch+" branch", func(t *testing.T) {
t.Run("switch to "+branch+" branch - "+testPath, func(t *testing.T) {
h := New(afero.NewMemMapFs(), &fakeServeDB{})
req := httptest.NewRequest(http.MethodGet, httpPrefix+"example.com"+testPath+"?__bluebell-switch-beta="+branch, nil)
@ -58,9 +58,19 @@ func TestHandler_ServeHTTP(t *testing.T) {
assert.NotNil(t, res.Body)
all, err := io.ReadAll(res.Body)
assert.NoError(t, err)
assert.Contains(t, string(all), "<a href=\"/?__bluebell-no-cache=")
assert.Contains(t, string(all), "<a href=\""+testPath+"?__bluebell-no-cache=")
assert.Contains(t, string(all), "\">Found</a>.\n\n")
location, err := res.Location()
if err != nil {
return
}
assert.Equal(t, testPath, location.Path)
q := location.Query()
assert.True(t, q.Has("__bluebell-no-cache"))
assert.False(t, q.Has("__bluebell-switch-beta"))
assert.False(t, q.Has("__bluebell-reset-beta"))
cookies := res.Cookies()
assert.Len(t, cookies, 1)
assert.Equal(t, cookies[0].Name, "__bluebell-site-beta")