add cert and key config options

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
owncloud · Feb 26, 2020 · 604b24f · 604b24f
1 parent 91a9b26
commit 604b24f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/pkg/command/server.go b/pkg/command/server.go
@@ -144,6 +144,8 @@ func Server(cfg *config.Config) *cli.Command {
 					LDAPS: glauthcfg.LDAPS{
 						Enabled: cfg.Ldaps.Enabled,
 						Listen:  cfg.Ldaps.Address,
+						Cert:    cfg.Ldaps.Cert,
+						Key:     cfg.Ldaps.Key,
 					},
 					Backend: glauthcfg.Backend{
 						Datastore:   cfg.Backend.Datastore,

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -37,6 +37,13 @@ type Ldap struct {
 	Enabled bool
 }
 
+// Ldaps defined the available LDAPS configuration.
+type Ldaps struct {
+	Ldap
+	Cert string
+	Key  string
+}
+
 // Backend defined the available backend configuration.
 type Backend struct {
 	Datastore   string
@@ -57,7 +64,7 @@ type Config struct {
 	HTTP    HTTP
 	Tracing Tracing
 	Ldap    Ldap
-	Ldaps   Ldap
+	Ldaps   Ldaps
 	Backend Backend
 }
 

diff --git a/pkg/flagset/flagset.go b/pkg/flagset/flagset.go
@@ -145,6 +145,20 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"GLAUTH_LDAPS_ENABLED"},
 			Destination: &cfg.Ldaps.Enabled,
 		},
+		&cli.StringFlag{
+			Name:        "ldaps-cert",
+			Value:       "certs/server.crt",
+			Usage:       "path to ldaps certificate in PEM format",
+			EnvVars:     []string{"GLAUTH_LDAPS_CERT"},
+			Destination: &cfg.Ldaps.Cert,
+		},
+		&cli.StringFlag{
+			Name:        "ldaps-key",
+			Value:       "certs/server.key",
+			Usage:       "path to ldaps key in PEM format",
+			EnvVars:     []string{"GLAUTH_LDAPS_KEY"},
+			Destination: &cfg.Ldaps.Key,
+		},
 
 		&cli.StringFlag{
 			Name:        "backend-datastore",