diff --git a/patches/d10-3.json b/patches/d10-3.json index 780bba6f33a53f5b187a912c922f46b33db2b5aa..33189909abb1cb3df8bec4a2385607ebb6cdc46a 100644 --- a/patches/d10-3.json +++ b/patches/d10-3.json @@ -173,6 +173,9 @@ "drupal/role_theme_switcher": { "#3414975 Missing keys": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3414975.diff" }, + "drupal/security_review": { + "#3488084 NamePassword": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3488084.diff" + }, "drupal/select2": { "#3211796 Z-Index in modal dialog": "https://www.drupal.org/files/issues/2023-04-18/select2-modal-zindex-mult-form-elem-fix-3211796-17.patch" }, diff --git a/patches/d10/3487530.diff b/patches/d10/3487530.diff index 282cf21056e3fe0d499bc72432efa050b24a9178..227fff6a04826ae4a029a5fbee09a65419b2d727 100644 --- a/patches/d10/3487530.diff +++ b/patches/d10/3487530.diff @@ -1,17 +1,21 @@ diff --git a/src/WebformEntityListBuilder.php b/src/WebformEntityListBuilder.php -index 827110be1d819f7e7090c415498d0a747ada0765..1b3cc372d5ee8025ab983faf98cd6695fb505f2a 100644 +index 827110be1d819f7e7090c415498d0a747ada0765..c27958aa5b7e3b3dfa31f4f4a23722fb4942ba56 100644 --- a/src/WebformEntityListBuilder.php +++ b/src/WebformEntityListBuilder.php -@@ -173,7 +173,7 @@ class WebformEntityListBuilder extends ConfigEntityListBuilder { +@@ -173,8 +173,11 @@ class WebformEntityListBuilder extends ConfigEntityListBuilder { $build['table']['#attributes']['class'][] = 'webform-forms'; // Bulk operations. - if ($this->bulkOperations && $this->currentUser->hasPermission('administer webform')) { + if ($this->bulkOperations && ($this->currentUser->hasPermission('administer webform') || $this->currentUser->hasPermission('administer webform overview'))) { $build['table'] = \Drupal::formBuilder()->getForm('\Drupal\webform\Form\WebformEntityBulkForm', $build['table']); ++ if (!$this->currentUser->hasPermission('delete any webform')) { ++ unset($build['table']['operations']['action']['#options']['webform_delete_action']); ++ } } -@@ -194,7 +194,7 @@ class WebformEntityListBuilder extends ConfigEntityListBuilder { + // Attachments. +@@ -194,7 +197,7 @@ class WebformEntityListBuilder extends ConfigEntityListBuilder { */ protected function buildFilterForm() { // Add the filter by key(word) and/or state. @@ -20,7 +24,7 @@ index 827110be1d819f7e7090c415498d0a747ada0765..1b3cc372d5ee8025ab983faf98cd6695 $state_options = [ (string) $this->t('Active') => [ '' => $this->t('All [@total]', ['@total' => $this->getTotal(NULL, NULL)]), -@@ -231,7 +231,7 @@ class WebformEntityListBuilder extends ConfigEntityListBuilder { +@@ -231,7 +234,7 @@ class WebformEntityListBuilder extends ConfigEntityListBuilder { */ protected function buildInfo() { // Display info. @@ -29,7 +33,7 @@ index 827110be1d819f7e7090c415498d0a747ada0765..1b3cc372d5ee8025ab983faf98cd6695 return [ '#markup' => $this->formatPlural($total, '@count webform', '@count webforms'), '#prefix' => '<div>', -@@ -672,12 +672,12 @@ class WebformEntityListBuilder extends ConfigEntityListBuilder { +@@ -672,12 +675,12 @@ class WebformEntityListBuilder extends ConfigEntityListBuilder { * Is the current user a webform administrator. * * @return bool diff --git a/patches/d10/3488084.diff b/patches/d10/3488084.diff new file mode 100644 index 0000000000000000000000000000000000000000..0e201dada3c8586f9dd46744b83d61af60a23de0 --- /dev/null +++ b/patches/d10/3488084.diff @@ -0,0 +1,13 @@ +diff --git a/src/Plugin/SecurityCheck/NamePasswords.php b/src/Plugin/SecurityCheck/NamePasswords.php +index 439017ed957d8f1e53210210b9bcbc8fcfd32bd8..7a992799b4c270253e9753beaff3810b3b4a3fa0 100644 +--- a/src/Plugin/SecurityCheck/NamePasswords.php ++++ b/src/Plugin/SecurityCheck/NamePasswords.php +@@ -96,7 +96,7 @@ class NamePasswords extends SecurityCheckBase { + $users = User::loadMultiple($ids); + $findings = []; + foreach ($users as $user) { +- if ($this->userAuth->authenticateAccount($this->userAuth->lookupAccount($user->getDisplayName()), $user->getDisplayName())) { ++ if (($account = $this->userAuth->lookupAccount($user->getAccountName())) && $this->userAuth->authenticateAccount($account, $user->getAccountName())) { + $findings[] = $user->getDisplayName(); + } + diff --git a/patches/d11.json b/patches/d11.json index a5b340c2b193a5b074d97d4ae318a72f68465a62..45fc82022436892580d1d515b44ff0b0bee818ac 100644 --- a/patches/d11.json +++ b/patches/d11.json @@ -169,6 +169,9 @@ "drupal/role_theme_switcher": { "#3414975 Missing keys": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3414975.diff" }, + "drupal/security_review": { + "#3488084 NamePassword": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3488084.diff" + }, "drupal/select2": { "#3211796 Z-Index in modal dialog": "https://www.drupal.org/files/issues/2023-04-18/select2-modal-zindex-mult-form-elem-fix-3211796-17.patch" },