fix: environment variable parsing

This is more of a workaround than the correct solution. It only fixes top-level ENV variables parsing.

README.md

@@ -157,7 +157,7 @@ location / {
 
 Example configuration of a [`systemd`](https://en.wikipedia.org/wiki/Systemd) service:
 
-```toml
+```conf
 [Unit]
 Description=WebDAV
 After=network.target

lib/config.go

@@ -11,6 +11,10 @@ import (
 )
 
 const (
+	DefaultScope     = "/"
+	DefaultModify    = false
+	DefaultDebug     = false
+	DefaultNoSniff   = false
 	DefaultTLS       = false
 	DefaultAuth      = false
 	DefaultCert      = "cert.pem"
@@ -65,8 +69,15 @@ func ParseConfig(filename string, flags *pflag.FlagSet) (*Config, error) {
 	v.SetEnvPrefix("wd")
 	v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
 	v.AutomaticEnv()
+	// TODO: use new env struct bind feature when it's released in viper.
+	// This should make it redundant to set defaults for things that are
+	// empty or false.
 
 	// Defaults shared with flags
+	v.SetDefault("Scope", DefaultScope)
+	v.SetDefault("Modify", DefaultModify)
+	v.SetDefault("Debug", DefaultDebug)
+	v.SetDefault("NoSniff", DefaultNoSniff)
 	v.SetDefault("TLS", DefaultTLS)
 	v.SetDefault("Cert", DefaultCert)
 	v.SetDefault("Key", DefaultKey)

lib/config_test.go

@@ -5,6 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -133,7 +134,7 @@ username = "basic"
 password = "basic"
 scope = "/basic"
 modify = false
-rules = [ ]
+rules = []
 `
 
 		cfg := writeAndParseConfig(t, content, ".toml")
@@ -168,3 +169,51 @@ cors:
 	require.EqualValues(t, []string{"http://localhost:8080"}, cfg.CORS.AllowedHosts)
 	require.EqualValues(t, []string{"GET"}, cfg.CORS.AllowedMethods)
 }
+
+func TestConfigRules(t *testing.T) {
+	content := `
+auth: false
+scope: /
+modify: true
+rules:
+  - path: '^.+\.js$'
+    regex: true
+    modify: true
+  - path: /public/access/
+    regex: false
+    modify: true`
+
+	cfg := writeAndParseConfig(t, content, ".yaml")
+	require.NoError(t, cfg.Validate())
+
+	require.Len(t, cfg.Rules, 2)
+
+	require.Empty(t, cfg.Rules[0].Path)
+	require.NotNil(t, cfg.Rules[0].Regexp)
+	require.True(t, cfg.Rules[0].Regexp.MatchString("/my/path/to/file.js"))
+	require.False(t, cfg.Rules[0].Regexp.MatchString("/my/path/to/file.ts"))
+
+	require.NotEmpty(t, cfg.Rules[1].Path)
+	require.Nil(t, cfg.Rules[1].Regexp)
+}
+
+func TestConfigEnv(t *testing.T) {
+	require.NoError(t, os.Setenv("WD_PORT", "1234"))
+	require.NoError(t, os.Setenv("WD_DEBUG", "true"))
+	require.NoError(t, os.Setenv("WD_MODIFY", "true"))
+	require.NoError(t, os.Setenv("WD_SCOPE", "/test"))
+
+	cfg, err := ParseConfig("", nil)
+	require.NoError(t, err)
+
+	assert.Equal(t, 1234, cfg.Port)
+	assert.Equal(t, "/test", cfg.Scope)
+	assert.Equal(t, true, cfg.Debug)
+	assert.Equal(t, true, cfg.Modify)
+
+	// Reset
+	require.NoError(t, os.Setenv("WD_PORT", ""))
+	require.NoError(t, os.Setenv("WD_DEBUG", ""))
+	require.NoError(t, os.Setenv("WD_MODIFY", ""))
+	require.NoError(t, os.Setenv("WD_SCOPE", ""))
+}

lib/handler.go

@@ -106,7 +106,7 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if r.Method == "HEAD" {
-		w = newResponseWriterNoBody(w)
+		w = responseWriterNoBody{w}
 	}
 
 	// Excerpt from RFC4918, section 9.4:
@@ -130,3 +130,11 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// Runs the WebDAV.
 	user.ServeHTTP(w, r)
 }
+
+type responseWriterNoBody struct {
+	http.ResponseWriter
+}
+
+func (w responseWriterNoBody) Write(data []byte) (int, error) {
+	return 0, nil
+}

lib/permissions.go

@@ -31,6 +31,7 @@ func (r *Rule) Validate() error {
 		}
 		r.Regexp = rp
 		r.Path = ""
+		r.Regex = false
 	}
 
 	return nil
@@ -38,7 +39,7 @@ func (r *Rule) Validate() error {
 
 // Matches checks if [Rule] matches the given path.
 func (r *Rule) Matches(path string) bool {
-	if r.Regex {
+	if r.Regexp != nil {
 		return r.Regexp.MatchString(path)
 	}
 

lib/response_writer.go

@@ -1,27 +0,0 @@
-package lib
-
-import "net/http"
-
-var _ http.ResponseWriter = responseWriterNoBody{}
-
-// responseWriterNoBody is a wrapper used to suppress the body of the response
-// to a request. Mainly used for HEAD requests.
-type responseWriterNoBody struct {
-	http.ResponseWriter
-}
-
-// newResponseWriterNoBody creates a new responseWriterNoBody.
-func newResponseWriterNoBody(w http.ResponseWriter) *responseWriterNoBody {
-	return &responseWriterNoBody{w}
-}
-
-// Write suppress the body.
-func (w responseWriterNoBody) Write(data []byte) (int, error) {
-	return 0, nil
-}
-
-// WriteHeader writes the header to the http.ResponseWriter.
-func (w responseWriterNoBody) WriteHeader(statusCode int) {
-	w.Header().Del("Content-Length")
-	w.ResponseWriter.WriteHeader(statusCode)
-}