Skip to content

Commit

Permalink
revert: disable readonly
Browse files Browse the repository at this point in the history
Signed-off-by: 117503445 <[email protected]>
  • Loading branch information
117503445 committed Feb 26, 2024
1 parent d15da9c commit c4b81b2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
7 changes: 4 additions & 3 deletions internal/server/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
//go:embed webdavjs.html
var WebdavjsHTML []byte

//go:embed webdavjs-ro.html
var WebdavjsHTML_RO []byte
// TODO go:embed webdavjs-ro.html
// var WebdavjsHTML_RO []byte

type HandlerConfig struct {
Prefix string
Expand Down Expand Up @@ -87,7 +87,8 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
if req.Method == "GET" && (req.URL.Path == h.prefix || strings.HasSuffix(req.URL.Path, "/")) {
var page *[]byte
if h.readOnly {
page = &WebdavjsHTML_RO
// page = &WebdavjsHTML_RO
page = &WebdavjsHTML
} else {
page = &WebdavjsHTML
}
Expand Down
2 changes: 1 addition & 1 deletion internal/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func NewWebDAVServer(addr string, handlerConfigs []*HandlerConfig, davListIsSecr
}

if method == "GET" && url == "/" {
if _, err := w.Write(WebdavjsHTML_RO); err != nil {
if _, err := w.Write(WebdavjsHTML); err != nil {
log.Error().Err(err).Msg("Failed to write index.html")
}
return
Expand Down
3 changes: 2 additions & 1 deletion tests/dav_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ func uiTest(assert *assert.Assertions, url string) {
body, err := io.ReadAll(resp.Body)
assert.Nil(err)

isHTML := bytes.Equal(body, server.WebdavjsHTML) || bytes.Equal(body, server.WebdavjsHTML_RO)
// isHTML := bytes.Equal(body, server.WebdavjsHTML) || bytes.Equal(body, server.WebdavjsHTML_RO)
isHTML := bytes.Equal(body, server.WebdavjsHTML)
assert.True(isHTML)
}

Expand Down

0 comments on commit c4b81b2

Please sign in to comment.