diff --git a/core/modules/basic_auth/config/basic_auth.flood.yml b/core/modules/basic_auth/config/basic_auth.flood.yml deleted file mode 100644 index 9a16846..0000000 --- a/core/modules/basic_auth/config/basic_auth.flood.yml +++ /dev/null @@ -1,5 +0,0 @@ -uid_only: false -ip_limit: 50 -ip_window: 3600 -user_limit: 5 -user_window: 21600 diff --git a/core/modules/basic_auth/config/schema/basic_auth.schema.yml b/core/modules/basic_auth/config/schema/basic_auth.schema.yml deleted file mode 100644 index 40a515c..0000000 --- a/core/modules/basic_auth/config/schema/basic_auth.schema.yml +++ /dev/null @@ -1,21 +0,0 @@ -# Schema for the configuration files of the HTTP Basic Authentication module. - -basic_auth.flood: - type: mapping - label: 'Basic Auth flood settings' - mapping: - uid_only: - type: boolean - label: 'User ID only' - ip_limit: - type: integer - label: 'IP limit' - ip_window: - type: integer - label: 'IP limit duration' - user_limit: - type: integer - label: 'User limit' - user_window: - type: integer - label: 'User limit duration' diff --git a/core/modules/basic_auth/lib/Drupal/basic_auth/Authentication/Provider/BasicAuth.php b/core/modules/basic_auth/lib/Drupal/basic_auth/Authentication/Provider/BasicAuth.php index 4e50304..2ea0c5b 100644 --- a/core/modules/basic_auth/lib/Drupal/basic_auth/Authentication/Provider/BasicAuth.php +++ b/core/modules/basic_auth/lib/Drupal/basic_auth/Authentication/Provider/BasicAuth.php @@ -84,7 +84,7 @@ public function applies(Request $request) { * {@inheritdoc} */ public function authenticate(Request $request) { - $flood_config = $this->configFactory->get('basic_auth.flood'); + $flood_config = $this->configFactory->get('user.flood'); $username = $request->headers->get('PHP_AUTH_USER'); $password = $request->headers->get('PHP_AUTH_PW'); // Flood protection: this is very similar to the user login form code. diff --git a/core/modules/basic_auth/lib/Drupal/basic_auth/Tests/Authentication/BasicAuthTest.php b/core/modules/basic_auth/lib/Drupal/basic_auth/Tests/Authentication/BasicAuthTest.php index 21c9a8b..134ddb2 100644 --- a/core/modules/basic_auth/lib/Drupal/basic_auth/Tests/Authentication/BasicAuthTest.php +++ b/core/modules/basic_auth/lib/Drupal/basic_auth/Tests/Authentication/BasicAuthTest.php @@ -63,7 +63,7 @@ public function testBasicAuth() { * Test the global login flood control. */ function testGlobalLoginFloodControl() { - \Drupal::config('basic_auth.flood') + \Drupal::config('user.flood') ->set('ip_limit', 2) // Set a high per-user limit out so that it is not relevant in the test. ->set('user_limit', 4000) @@ -87,7 +87,7 @@ function testGlobalLoginFloodControl() { * Test the per-user login flood control. */ function testPerUserLoginFloodControl() { - \Drupal::config('basic_auth.flood') + \Drupal::config('user.flood') // Set a high global limit out so that it is not relevant in the test. ->set('ip_limit', 4000) ->set('user_limit', 2)