Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

don't cache the web index.html #4809

Merged
merged 4 commits into from
Oct 13, 2022
Merged

don't cache the web index.html #4809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbf1eeb
don't cache the web index.html
wkloucek Oct 13, 2022
ff4f160
disable cache for certain resources and respect try_files
fschade Oct 13, 2022
3d84e8f
add changelog
fschade Oct 13, 2022
2bc0f71
fix changelog
fschade Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions changelog/unreleased/fix-static-asset-caching.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bugfix: Disable cache for selected static web assets

We've disabled caching for some static web assets.
Files like the web index.html, oidc-callback.html or similar contain paths to timestamped resources and should not be cached.

https://github.com/owncloud/ocis/pull/4809
15 changes: 11 additions & 4 deletions services/web/pkg/assets/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,24 @@ func (f *fileServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
upath := path.Clean(path.Join("/", r.URL.Path))
r.URL.Path = upath

asset, err := f.root.Open(upath)
if err != nil {
disableCache := func() {
w.Header().Set("Cache-Control", "no-cache")
}
handleIndex := func() {
disableCache()
r.URL.Path = "/index.html"
f.ServeHTTP(w, r)
}
asset, err := f.root.Open(upath)
if err != nil {
handleIndex()
return
}
defer asset.Close()

s, _ := asset.Stat()
if s.IsDir() {
r.URL.Path = "/index.html"
f.ServeHTTP(w, r)
handleIndex()
return
}

Expand All @@ -43,6 +49,7 @@ func (f *fileServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {

switch s.Name() {
case "index.html", "oidc-callback.html", "oidc-silent-redirect.html":
disableCache()
_ = withBase(buf, asset, "/")
default:
_, _ = buf.ReadFrom(asset)
Expand Down
5 changes: 2 additions & 3 deletions services/web/pkg/service/v0/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package svc
import (
"encoding/json"
"fmt"
"io/ioutil"
"net/http"
"net/url"
"os"
Expand Down Expand Up @@ -90,7 +89,7 @@ func (p Web) getPayload() (payload []byte, err error) {
Msg("web config doesn't exist")
}

payload, err = ioutil.ReadFile(p.config.Web.Path)
payload, err = os.ReadFile(p.config.Web.Path)

if err != nil {
p.logger.Fatal().
Expand All @@ -102,7 +101,7 @@ func (p Web) getPayload() (payload []byte, err error) {
}

// Config implements the Service interface.
func (p Web) Config(w http.ResponseWriter, r *http.Request) {
func (p Web) Config(w http.ResponseWriter, _ *http.Request) {

payload, err := p.getPayload()
if err != nil {
Expand Down