refactor glauth

Signed-off-by: Christian Richter <crichter@owncloud.com>

extensions/glauth/pkg/config/config.go

@@ -0,0 +1,52 @@
+package config
+
+import (
+	"context"
+
+	"github.com/owncloud/ocis/ocis-pkg/shared"
+)
+
+// Config combines all available configuration parts.
+type Config struct {
+	*shared.Commons `yaml:"-"`
+
+	Service Service `yaml:"-"`
+
+	Tracing *Tracing `yaml:"tracing"`
+	Log     *Log     `yaml:"log"`
+	Debug   Debug    `yaml:"debug"`
+
+	Ldap  Ldap  `yaml:"ldap"`
+	Ldaps Ldaps `yaml:"ldaps"`
+
+	Backend  Backend         `yaml:"backend"`
+	Fallback FallbackBackend `yaml:"fallback"`
+
+	RoleBundleUUID string `yaml:"role_bundle_uuid" env:"GLAUTH_ROLE_BUNDLE_ID"`
+
+	Context context.Context `yaml:"-"`
+}
+
+// Backend defined the available backend configuration.
+type Backend struct {
+	Datastore   string   `yaml:"datastore"`
+	BaseDN      string   `yaml:"base_dn"`
+	Insecure    bool     `yaml:"insecure"`
+	NameFormat  string   `yaml:"name_format"`
+	GroupFormat string   `yaml:"group_format"`
+	Servers     []string `yaml:"servers"`
+	SSHKeyAttr  string   `yaml:"ssh_key_attr"`
+	UseGraphAPI bool     `yaml:"use_graph_api"`
+}
+
+// FallbackBackend defined the available fallback backend configuration.
+type FallbackBackend struct {
+	Datastore   string   `yaml:"datastore"`
+	BaseDN      string   `yaml:"base_dn"`
+	Insecure    bool     `yaml:"insecure"`
+	NameFormat  string   `yaml:"name_format"`
+	GroupFormat string   `yaml:"group_format"`
+	Servers     []string `yaml:"servers"`
+	SSHKeyAttr  string   `yaml:"ssh_key_attr"`
+	UseGraphAPI bool     `yaml:"use_graph_api"`
+}

extensions/glauth/pkg/config/debug.go

@@ -0,0 +1,9 @@
+package config
+
+// Debug defines the available debug configuration.
+type Debug struct {
+	Addr   string `yaml:"addr" env:"GLAUTH_DEBUG_ADDR"`
+	Token  string `yaml:"token" env:"GLAUTH_DEBUG_TOKEN"`
+	Pprof  bool   `yaml:"pprof" env:"GLAUTH_DEBUG_PPROF"`
+	Zpages bool   `yaml:"zpages" env:"GLAUTH_DEBUG_ZPAGES"`
+}

extensions/glauth/pkg/config/defaults/defaultconfig.go

@@ -0,0 +1,90 @@
+package defaults
+
+import (
+	"path"
+
+	"github.com/owncloud/ocis/extensions/glauth/pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
+)
+
+func FullDefaultConfig() *config.Config {
+	cfg := DefaultConfig()
+
+	EnsureDefaults(cfg)
+	Sanitize(cfg)
+
+	return cfg
+}
+
+func DefaultConfig() *config.Config {
+	return &config.Config{
+		Debug: config.Debug{
+			Addr: "127.0.0.1:9129",
+		},
+		Service: config.Service{
+			Name: "glauth",
+		},
+		Ldap: config.Ldap{
+			Enabled:   true,
+			Addr:      "127.0.0.1:9125",
+			Namespace: "com.owncloud.ldap",
+		},
+		Ldaps: config.Ldaps{
+			Enabled:   true,
+			Addr:      "127.0.0.1:9126",
+			Namespace: "com.owncloud.ldaps",
+			Cert:      path.Join(defaults.BaseDataPath(), "ldap", "ldap.crt"),
+			Key:       path.Join(defaults.BaseDataPath(), "ldap", "ldap.key"),
+		},
+		Backend: config.Backend{
+			Datastore:   "accounts",
+			BaseDN:      "dc=ocis,dc=test",
+			Insecure:    false,
+			NameFormat:  "cn",
+			GroupFormat: "ou",
+			Servers:     nil,
+			SSHKeyAttr:  "sshPublicKey",
+			UseGraphAPI: true,
+		},
+		Fallback: config.FallbackBackend{
+			Datastore:   "",
+			BaseDN:      "dc=ocis,dc=test",
+			Insecure:    false,
+			NameFormat:  "cn",
+			GroupFormat: "ou",
+			Servers:     nil,
+			SSHKeyAttr:  "sshPublicKey",
+			UseGraphAPI: true,
+		},
+		RoleBundleUUID: "71881883-1768-46bd-a24d-a356a2afdf7f", // BundleUUIDRoleAdmin
+	}
+}
+
+func EnsureDefaults(cfg *config.Config) {
+	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
+	if cfg.Log == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
+		cfg.Log = &config.Log{
+			Level:  cfg.Commons.Log.Level,
+			Pretty: cfg.Commons.Log.Pretty,
+			Color:  cfg.Commons.Log.Color,
+			File:   cfg.Commons.Log.File,
+		}
+	} else if cfg.Log == nil {
+		cfg.Log = &config.Log{}
+	}
+	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
+	if cfg.Tracing == nil && cfg.Commons != nil && cfg.Commons.Tracing != nil {
+		cfg.Tracing = &config.Tracing{
+			Enabled:   cfg.Commons.Tracing.Enabled,
+			Type:      cfg.Commons.Tracing.Type,
+			Endpoint:  cfg.Commons.Tracing.Endpoint,
+			Collector: cfg.Commons.Tracing.Collector,
+		}
+	} else if cfg.Tracing == nil {
+		cfg.Tracing = &config.Tracing{}
+	}
+}
+
+func Sanitize(cfg *config.Config) {
+	// nothing to santizie here atm
+}

extensions/glauth/pkg/config/ldap.go

@@ -0,0 +1,8 @@
+package config
+
+// Ldap defines the available LDAP configuration.
+type Ldap struct {
+	Enabled   bool   `yaml:"enabled" env:"GLAUTH_LDAP_ENABLED"`
+	Addr      string `yaml:"addr" env:"GLAUTH_LDAP_ADDR"`
+	Namespace string `yaml:"-"`
+}

extensions/glauth/pkg/config/ldaps.go

@@ -0,0 +1,10 @@
+package config
+
+// Ldaps defined the available LDAPS configuration.
+type Ldaps struct {
+	Enabled   bool   `yaml:"enabled" env:"GLAUTH_LDAPS_ENABLED"`
+	Addr      string `yaml:"addr" env:"GLAUTH_LDAPS_ADDR"`
+	Namespace string `yaml:"-"`
+	Cert      string `yaml:"cert" env:"GLAUTH_LDAPS_CERT"`
+	Key       string `yaml:"key" env:"GLAUTH_LDAPS_KEY"`
+}

extensions/glauth/pkg/config/log.go

@@ -0,0 +1,9 @@
+package config
+
+// Log defines the available log configuration.
+type Log struct {
+	Level  string `mapstructure:"level" env:"OCIS_LOG_LEVEL;GLAUTH_LOG_LEVEL"`
+	Pretty bool   `mapstructure:"pretty" env:"OCIS_LOG_PRETTY;GLAUTH_LOG_PRETTY"`
+	Color  bool   `mapstructure:"color" env:"OCIS_LOG_COLOR;GLAUTH_LOG_COLOR"`
+	File   string `mapstructure:"file" env:"OCIS_LOG_FILE;GLAUTH_LOG_FILE"`
+}

extensions/glauth/pkg/config/parser/parse.go

@@ -0,0 +1,32 @@
+package parser
+
+import (
+	"errors"
+
+	"github.com/owncloud/ocis/extensions/glauth/pkg/config"
+	"github.com/owncloud/ocis/extensions/glauth/pkg/config/defaults"
+	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
+
+	"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
+)
+
+// ParseConfig loads accounts configuration from known paths.
+func ParseConfig(cfg *config.Config) error {
+	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	if err != nil {
+		return err
+	}
+
+	defaults.EnsureDefaults(cfg)
+	// load all env variables relevant to the config in the current context.
+	if err := envdecode.Decode(cfg); err != nil {
+		// no environment variable set for this config is an expected "error"
+		if !errors.Is(err, envdecode.ErrNoTargetFieldsAreSet) {
+			return err
+		}
+	}
+
+	// sanitize config
+	defaults.Sanitize(cfg)
+	return nil
+}

extensions/glauth/pkg/config/service.go

@@ -0,0 +1,6 @@
+package config
+
+// Service defines the available service configuration.
+type Service struct {
+	Name string `yaml:"-"`
+}

extensions/glauth/pkg/config/tracing.go

@@ -0,0 +1,9 @@
+package config
+
+// Tracing defines the available tracing configuration.
+type Tracing struct {
+	Enabled   bool   `yaml:"enabled" env:"OCIS_TRACING_ENABLED;GLAUTH_TRACING_ENABLED"`
+	Type      string `yaml:"type" env:"OCIS_TRACING_TYPE;GLAUTH_TRACING_TYPE"`
+	Endpoint  string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;GLAUTH_TRACING_ENDPOINT"`
+	Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;GLAUTH_TRACING_COLLECTOR"`
+}