lee/backrest
1
0
Fork 0
mirror of https://github.com/garethgeorge/backrest.git synced 2025-12-12 08:45:38 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: handle Accept-Encoding properly for compressed webui srcs
Some checks failed
Build Snapshot Release / build (push) Has been cancelled
Details
Release Please / release-please (push) Has been cancelled
Details
Test / test-nix (push) Has been cancelled
Details
Test / test-win (push) Has been cancelled
Details
Update Restic / update-restic-version (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Gareth George
2025-05-05 00:35:33 -07:00
parent 9982761aa8
commit 7930b9c2d9
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
webui/webui.go
View File

@@ -2,10 +2,10 @@ package webui
import ( import (
"bytes" "bytes"
"compress/gzip"
"crypto/md5" "crypto/md5"
"encoding/hex" "encoding/hex"
"io" "io"
"io/fs"
"net/http" "net/http"
"strings" "strings"
"sync" "sync"
@@ -38,8 +38,20 @@ func Handler() http.Handler {
f, err := content.Open(contentPrefix + r.URL.Path + ".gz") f, err := content.Open(contentPrefix + r.URL.Path + ".gz")
if err == nil { if err == nil {
defer f.Close() defer f.Close()
// Check if gzip encoding is supported
var fr io.Reader = f
if !strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") {
gzr, err := gzip.NewReader(f)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
defer gzr.Close()
fr = gzr
} else {
w.Header().Set("Content-Encoding", "gzip") w.Header().Set("Content-Encoding", "gzip")
serveFile(f, w, r, r.URL.Path) }
serveFile(fr, w, r, r.URL.Path)
return return
} }
@@ -54,7 +66,7 @@ func Handler() http.Handler {
}) })
} }
func serveFile(f fs.File, w http.ResponseWriter, r *http.Request, path string) { func serveFile(f io.Reader, w http.ResponseWriter, r *http.Request, path string) {
data, err := io.ReadAll(f) data, err := io.ReadAll(f)
if err != nil { if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)