Merge feature branch with master

cmd/dex/config.go

@@ -22,14 +22,15 @@ import (
 
 // Config is the config format for the main application.
 type Config struct {
-	Issuer    string    `json:"issuer"`
-	Storage   Storage   `json:"storage"`
-	Web       Web       `json:"web"`
-	Telemetry Telemetry `json:"telemetry"`
-	OAuth2    OAuth2    `json:"oauth2"`
-	GRPC      GRPC      `json:"grpc"`
-	Expiry    Expiry    `json:"expiry"`
-	Logger    Logger    `json:"logger"`
+	Issuer               string               `json:"issuer"`
+	Storage              Storage              `json:"storage"`
+	Web                  Web                  `json:"web"`
+	Telemetry            Telemetry            `json:"telemetry"`
+	OAuth2               OAuth2               `json:"oauth2"`
+	GRPC                 GRPC                 `json:"grpc"`
+	Expiry               Expiry               `json:"expiry"`
+	InvalidLoginAttempts InvalidLoginAttempts `json:"invalidLoginAttempts`
+	Logger               Logger               `json:"logger"`
 
 	Frontend server.WebConfig `json:"frontend"`
 
@@ -350,3 +351,8 @@ type RefreshToken struct {
 	AbsoluteLifetime  string `json:"absoluteLifetime"`
 	ValidIfNotUsedFor string `json:"validIfNotUsedFor"`
 }
+type InvalidLoginAttempts struct {
+	EnableInvalidLoginAttempts     bool  `json:"enableInvalidLoginAttempts"`
+	BlockedDurationInMinutes       int32 `json:"blockedDurationInMinutes"`
+	MaxInvalidLoginAttemptsAllowed int32 `json:"maxInvalidLoginAttemptsAllowed"`
+}

cmd/dex/serve.go

@@ -299,6 +299,13 @@ func runServe(options serveOptions) error {
 		logger.Infof("config id tokens valid for: %v", idTokens)
 		serverConfig.IDTokensValidFor = idTokens
 	}
+
+	if c.InvalidLoginAttempts.EnableInvalidLoginAttempts {
+		serverConfig.EnableInvalidLoginAttempts = c.InvalidLoginAttempts.EnableInvalidLoginAttempts
+		serverConfig.BlockedDurationInMinutes = c.InvalidLoginAttempts.BlockedDurationInMinutes
+		serverConfig.MaxInvalidLoginAttemptsAllowed = c.InvalidLoginAttempts.MaxInvalidLoginAttemptsAllowed
+	}
+
 	if c.Expiry.AuthRequests != "" {
 		authRequests, err := time.ParseDuration(c.Expiry.AuthRequests)
 		if err != nil {