feat!: remove Auth option

This commit is contained in:
Henrique Dias
2024-07-29 10:11:02 +02:00
parent ed23ca1820
commit a255fb51e2
5 changed files with 5 additions and 23 deletions
+3 -9
View File
@@ -9,6 +9,7 @@ import (
"github.com/go-viper/mapstructure/v2"
"github.com/spf13/pflag"
"github.com/spf13/viper"
"go.uber.org/zap"
)
const (
@@ -17,7 +18,6 @@ const (
DefaultDebug = false
DefaultNoSniff = false
DefaultTLS = false
DefaultAuth = false
DefaultCert = "cert.pem"
DefaultKey = "key.pem"
DefaultAddress = "0.0.0.0"
@@ -37,7 +37,6 @@ type Config struct {
Prefix string
NoSniff bool
LogFormat string `mapstructure:"log_format"`
Auth bool
CORS CORS
Users []User
}
@@ -84,7 +83,6 @@ func ParseConfig(filename string, flags *pflag.FlagSet) (*Config, error) {
v.SetDefault("Key", DefaultKey)
v.SetDefault("Address", DefaultAddress)
v.SetDefault("Port", DefaultPort)
v.SetDefault("Auth", DefaultAuth)
v.SetDefault("Prefix", DefaultPrefix)
v.SetDefault("Log_Format", DefaultLogFormat)
@@ -137,12 +135,8 @@ func ParseConfig(filename string, flags *pflag.FlagSet) (*Config, error) {
func (c *Config) Validate() error {
var err error
if c.Auth && len(c.Users) == 0 {
return errors.New("invalid config: auth cannot be enabled without users")
}
if !c.Auth && len(c.Users) != 0 {
return errors.New("invalid config: auth cannot be disabled with users defined")
if len(c.Users) == 0 {
zap.L().Warn("unprotected config: no users have been set, so no authentication will be used")
}
c.Scope, err = filepath.Abs(c.Scope)
+1 -5
View File
@@ -28,7 +28,6 @@ func TestConfigDefaults(t *testing.T) {
cfg := writeAndParseConfig(t, "", ".yml")
require.NoError(t, cfg.Validate())
require.EqualValues(t, DefaultAuth, cfg.Auth)
require.EqualValues(t, DefaultTLS, cfg.TLS)
require.EqualValues(t, DefaultAddress, cfg.Address)
require.EqualValues(t, DefaultPort, cfg.Port)
@@ -65,7 +64,6 @@ func TestConfigCascade(t *testing.T) {
t.Run("YAML", func(t *testing.T) {
content := `
auth: true
scope: /
modify: true
rules:
@@ -89,7 +87,6 @@ users:
t.Run("JSON", func(t *testing.T) {
content := `{
"auth": true,
"scope": "/",
"modify": true,
"rules": [
@@ -120,7 +117,7 @@ users:
})
t.Run("`TOML", func(t *testing.T) {
content := `auth = true
content := `
scope = "/"
modify = true
@@ -175,7 +172,6 @@ cors:
func TestConfigRules(t *testing.T) {
content := `
auth: false
scope: /
modify: true
rules:
-3
View File
@@ -90,7 +90,6 @@ func TestServerAuthentication(t *testing.T) {
})
srv := makeTestServer(t, fmt.Sprintf(`
auth: true
scope: %s
modify: true
@@ -153,7 +152,6 @@ func TestServerRules(t *testing.T) {
})
srv := makeTestServer(t, fmt.Sprintf(`
auth: true
scope: %s
modify: true
@@ -196,7 +194,6 @@ func TestServerPermissions(t *testing.T) {
})
srv := makeTestServer(t, fmt.Sprintf(`
auth: true
scope: %s
modify: true