diff --git a/composer.json b/composer.json
index e23a58291fa25dae13e72034c41089f2b3e394b7..d4d04a003069a298a1438770906278b8bec5b1ec 100644
--- a/composer.json
+++ b/composer.json
@@ -118,14 +118,14 @@
"drupal/entity_embed": "1.2",
"drupal/entity_reference_revisions": "1.9",
"drupal/exif_orientation": "^1.1",
- "drupal/externalauth": "1.3",
- "drupal/field_group": "3.1",
+ "drupal/externalauth": "1.4",
+ "drupal/field_group": "3.2",
"drupal/field_permissions": "1.1",
"drupal/file_browser": "1.3",
"drupal/focal_point": "1.5",
"drupal/google_analytics": "^4.0",
"drupal/google_tag": "1.4",
- "drupal/honeypot": "2.0.1",
+ "drupal/honeypot": "2.1.0",
"drupal/inline_entity_form": "1.0-rc9",
"drupal/libraries": "3.0-beta1",
"drupal/link_attributes": "1.11",
@@ -285,7 +285,7 @@
"3060223": "https://www.drupal.org/files/issues/2019-10-17/%20entity_clone-corrupted-paragraph-cloning-3060223-5.patch"
},
"drupal/honeypot": {
- "2811189": "https://www.drupal.org/files/issues/2019-08-08/honeypot_field_weight_2811189-18.patch"
+ "2811189": "https://www.drupal.org/files/issues/2022-05-25/honeypot-field_weight-2811189-27_0.patch"
},
"drupal/inline_entity_form": {
"3208279": "https://www.drupal.org/files/issues/2021-05-08/inline_entity_form-n3208279-13.patch"
diff --git a/composer.lock b/composer.lock
index e7dc1110159d744b8f09569f1187c6f9134d3a07..b8234fb54d1456041b0aa0aaccb747714c43da2d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "0db64872456ea6dcec72cfaea15b3fdf",
+ "content-hash": "fd7b3eb06f5fdb84f21d52eb13948e13",
"packages": [
{
"name": "alchemy/zippy",
@@ -4232,17 +4232,17 @@
},
{
"name": "drupal/externalauth",
- "version": "1.3.0",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/externalauth.git",
- "reference": "8.x-1.3"
+ "reference": "8.x-1.4"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/externalauth-8.x-1.3.zip",
- "reference": "8.x-1.3",
- "shasum": "b1b38e6718fe66bd38fc894dab1f9d7a7d60f10b"
+ "url": "https://ftp.drupal.org/files/projects/externalauth-8.x-1.4.zip",
+ "reference": "8.x-1.4",
+ "shasum": "caea7d2d5a890adad9e6b5beaa2cf139727266d6"
},
"require": {
"drupal/core": "^8 || ^9"
@@ -4250,8 +4250,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.3",
- "datestamp": "1587629529",
+ "version": "8.x-1.4",
+ "datestamp": "1624457496",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -4284,17 +4284,17 @@
},
{
"name": "drupal/field_group",
- "version": "3.1.0",
+ "version": "3.2.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/field_group.git",
- "reference": "8.x-3.1"
+ "reference": "8.x-3.2"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/field_group-8.x-3.1.zip",
- "reference": "8.x-3.1",
- "shasum": "8a719eaea594f0ba874172831cb28da93c66b77a"
+ "url": "https://ftp.drupal.org/files/projects/field_group-8.x-3.2.zip",
+ "reference": "8.x-3.2",
+ "shasum": "2020bbfe40f6ba43bc733ae7c8761632572433a0"
},
"require": {
"drupal/core": "^8.8 || ^9"
@@ -4305,8 +4305,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-3.1",
- "datestamp": "1591772567",
+ "version": "8.x-3.2",
+ "datestamp": "1628513585",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -4630,26 +4630,29 @@
},
{
"name": "drupal/honeypot",
- "version": "2.0.1",
+ "version": "2.1.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/honeypot.git",
- "reference": "2.0.1"
+ "reference": "2.1.0"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/honeypot-2.0.1.zip",
- "reference": "2.0.1",
- "shasum": "c29d248c0fdcdf733a31b9214355acfa73716632"
+ "url": "https://ftp.drupal.org/files/projects/honeypot-2.1.0.zip",
+ "reference": "2.1.0",
+ "shasum": "7ddb2d0bfeaa65d55823d82bdf01c9c330a1e12f"
},
"require": {
- "drupal/core": "^8.0 || ^9.0"
+ "drupal/core": "^9.2 || ^10"
+ },
+ "require-dev": {
+ "drupal/rules": "^3.0"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "2.0.1",
- "datestamp": "1597855128",
+ "version": "2.1.0",
+ "datestamp": "1651894953",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 83a97a7e7126690681f64d6bb20c98744387f72a..fa42a73416296dc96a48a18ee42be0c3fafe8f3e 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -4366,18 +4366,18 @@
},
{
"name": "drupal/externalauth",
- "version": "1.3.0",
- "version_normalized": "1.3.0.0",
+ "version": "1.4.0",
+ "version_normalized": "1.4.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/externalauth.git",
- "reference": "8.x-1.3"
+ "reference": "8.x-1.4"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/externalauth-8.x-1.3.zip",
- "reference": "8.x-1.3",
- "shasum": "b1b38e6718fe66bd38fc894dab1f9d7a7d60f10b"
+ "url": "https://ftp.drupal.org/files/projects/externalauth-8.x-1.4.zip",
+ "reference": "8.x-1.4",
+ "shasum": "caea7d2d5a890adad9e6b5beaa2cf139727266d6"
},
"require": {
"drupal/core": "^8 || ^9"
@@ -4385,8 +4385,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.3",
- "datestamp": "1587629529",
+ "version": "8.x-1.4",
+ "datestamp": "1624457496",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -4421,18 +4421,18 @@
},
{
"name": "drupal/field_group",
- "version": "3.1.0",
- "version_normalized": "3.1.0.0",
+ "version": "3.2.0",
+ "version_normalized": "3.2.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/field_group.git",
- "reference": "8.x-3.1"
+ "reference": "8.x-3.2"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/field_group-8.x-3.1.zip",
- "reference": "8.x-3.1",
- "shasum": "8a719eaea594f0ba874172831cb28da93c66b77a"
+ "url": "https://ftp.drupal.org/files/projects/field_group-8.x-3.2.zip",
+ "reference": "8.x-3.2",
+ "shasum": "2020bbfe40f6ba43bc733ae7c8761632572433a0"
},
"require": {
"drupal/core": "^8.8 || ^9"
@@ -4443,8 +4443,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-3.1",
- "datestamp": "1591772567",
+ "version": "8.x-3.2",
+ "datestamp": "1628513585",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -4785,34 +4785,37 @@
},
{
"name": "drupal/honeypot",
- "version": "2.0.1",
- "version_normalized": "2.0.1.0",
+ "version": "2.1.0",
+ "version_normalized": "2.1.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/honeypot.git",
- "reference": "2.0.1"
+ "reference": "2.1.0"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/honeypot-2.0.1.zip",
- "reference": "2.0.1",
- "shasum": "c29d248c0fdcdf733a31b9214355acfa73716632"
+ "url": "https://ftp.drupal.org/files/projects/honeypot-2.1.0.zip",
+ "reference": "2.1.0",
+ "shasum": "7ddb2d0bfeaa65d55823d82bdf01c9c330a1e12f"
},
"require": {
- "drupal/core": "^8.0 || ^9.0"
+ "drupal/core": "^9.2 || ^10"
+ },
+ "require-dev": {
+ "drupal/rules": "^3.0"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "2.0.1",
- "datestamp": "1597855128",
+ "version": "2.1.0",
+ "datestamp": "1651894953",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
}
},
"patches_applied": {
- "2811189": "https://www.drupal.org/files/issues/2019-08-08/honeypot_field_weight_2811189-18.patch"
+ "2811189": "https://www.drupal.org/files/issues/2022-05-25/honeypot-field_weight-2811189-27_0.patch"
}
},
"installation-source": "dist",
@@ -4826,6 +4829,10 @@
"homepage": "https://www.drupal.org/user/213194",
"email": "geerlingguy@mac.com"
},
+ {
+ "name": "TR",
+ "homepage": "https://www.drupal.org/user/202830"
+ },
{
"name": "geerlingguy",
"homepage": "https://www.drupal.org/user/389011"
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index afded3349f1b79b4ab0c00fe85e6d10387dea6b9..fc0123ccd881c500c014bac89ad1fad6b4498d71 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -5,7 +5,7 @@
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => 'ac0e30f29859b960ce5fce6752376c2d329ff838',
+ 'reference' => '23979be14f23e4b071f4479471ad8168d4d4756c',
'name' => 'osu-asc-webservices/d8-upstream',
'dev' => true,
),
@@ -935,12 +935,12 @@
'dev_requirement' => false,
),
'drupal/externalauth' => array(
- 'pretty_version' => '1.3.0',
- 'version' => '1.3.0.0',
+ 'pretty_version' => '1.4.0',
+ 'version' => '1.4.0.0',
'type' => 'drupal-module',
'install_path' => __DIR__ . '/../../web/modules/externalauth',
'aliases' => array(),
- 'reference' => '8.x-1.3',
+ 'reference' => '8.x-1.4',
'dev_requirement' => false,
),
'drupal/field' => array(
@@ -950,12 +950,12 @@
),
),
'drupal/field_group' => array(
- 'pretty_version' => '3.1.0',
- 'version' => '3.1.0.0',
+ 'pretty_version' => '3.2.0',
+ 'version' => '3.2.0.0',
'type' => 'drupal-module',
'install_path' => __DIR__ . '/../../web/modules/field_group',
'aliases' => array(),
- 'reference' => '8.x-3.1',
+ 'reference' => '8.x-3.2',
'dev_requirement' => false,
),
'drupal/field_layout' => array(
@@ -1058,12 +1058,12 @@
),
),
'drupal/honeypot' => array(
- 'pretty_version' => '2.0.1',
- 'version' => '2.0.1.0',
+ 'pretty_version' => '2.1.0',
+ 'version' => '2.1.0.0',
'type' => 'drupal-module',
'install_path' => __DIR__ . '/../../web/modules/honeypot',
'aliases' => array(),
- 'reference' => '2.0.1',
+ 'reference' => '2.1.0',
'dev_requirement' => false,
),
'drupal/image' => array(
@@ -2101,7 +2101,7 @@
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => 'ac0e30f29859b960ce5fce6752376c2d329ff838',
+ 'reference' => '23979be14f23e4b071f4479471ad8168d4d4756c',
'dev_requirement' => false,
),
'pantheon-systems/quicksilver-pushback' => array(
diff --git a/web/modules/externalauth/externalauth.info.yml b/web/modules/externalauth/externalauth.info.yml
index 87c03eb99f6107b8f6c070ea7f338c31732912fb..a73e17abc1fafff8180555a46f9d62b8c4d6f00c 100644
--- a/web/modules/externalauth/externalauth.info.yml
+++ b/web/modules/externalauth/externalauth.info.yml
@@ -3,9 +3,9 @@ type: module
description: Helper module to authenticate users using an external site / service and storing identification details
core: 8.x
core_version_requirement: ^8 || ^9
-package: Authentication
+package: 'User authentication'
-# Information added by Drupal.org packaging script on 2020-04-23
-version: '8.x-1.3'
+# Information added by Drupal.org packaging script on 2021-06-23
+version: '8.x-1.4'
project: 'externalauth'
-datestamp: 1587629530
+datestamp: 1624457461
diff --git a/web/modules/externalauth/externalauth.install b/web/modules/externalauth/externalauth.install
index f67c30241a455d62b18697bd85bb1d40b32bfea7..3e672385bab1f0a560eabcf7a765fb9eda904d4d 100644
--- a/web/modules/externalauth/externalauth.install
+++ b/web/modules/externalauth/externalauth.install
@@ -70,13 +70,15 @@ function externalauth_schema() {
*/
function externalauth_update_8101() {
$schema = Database::getConnection()->schema();
- $schema->changeField('authmap', 'authname', 'authname', [
+ if ($schema->tableExists('authmap')) {
+ $schema->changeField('authmap', 'authname', 'authname', [
'description' => 'Unique authentication name provided by authentication provider',
'type' => 'varchar',
'length' => 128,
'not null' => TRUE,
'default' => '',
- ]);
+ ]);
+ }
}
/**
diff --git a/web/modules/externalauth/src/AuthmapInterface.php b/web/modules/externalauth/src/AuthmapInterface.php
index a004ed720630cf10697a342177c5286e94419a59..553ec68b154915c0b3a9f5b99283a416850f1b5a 100644
--- a/web/modules/externalauth/src/AuthmapInterface.php
+++ b/web/modules/externalauth/src/AuthmapInterface.php
@@ -34,8 +34,8 @@ public function save(UserInterface $account, $provider, $authname, $data = NULL)
* @param string $provider
* The name of the service providing external authentication.
*
- * @return string
- * The external authname / ID.
+ * @return string|bool
+ * The external authname / ID, or FALSE.
*/
public function get($uid, $provider);
diff --git a/web/modules/externalauth/src/Tests/AuthmapTest.php b/web/modules/externalauth/tests/src/Kernel/AuthmapTest.php
similarity index 98%
rename from web/modules/externalauth/src/Tests/AuthmapTest.php
rename to web/modules/externalauth/tests/src/Kernel/AuthmapTest.php
index eea6ba638482e45c19142c9125049cb56b87e5ce..ad4ae374c0d6ffdd5da864b560ecad64cd4e7b21 100644
--- a/web/modules/externalauth/src/Tests/AuthmapTest.php
+++ b/web/modules/externalauth/tests/src/Kernel/AuthmapTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\externalauth\Tests;
+namespace Drupal\Tests\externalauth\Kernel;
use Drupal\KernelTests\KernelTestBase;
use Drupal\user\Entity\User;
diff --git a/web/modules/externalauth/tests/src/Unit/ExternalAuthTest.php b/web/modules/externalauth/tests/src/Unit/ExternalAuthTest.php
index b07f386e7852c3d61b0fafbb28970c7337a1c6b8..0fd48f4999036021f3cb88179bb72b5ba3d721a0 100644
--- a/web/modules/externalauth/tests/src/Unit/ExternalAuthTest.php
+++ b/web/modules/externalauth/tests/src/Unit/ExternalAuthTest.php
@@ -107,7 +107,7 @@ public function testLoad() {
$this->eventDispatcher
);
$result = $externalauth->load("test_authname", "test_provider");
- $this->assertTrue($result instanceof UserInterface);
+ $this->assertInstanceOf(UserInterface::class, $result);
}
/**
@@ -209,7 +209,7 @@ public function testRegister($registration_data, $expected_data) {
$this->eventDispatcher
);
$registered_account = $externalauth->register($registration_data['authname'], $registration_data['provider'], $registration_data['account_data'], $registration_data['authmap_data']);
- $this->assertTrue($registered_account instanceof UserInterface);
+ $this->assertInstanceOf(UserInterface::class, $registered_account);
$this->assertEquals($expected_data['timezone'], $registered_account->getTimeZone());
$this->assertEquals($expected_data['data'], $dispatched_event->getData());
}
@@ -303,7 +303,7 @@ public function testLoginRegister() {
->will($this->returnValue($account));
$result = $externalauth->loginRegister("test_authname", "test_provider");
- $this->assertTrue($result instanceof UserInterface);
+ $this->assertInstanceOf(UserInterface::class, $result);
}
/**
diff --git a/web/modules/field_group/config/schema/field_group.field_group_formatter_plugin.schema.yml b/web/modules/field_group/config/schema/field_group.field_group_formatter_plugin.schema.yml
index 01154220dbfccde8292369b26dc3f03018a3db32..b24ecddb43391ce0a7815b03af24ac721f5cf751 100644
--- a/web/modules/field_group/config/schema/field_group.field_group_formatter_plugin.schema.yml
+++ b/web/modules/field_group/config/schema/field_group.field_group_formatter_plugin.schema.yml
@@ -14,7 +14,7 @@ field_group.field_group_formatter_plugin.accordion_item:
type: string
label: 'Formatting of the item'
description:
- type: label
+ type: text
label: 'Description of the item'
required_fields:
type: boolean
@@ -47,7 +47,7 @@ field_group.field_group_formatter_plugin.fieldset:
label: 'Mapping for the fieldset formatter settings'
mapping:
description:
- type: label
+ type: text
label: 'Description of the item'
required_fields:
type: boolean
@@ -90,7 +90,7 @@ field_group.field_group_formatter_plugin.tab:
type: string
label: 'default state for the tab'
description:
- type: label
+ type: text
label: 'Description of the tab'
required_fields:
type: boolean
@@ -104,7 +104,7 @@ field_group.field_group_formatter_plugin.tabs:
type: string
label: 'default state for the tabs'
description:
- type: label
+ type: text
label: 'description of the tabs'
required_fields:
type: boolean
@@ -112,6 +112,9 @@ field_group.field_group_formatter_plugin.tabs:
direction:
type: string
label: 'Direction of the tabs'
+ width_breakpoint:
+ type: integer
+ label: 'Disable Tabs widget if the window width is equal or smaller'
field_group.field_group_formatter_plugin.base:
type: mapping
@@ -123,6 +126,9 @@ field_group.field_group_formatter_plugin.base:
classes:
type: string
label: 'Classes of the fieldgroup'
+ show_empty_fields:
+ type: boolean
+ label: 'Show Empty Fields'
id:
type: string
label: 'Html id of the fieldgroup'
diff --git a/web/modules/field_group/contrib/field_group_migrate/field_group_migrate.info.yml b/web/modules/field_group/contrib/field_group_migrate/field_group_migrate.info.yml
index de95c532dd18968edc4e350e165d611b1f47b66d..b0a31916f37c427d45d9365f3bf311acba22ef98 100644
--- a/web/modules/field_group/contrib/field_group_migrate/field_group_migrate.info.yml
+++ b/web/modules/field_group/contrib/field_group_migrate/field_group_migrate.info.yml
@@ -6,7 +6,7 @@ core_version_requirement: ^8.8 || ^9
dependencies:
- field_group:field_group
-# Information added by Drupal.org packaging script on 2020-06-10
-version: '8.x-3.1'
+# Information added by Drupal.org packaging script on 2021-08-09
+version: '8.x-3.2'
project: 'field_group'
-datestamp: 1591772570
+datestamp: 1628513588
diff --git a/web/modules/field_group/contrib/field_group_migrate/migrations/d6_field_group_entity_form_display.yml b/web/modules/field_group/contrib/field_group_migrate/migrations/d6_field_group_entity_form_display.yml
index 01edd68bfa3a40f8d9b3ac9af1696e58e78f3112..d62c27bda2dd631898acc3a7ddbb65f8851bee99 100644
--- a/web/modules/field_group/contrib/field_group_migrate/migrations/d6_field_group_entity_form_display.yml
+++ b/web/modules/field_group/contrib/field_group_migrate/migrations/d6_field_group_entity_form_display.yml
@@ -9,6 +9,7 @@ dependencies:
id: d6_field_group_entity_form_display
migration_tags:
- 'Drupal 6'
+ - Configuration
label: 'Field groups'
source:
plugin: d6_field_group
@@ -35,7 +36,4 @@ process:
destination:
plugin: field_group_entity_form_display
template: d6_field_instance_widget_settings
-migration_dependencies:
- required:
- - d6_field_instance
migration_group: null
diff --git a/web/modules/field_group/contrib/field_group_migrate/migrations/d6_field_group_entity_view_display.yml b/web/modules/field_group/contrib/field_group_migrate/migrations/d6_field_group_entity_view_display.yml
index 92adcc169ad0846a310d2d41a62375b9170c0957..1d6f5eb3a4e251cf6c0ddd3a77fc2ac37b3c4379 100644
--- a/web/modules/field_group/contrib/field_group_migrate/migrations/d6_field_group_entity_view_display.yml
+++ b/web/modules/field_group/contrib/field_group_migrate/migrations/d6_field_group_entity_view_display.yml
@@ -9,6 +9,7 @@ dependencies:
id: d6_field_group_entity_view_display
migration_tags:
- 'Drupal 6'
+ - Configuration
label: 'Field groups'
source:
plugin: d6_field_group
@@ -35,5 +36,5 @@ destination:
template: d6_field_instance_widget_settings
migration_dependencies:
required:
- - d6_field_instance
+ - d6_view_modes
migration_group: null
diff --git a/web/modules/field_group/contrib/field_group_migrate/migrations/d7_field_group.yml b/web/modules/field_group/contrib/field_group_migrate/migrations/d7_field_group.yml
index bf80db706811a43687cfa0e23dc26e432e9731f6..f558ffa3acd9908d35fe40efe713b9d47066c323 100644
--- a/web/modules/field_group/contrib/field_group_migrate/migrations/d7_field_group.yml
+++ b/web/modules/field_group/contrib/field_group_migrate/migrations/d7_field_group.yml
@@ -2,8 +2,10 @@ id: d7_field_group
label: Field groups
migration_tags:
- Drupal 7
+ - Configuration
source:
plugin: d7_field_group
+deriver: Drupal\field_group_migrate\Plugin\migrate\D7FieldGroupDeriver
process:
entity_type: entity_type
bundle: bundle
@@ -25,4 +27,4 @@ destination:
plugin: d7_field_group
migration_dependencies:
required:
- - d7_field_formatter_settings
+ - d7_view_modes
diff --git a/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/D7FieldGroupDeriver.php b/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/D7FieldGroupDeriver.php
new file mode 100644
index 0000000000000000000000000000000000000000..07951c5e4193d5a782f09d277fb817712e50265d
--- /dev/null
+++ b/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/D7FieldGroupDeriver.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Drupal\field_group_migrate\Plugin\migrate;
+
+use Drupal\Component\Plugin\Derivative\DeriverBase;
+use Drupal\Component\Plugin\PluginBase;
+use Drupal\Core\Database\DatabaseExceptionWrapper;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate\Plugin\MigrationDeriverTrait;
+use Drupal\migrate\Row;
+use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
+
+/**
+ * Derives Drupal 7 field group migrations per entity type and bundle.
+ */
+class D7FieldGroupDeriver extends DeriverBase {
+
+ use MigrationDeriverTrait;
+ use StringTranslationTrait;
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getDerivativeDefinitions($base_plugin_definition) {
+ $field_group_source = static::getSourcePlugin('d7_field_group');
+
+ try {
+ $field_group_source->checkRequirements();
+ }
+ catch (RequirementsException $e) {
+ // The requirements of the "d7_field_group" source plugin can fail if:
+ // - The source database is not configured or it isn't a Drupal 7 DB.
+ // - The Field Group module is not enabled on the source Drupal instance.
+ return $this->derivatives;
+ }
+
+ assert($field_group_source instanceof DrupalSqlBase);
+
+ try {
+ foreach ($field_group_source as $field_group_row) {
+ assert($field_group_row instanceof Row);
+ [
+ 'entity_type' => $entity_type,
+ 'bundle' => $bundle,
+ ] = $field_group_row->getSource();
+
+ $derivative_id = implode(PluginBase::DERIVATIVE_SEPARATOR, [
+ $entity_type,
+ $bundle,
+ ]);
+
+ if (!empty($this->derivatives[$derivative_id])) {
+ continue;
+ }
+ $derivative_definition = $base_plugin_definition;
+ $derivative_definition['source']['entity_type'] = $entity_type;
+ $derivative_definition['source']['bundle'] = $bundle;
+ $derivative_definition['label'] = $this->t('@label of @entity_type (bundle: @bundle)', [
+ '@label' => $derivative_definition['label'],
+ '@entity_type' => $entity_type,
+ '@bundle' => $bundle,
+ ]);
+ $this->derivatives[$derivative_id] = $derivative_definition;
+ }
+ }
+ catch (DatabaseExceptionWrapper $e) {
+ // Once we begin iterating the source plugin it is possible that the
+ // source tables will not exist. This can happen when the
+ // MigrationPluginManager gathers up the migration definitions but we do
+ // not actually have a Drupal 7 source database.
+ }
+
+ return $this->derivatives;
+ }
+
+}
diff --git a/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/destination/FieldGroupEntityFormDisplay.php b/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/destination/FieldGroupEntityFormDisplay.php
index 860f91ad369a79228c6354bf484cd89440fc5370..e0ca4b53b2e1817ebac8cd23857f8bd5ef6998ae 100644
--- a/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/destination/FieldGroupEntityFormDisplay.php
+++ b/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/destination/FieldGroupEntityFormDisplay.php
@@ -25,18 +25,16 @@ public function import(Row $row, array $old_destination_id_values = []) {
$values[$id] = $row->getDestinationProperty($id);
}
$entity = $this->getEntity($values['entity_type'], $values['bundle'], $values[static::MODE_NAME]);
- if (!$entity->isNew()) {
- $settings = $row->getDestinationProperty('field_group');
- $settings += [
- 'region' => 'content',
- 'parent_name' => '',
- ];
- $entity->setThirdPartySetting('field_group', $row->getDestinationProperty('id'), $settings);
- if (isset($settings['format_type']) && ($settings['format_type'] == 'no_style' || $settings['format_type'] == 'hidden')) {
- $entity->unsetThirdPartySetting('field_group', $row->getDestinationProperty('id'));
- }
- $entity->save();
+ $settings = $row->getDestinationProperty('field_group');
+ $settings += [
+ 'region' => 'content',
+ 'parent_name' => '',
+ ];
+ $entity->setThirdPartySetting('field_group', $row->getDestinationProperty('id'), $settings);
+ if (isset($settings['format_type']) && ($settings['format_type'] == 'no_style' || $settings['format_type'] == 'hidden')) {
+ $entity->unsetThirdPartySetting('field_group', $row->getDestinationProperty('id'));
}
+ $entity->save();
return array_values($values);
}
diff --git a/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/destination/FieldGroupEntityViewDisplay.php b/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/destination/FieldGroupEntityViewDisplay.php
index 3277e934c3e3ef5d4502213f0a2262681e4abaa9..4853d7f435ba55df15c849ee911d6a29bc42df46 100644
--- a/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/destination/FieldGroupEntityViewDisplay.php
+++ b/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/destination/FieldGroupEntityViewDisplay.php
@@ -27,18 +27,16 @@ public function import(Row $row, array $old_destination_id_values = []) {
foreach ($row->getSourceProperty('view_modes') as $view_mode => $settings) {
$entity = $this->getEntity($values['entity_type'], $values['bundle'], $view_mode);
- if (!$entity->isNew()) {
- $settings += [
- 'region' => 'content',
- 'parent_name' => '',
- ];
- $settings = array_merge($row->getDestinationProperty('field_group'), $settings);
- $entity->setThirdPartySetting('field_group', $row->getDestinationProperty('id'), $settings);
- if (isset($settings['format_type']) && ($settings['format_type'] == 'no_style' || $settings['format_type'] == 'hidden')) {
- $entity->unsetThirdPartySetting('field_group', $row->getDestinationProperty('id'));
- }
- $entity->save();
+ $settings += [
+ 'region' => 'content',
+ 'parent_name' => '',
+ ];
+ $settings = array_merge($row->getDestinationProperty('field_group'), $settings);
+ $entity->setThirdPartySetting('field_group', $row->getDestinationProperty('id'), $settings);
+ if (isset($settings['format_type']) && ($settings['format_type'] == 'no_style' || $settings['format_type'] == 'hidden')) {
+ $entity->unsetThirdPartySetting('field_group', $row->getDestinationProperty('id'));
}
+ $entity->save();
}
return array_values($values);
diff --git a/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/destination/d7/FieldGroup.php b/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/destination/d7/FieldGroup.php
index 64b6c4cd1799c53b1feb509c601f4d946035ef0f..35266ae2233b024212d4b2b7f6fb7ac12ce9e439 100644
--- a/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/destination/d7/FieldGroup.php
+++ b/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/destination/d7/FieldGroup.php
@@ -27,17 +27,15 @@ public function import(Row $row, array $old_destination_id_values = []) {
}
$entity = $this->getEntity($values['entity_type'], $values['bundle'], $values['mode'], $values['type']);
- if (!$entity->isNew()) {
- $settings = $row->getDestinationProperty('settings');
- $settings += [
- 'region' => 'content',
- ];
- $entity->setThirdPartySetting('field_group', $row->getDestinationProperty('group_name'), $settings);
- if (isset($settings['format_type']) && ($settings['format_type'] == 'hidden')) {
- $entity->unsetThirdPartySetting('field_group', $row->getDestinationProperty('group_name'));
- }
- $entity->save();
+ $settings = $row->getDestinationProperty('settings');
+ $settings += [
+ 'region' => 'content',
+ ];
+ $entity->setThirdPartySetting('field_group', $row->getDestinationProperty('group_name'), $settings);
+ if (isset($settings['format_type']) && ($settings['format_type'] == 'hidden')) {
+ $entity->unsetThirdPartySetting('field_group', $row->getDestinationProperty('group_name'));
}
+ $entity->save();
return array_values($values);
}
diff --git a/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/source/d7/FieldGroup.php b/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/source/d7/FieldGroup.php
index 4825c845948f1447df4eac28a0ae2c69d3858103..ac9a3a2689512a4913049c3489524283ba8bad81 100644
--- a/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/source/d7/FieldGroup.php
+++ b/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/source/d7/FieldGroup.php
@@ -20,7 +20,19 @@ class FieldGroup extends DrupalSqlBase {
* {@inheritdoc}
*/
public function query() {
- return $this->select('field_group', 'f')->fields('f');
+ $query = $this->select('field_group', 'f')->fields('f');
+ $entity_type = $this->configuration['entity_type'] ?? NULL;
+ $bundle = $this->configuration['bundle'] ?? NULL;
+
+ if ($entity_type) {
+ $query->condition('f.entity_type', $entity_type);
+
+ if ($bundle) {
+ $query->condition('f.bundle', $bundle);
+ }
+ }
+
+ return $query;
}
/**
@@ -69,6 +81,10 @@ public function prepareRow(Row $row) {
$settings['format_type'] = 'tab';
break;
+ case 'html-element':
+ $settings['format_type'] = 'html_element';
+ break;
+
}
$row->setSourceProperty('settings', $settings);
return parent::prepareRow($row);
diff --git a/web/modules/field_group/contrib/field_group_migrate/tests/src/Kernel/Migrate/d7/MigrateFieldGroupTest.php b/web/modules/field_group/contrib/field_group_migrate/tests/src/Kernel/Migrate/d7/MigrateFieldGroupTest.php
index e83c38d647f7bded812f84164c81174c6636fbc0..71c20bd0efef8889c1fb9c014b0ae332dde0dd59 100644
--- a/web/modules/field_group/contrib/field_group_migrate/tests/src/Kernel/Migrate/d7/MigrateFieldGroupTest.php
+++ b/web/modules/field_group/contrib/field_group_migrate/tests/src/Kernel/Migrate/d7/MigrateFieldGroupTest.php
@@ -44,8 +44,6 @@ protected function setUp() {
'd7_taxonomy_vocabulary',
'd7_view_modes',
'd7_field',
- 'd7_field_instance',
- 'd7_field_formatter_settings',
'd7_field_group',
]);
}
diff --git a/web/modules/field_group/field_group.info.yml b/web/modules/field_group/field_group.info.yml
index 0e4b01a222153fc250a9dbd94fa9ca44429257f2..1b207b580cd4a4bce833a1023a3d708eaccd81a7 100644
--- a/web/modules/field_group/field_group.info.yml
+++ b/web/modules/field_group/field_group.info.yml
@@ -6,7 +6,7 @@ core_version_requirement: ^8.8 || ^9
dependencies:
- drupal:field
-# Information added by Drupal.org packaging script on 2020-06-10
-version: '8.x-3.1'
+# Information added by Drupal.org packaging script on 2021-08-09
+version: '8.x-3.2'
project: 'field_group'
-datestamp: 1591772570
+datestamp: 1628513588
diff --git a/web/modules/field_group/field_group.install b/web/modules/field_group/field_group.install
index b247a47a056ec9becc69842cbe456065cfd34a91..2e2dbe1764231cc527965a5512d831e7cb3f816c 100644
--- a/web/modules/field_group/field_group.install
+++ b/web/modules/field_group/field_group.install
@@ -51,7 +51,7 @@ function field_group_update_8302() {
if (\Drupal::service('extension.list.module')
->getName('jquery_ui_accordion')) {
\Drupal::service('module_installer')
- ->install(['jquery_ui_accordion'], FALSE);
+ ->install(['jquery_ui_accordion'], TRUE);
return t('The "jquery_ui_accordion" module has been installed.');
}
}
diff --git a/web/modules/field_group/field_group.libraries.yml b/web/modules/field_group/field_group.libraries.yml
index e09631b7cec4ca0792d7f3ef06b3ca32c21f624d..f5aed67001d1fd7e08ace8ff730b7f991284c3ab 100644
--- a/web/modules/field_group/field_group.libraries.yml
+++ b/web/modules/field_group/field_group.libraries.yml
@@ -1,5 +1,4 @@
field_ui:
- version: VERSION
js:
js/field_group.field_ui.js: {}
css:
@@ -12,7 +11,6 @@ field_ui:
- core/drupalSettings
core:
- version: VERSION
js:
js/field_group.js: {}
dependencies:
@@ -22,36 +20,30 @@ core:
- core/drupalSettings
formatter.accordion:
- version: VERSION
js:
formatters/accordion/accordion.js: {}
dependencies:
- core/jquery.ui.accordion
formatter.html_element:
- version: VERSION
js:
formatters/html_element/html-element.js: {}
formatter.fieldset:
- version: VERSION
js:
formatters/fieldset/fieldset.js: {}
formatter.details:
- version: VERSION
js:
formatters/details/details.js: {}
formatter.tabs:
- version: VERSION
js:
formatters/tabs/tabs.js: {}
dependencies:
- core/modernizr
element.horizontal_tabs:
- version: VERSION
js:
# Load before field_group/core.
formatters/tabs/horizontal-tabs.js: {weight: -1}
diff --git a/web/modules/field_group/field_group.module b/web/modules/field_group/field_group.module
index 006ae6f6e3f89d9695de0b1600d4d091db7c97ec..52b0cbd37cf10c62eb4d53849a4fdc81911a468b 100644
--- a/web/modules/field_group/field_group.module
+++ b/web/modules/field_group/field_group.module
@@ -40,11 +40,11 @@ function field_group_library_info_alter(&$libraries, $extension) {
// Swap jQuery.ui library if available.
// See https://www.drupal.org/project/field_group/issues/3109552 for more
// background on the logic.
- if (version_compare(\Drupal::VERSION, 9) > 0 && $extension == 'field_group') {
+ if ($extension == 'field_group') {
if (\Drupal::moduleHandler()->moduleExists('jquery_ui_accordion')) {
$libraries['formatter.accordion']['dependencies'] = ['jquery_ui_accordion/accordion'];
}
- else {
+ elseif (version_compare(\Drupal::VERSION, 9) > 0 ) {
$libraries['formatter.accordion']['js'] = [];
$libraries['formatter.accordion']['dependencies'] = [];
}
@@ -76,6 +76,10 @@ function field_group_theme_registry_alter(&$theme_registry) {
$theme_registry['eck_entity']['preprocess functions'][] = 'field_group_build_entity_groups';
}
+ // External entities use the external_entity as theme function.
+ if (isset($theme_registry['external_entity'])) {
+ $theme_registry['external_entity']['preprocess functions'][] = 'field_group_build_entity_groups';
+ }
}
/**
@@ -278,6 +282,31 @@ function field_group_inline_entity_form_entity_form_alter(&$entity_form, FormSta
FormatterHelper::formProcess($entity_form, $form_state);
}
+/**
+ * Implements hook_form_media_library_add_form_upload_alter().
+ */
+function field_group_form_media_library_add_form_upload_alter(&$form, FormStateInterface $form_state) {
+
+ // Attach the fieldgroups to the media entity form in Media Library widget.
+ $storage = $form_state->getStorage();
+ if (!empty($storage['media'])) {
+ foreach ($storage['media'] as $delta => $media) {
+ $context = [
+ 'entity_type' => $storage['media'][$delta]->getEntityTypeId(),
+ 'bundle' => $storage['media'][$delta]->bundle(),
+ 'entity' => $storage['media'][$delta],
+ 'context' => 'form',
+ 'display_context' => 'form',
+ 'mode' => 'media_library',
+ ];
+
+ field_group_attach_groups($form['media'][$delta]['fields'], $context);
+ $form['media'][$delta]['fields']['#process'][] = [FormatterHelper::class, 'formProcess'];
+ }
+ }
+
+}
+
/**
* Implements hook_form_layout_builder_update_block_alter().
*/
@@ -341,6 +370,30 @@ function field_group_entity_view_alter(&$build, EntityInterface $entity, EntityD
}
}
+/**
+ * Implements hook_conditional_fields().
+ */
+function field_group_conditional_fields($entity_type, $bundle_name) {
+ $fields = [];
+ $groups = field_group_info_groups($entity_type, $bundle_name, 'form', 'default');
+ foreach ($groups as $name => $group) {
+ $fields[$name] = $group->label;
+ }
+ return $fields;
+}
+
+/**
+ * Implements hook_conditional_fields_children().
+ */
+function field_group_conditional_fields_children($entity_type, $bundle_name) {
+ $groups = [];
+ $group_info = field_group_info_groups($entity_type, $bundle_name, 'form', 'default');
+ foreach ($group_info as $name => $info) {
+ $groups[$name] = $info->children;
+ }
+ return $groups;
+}
+
/**
* Pre render callback for rendering groups.
*
@@ -498,8 +551,10 @@ function field_group_attach_groups(&$element, $context) {
// Create a lookup array.
$group_children = [];
foreach ($element['#fieldgroups'] as $group_name => $group) {
- foreach ($group->children as $child) {
- $group_children[$child] = $group_name;
+ if (!empty($group->children)) {
+ foreach ($group->children as $child) {
+ $group_children[$child] = $group_name;
+ }
}
}
$element['#group_children'] = $group_children;
@@ -528,7 +583,7 @@ function field_group_build_entity_groups(array &$vars, $context = 'view') {
$element = &$vars['content'];
}
else {
- if ($context === 'eck_entity') {
+ if ($context === 'eck_entity' || $context === 'external_entity') {
$element = &$vars['entity'];
}
else {
@@ -628,7 +683,7 @@ function field_group_fields_nest(&$element, &$vars = NULL, $context = NULL) {
$key = field_group_get_content_element_key($context);
if (!isset($element['#fieldgroups'][$child_name]) && isset($vars[$key][$child_name])) {
- // ECK marks his defaut properties as printed, while it is not printed yet.
+ // ECK marks his default properties as printed, while it is not printed yet.
if ($context === 'eck_entity' && !empty($vars[$key][$child_name]['#printed'])) {
$vars[$key][$child_name]['#printed'] = FALSE;
}
@@ -720,7 +775,7 @@ function field_group_field_layout_fields_nest(array &$element, &$vars = NULL, $c
$key = field_group_get_content_element_key($context);
if (!isset($element['#fieldgroups'][$child_name]) && isset($vars[$key]['_field_layout'][$region][$child_name])) {
- // ECK marks his defaut properties as printed, while it is not printed yet.
+ // ECK marks his default properties as printed, while it is not printed yet.
if ($context === 'eck_entity' && !empty($vars[$key]['_field_layout'][$region][$child_name]['#printed'])) {
$vars[$key]['_field_layout'][$region][$child_name]['#printed'] = FALSE;
}
@@ -759,7 +814,7 @@ function field_group_pre_render(& $element, $group, & $rendering_object) {
// Only run the pre_render function if the group has elements.
// $group->group_name.
- if ($element == []) {
+ if ($element == [] && empty($group->format_settings['show_empty_fields'])) {
return;
}
@@ -1003,6 +1058,11 @@ function field_group_remove_empty_form_groups(&$element, $groups, $entity_type)
$group_name = str_replace($name_prefix, '', $element[$childname]['#group']);
$empty_groups_indication[$group_name] = FALSE;
}
+
+ $show_empty_fields = isset($element[$childname]['#show_empty_fields']) && $element[$childname]['#show_empty_fields'];
+ if ($show_empty_fields) {
+ $empty_groups_indication[$childname] = FALSE;
+ }
}
}
@@ -1033,10 +1093,15 @@ function field_group_remove_empty_display_groups(& $element, $groups) {
// Descend if the child is a group.
if (in_array($name, $groups)) {
- $empty_child = field_group_remove_empty_display_groups($element[$name], $groups);
- if (!$empty_child) {
+ if (isset($element[$name]['#show_empty_fields']) && $element[$name]['#show_empty_fields']) {
$empty_group = FALSE;
}
+ else {
+ $empty_child = field_group_remove_empty_display_groups($element[$name], $groups);
+ if (!$empty_child) {
+ $empty_group = FALSE;
+ }
+ }
}
// Child is a field or a renderable array and the element is not empty.
elseif (!empty($element[$name])) {
diff --git a/web/modules/field_group/formatters/tabs/horizontal-tabs.js b/web/modules/field_group/formatters/tabs/horizontal-tabs.js
index 865da553291c5040ccccc9027f33117df88a1160..4ed238d795b00d2cd3ffb5bfbd27a347df22c339 100644
--- a/web/modules/field_group/formatters/tabs/horizontal-tabs.js
+++ b/web/modules/field_group/formatters/tabs/horizontal-tabs.js
@@ -26,72 +26,76 @@
return;
}
- $(context).find('[data-horizontal-tabs-panes]').once('horizontal-tabs').each(function () {
-
- var $this = $(this).addClass('horizontal-tabs-panes');
- var focusID = $(':hidden.horizontal-tabs-active-tab', this).val();
- var tab_focus;
-
- // Check if there are some details that can be converted to horizontal-tabs
- var $details = $this.find('> details');
- if ($details.length === 0) {
- return;
- }
-
- // If collapse.js did not do his work yet, call it directly.
- if (!$($details[0]).hasClass('.collapse-processed')) {
- Drupal.behaviors.collapse.attach(context);
- }
-
- // Create the tab column.
- var tab_list = $('<ul class="horizontal-tabs-list"></ul>');
- $(this).wrap('<div class="horizontal-tabs clearfix"></div>').before(tab_list);
-
- // Transform each details into a tab.
- $details.each(function (i) {
- var $this = $(this);
- var summaryElement = $this.find('> summary .details-title');
-
- if (!summaryElement.length) {
- summaryElement = $this.find('> summary');
+ $(context).find('[data-horizontal-tabs]').once('horizontal-tabs').each(function() {
+ var horizontal_tabs_clearfix = this;
+ $(this).find('> [data-horizontal-tabs-panes]').each(function () {
+ var $this = $(this).addClass('horizontal-tabs-panes');
+ var focusID = $(':hidden.horizontal-tabs-active-tab', this).val();
+ var tab_focus;
+
+ // Check if there are some details that can be converted to horizontal-tabs
+ var $details = $this.find('> details');
+ if ($details.length === 0) {
+ return;
}
- var summaryText = summaryElement.clone().children().remove().end().text().trim() || summaryElement.find('> span:first-child').text().trim();
- var horizontal_tab = new Drupal.horizontalTab({
- title: summaryText,
- details: $this
- });
- horizontal_tab.item.addClass('horizontal-tab-button-' + i);
- tab_list.append(horizontal_tab.item);
- $this
- .removeClass('collapsed')
- // prop() can't be used on browsers not supporting details element,
- // the style won't apply to them if prop() is used.
- .attr('open', true)
- .addClass('horizontal-tabs-pane')
- .data('horizontalTab', horizontal_tab);
- if (this.id === focusID) {
- tab_focus = $this;
+ // If collapse.js did not do his work yet, call it directly.
+ if (!$($details[0]).hasClass('.collapse-processed')) {
+ Drupal.behaviors.collapse.attach(context);
}
- });
-
- $(tab_list).find('> li:first').addClass('first');
- $(tab_list).find('> li:last').addClass('last');
+ // Find the tab column.
+ var tab_list = $(horizontal_tabs_clearfix).find('> [data-horizontal-tabs-list]');
+ tab_list.removeClass('visually-hidden')
+
+ // Transform each details into a tab.
+ $details.each(function (i) {
+ var $this = $(this);
+ var summaryElement = $this.find('> summary');
+ var detailsTitle = summaryElement.first().find('.details-title')
+ if (detailsTitle.length) {
+ var summaryText = detailsTitle.find('> span:last-child').text().trim();
+ }
+ else {
+ var summaryText = summaryElement.clone().children().remove().end().text().trim() || summaryElement.find('> span:first-child').text().trim();
+ }
+
+ var horizontal_tab = new Drupal.horizontalTab({
+ title: summaryText,
+ details: $this
+ });
+ horizontal_tab.item.addClass('horizontal-tab-button-' + i);
+ horizontal_tab.item.attr('data-horizontalTabButton', i);
+ tab_list.append(horizontal_tab.item);
+ $this
+ .removeClass('collapsed')
+ // prop() can't be used on browsers not supporting details element,
+ // the style won't apply to them if prop() is used.
+ .attr('open', true)
+ .addClass('horizontal-tabs-pane')
+ .data('horizontalTab', horizontal_tab);
+ if (this.id === focusID) {
+ tab_focus = $this;
+ }
+ });
- if (!tab_focus) {
- // If the current URL has a fragment and one of the tabs contains an
- // element that matches the URL fragment, activate that tab.
- var hash = window.location.hash.replace(/[=%;,\/]/g, '');
- if (hash !== '#' && $(this).find(hash).length) {
- tab_focus = $(this).find(hash).closest('.horizontal-tabs-pane');
+ $(tab_list).find('> li:first').addClass('first');
+ $(tab_list).find('> li:last').addClass('last');
+
+ if (!tab_focus) {
+ // If the current URL has a fragment and one of the tabs contains an
+ // element that matches the URL fragment, activate that tab.
+ var hash = window.location.hash.replace(/[=%;,\/]/g, '');
+ if (hash !== '#' && $(hash, this).length) {
+ tab_focus = $(hash, this).closest('.horizontal-tabs-pane');
+ }
+ else {
+ tab_focus = $this.find('> .horizontal-tabs-pane:first');
+ }
}
- else {
- tab_focus = $this.find('> .horizontal-tabs-pane:first');
+ if (tab_focus.length) {
+ tab_focus.data('horizontalTab').focus();
}
- }
- if (tab_focus.length) {
- tab_focus.data('horizontalTab').focus();
- }
+ });
});
}
};
diff --git a/web/modules/field_group/includes/field_ui.inc b/web/modules/field_group/includes/field_ui.inc
index 5c53ff1a74dfddfb2a4998b37ba251b32f0d38e4..8aefeb677e4805e3e9f9959a6d33583f775aa798 100644
--- a/web/modules/field_group/includes/field_ui.inc
+++ b/web/modules/field_group/includes/field_ui.inc
@@ -41,11 +41,13 @@ function field_group_field_ui_form_params($form, EntityDisplayBase $display) {
// Gather parenting data.
$params->parents = [];
foreach ($params->groups as $name => $group) {
- foreach ($group->children as $child) {
- // Field UI js sometimes can trigger an endless loop. Check if the parent
- // of this field is not a child.
- if ($child !== $group->parent_name) {
- $params->parents[$child] = $name;
+ if (!empty($group->children)) {
+ foreach ($group->children as $child) {
+ // Field UI js sometimes can trigger an endless loop. Check if the parent
+ // of this field is not a child.
+ if ($child !== $group->parent_name) {
+ $params->parents[$child] = $name;
+ }
}
}
}
diff --git a/web/modules/field_group/src/FieldGroupFormatterBase.php b/web/modules/field_group/src/FieldGroupFormatterBase.php
index b3297a637a7ec0fb655da92798ae99498d8859b3..0c56d8e3958cd599711b12076371896d44753aab 100644
--- a/web/modules/field_group/src/FieldGroupFormatterBase.php
+++ b/web/modules/field_group/src/FieldGroupFormatterBase.php
@@ -95,6 +95,13 @@ public function settingsForm() {
'#weight' => -5,
];
+ $form['show_empty_fields'] = [
+ '#type' => 'checkbox',
+ '#title' => $this->t('Display element also when empty'),
+ '#description' => $this->t('Display this field group even if the contained fields are currently empty.'),
+ '#default_value' => $this->getSetting('show_empty_fields'),
+ ];
+
$form['id'] = [
'#title' => $this->t('ID'),
'#type' => 'textfield',
@@ -126,6 +133,10 @@ public function settingsSummary() {
$summary[] = $this->pluginDefinition['label'] . ': ' . $this->getSetting('formatter');
}
+ if ($this->getSetting('show_empty_fields')) {
+ $summary[] = $this->t('Show Empty Fields');
+ }
+
if ($this->getSetting('id')) {
$summary[] = $this->t('Id: @id', ['@id' => $this->getSetting('id')]);
}
@@ -180,6 +191,7 @@ public function preRender(&$element, $rendering_object) {
$element['#group_name'] = $this->group->group_name;
$element['#entity_type'] = $this->group->entity_type;
$element['#bundle'] = $this->group->bundle;
+ $element['#show_empty_fields'] = $this->getSetting('show_empty_fields');
}
/**
diff --git a/web/modules/field_group/src/Form/FieldGroupDeleteForm.php b/web/modules/field_group/src/Form/FieldGroupDeleteForm.php
index 6814525f967a85effffdab992b57db3c39de8252..b4556d553d77e5dfe29dc612ce4e0eb8bb3d9880 100644
--- a/web/modules/field_group/src/Form/FieldGroupDeleteForm.php
+++ b/web/modules/field_group/src/Form/FieldGroupDeleteForm.php
@@ -6,6 +6,7 @@
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Messenger\MessengerInterface;
use Drupal\field_group\FieldgroupUi;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -27,14 +28,24 @@ class FieldGroupDeleteForm extends ConfirmFormBase {
*/
protected $messenger;
+ /**
+ * The entity type bundle info service.
+ *
+ * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
+ */
+ protected $entityTypeBundleInfo;
+
/**
* FieldGroupDeleteForm constructor.
*
* @param \Drupal\Core\Messenger\MessengerInterface $messenger
* The messenger.
+ * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
+ * The entity type bundle service.
*/
- public function __construct(MessengerInterface $messenger) {
+ public function __construct(MessengerInterface $messenger, EntityTypeBundleInfoInterface $entity_type_bundle_info) {
$this->messenger = $messenger;
+ $this->entityTypeBundleInfo = $entity_type_bundle_info;
}
/**
@@ -42,7 +53,8 @@ public function __construct(MessengerInterface $messenger) {
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('messenger')
+ $container->get('messenger'),
+ $container->get('entity_type.bundle.info')
);
}
@@ -77,7 +89,8 @@ public function buildForm(array $form, FormStateInterface $form_state, $field_gr
* {@inheritdoc}
*/
public function submitForm(array &$form, FormStateInterface $form_state) {
- $bundles = \Drupal::service('entity_type.bundle.info')->getAllBundleInfo();
+
+ $bundles = $this->entityTypeBundleInfo->getAllBundleInfo();
$bundle_label = $bundles[$this->fieldGroup->entity_type][$this->fieldGroup->bundle]['label'];
field_group_delete_field_group($this->fieldGroup);
diff --git a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/AccordionItem.php b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/AccordionItem.php
index dd8feac3715ff3bc8bd2e36a4f0d0c25b5baa440..d163f85e0e4784be632eb93dbd924e2eb4be095c 100644
--- a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/AccordionItem.php
+++ b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/AccordionItem.php
@@ -36,6 +36,9 @@ public function process(&$element, $processed_object) {
'#type' => 'field_group_accordion_item',
'#effect' => $this->getSetting('effect'),
'#title' => $this->getLabel(),
+ // Prevent \Drupal\content_translation\ContentTranslationHandler::addTranslatabilityClue()
+ // from adding an incorrect suffix to the field group title.
+ '#multilingual' => TRUE,
];
if ($this->getSetting('id')) {
diff --git a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Details.php b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Details.php
index fdbde635baa72501dfd15da3b93f8195d92ee599..2da178a3772b2cbdcc5dbe7431b068ce6d2ff60a 100644
--- a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Details.php
+++ b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Details.php
@@ -29,6 +29,7 @@ public function process(&$element, $processed_object) {
'#type' => 'details',
'#title' => $this->getLabel(),
'#open' => $this->getSetting('open'),
+ '#show_empty_fields' => $this->getSetting('show_empty_fields'),
'#description' => $this->getSetting('description'),
];
diff --git a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Fieldset.php b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Fieldset.php
index 327d857b3375c9495de38a816a8f0f59783be074..bf2e2b7be2df34fd2009dec84bd74328b763ca54 100644
--- a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Fieldset.php
+++ b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Fieldset.php
@@ -30,6 +30,9 @@ public function process(&$element, $processed_object) {
'#title' => $this->getLabel(),
'#attributes' => [],
'#description' => $this->getSetting('description'),
+ // Prevent \Drupal\content_translation\ContentTranslationHandler::addTranslatabilityClue()
+ // from adding an incorrect suffix to the field group title.
+ '#multilingual' => TRUE,
];
// When a fieldset has a description, an id is required.
diff --git a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/HtmlElement.php b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/HtmlElement.php
index 94015806df54c84c7dacb95ac321124b5390fc8d..e527817bb936276adcbb335dab513cd8f9d6bd42 100644
--- a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/HtmlElement.php
+++ b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/HtmlElement.php
@@ -72,6 +72,9 @@ public function process(&$element, $processed_object) {
if ($this->getSetting('show_label')) {
$element['#title_element'] = $this->getSetting('label_element');
$element['#title'] = $this->getLabel();
+ // Prevent \Drupal\content_translation\ContentTranslationHandler::addTranslatabilityClue()
+ // from adding an incorrect suffix to the field group title.
+ $element['#multilingual'] = TRUE;
$element['#title_attributes'] = new Attribute();
if (!empty($this->getSetting('label_element_classes'))) {
diff --git a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Tabs.php b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Tabs.php
index de6b562b73662d86f61a78265fc860ade9fb80b9..56553c4a9cad128d4829050fe5ccc33f09513451 100644
--- a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Tabs.php
+++ b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Tabs.php
@@ -4,7 +4,6 @@
use Drupal\Component\Utility\Html;
use Drupal\Core\Form\FormState;
-use Drupal\Core\Render\Element;
use Drupal\Core\Render\Element\VerticalTabs;
use Drupal\field_group\Element\HorizontalTabs;
use Drupal\field_group\FieldGroupFormatterBase;
@@ -54,6 +53,10 @@ public function process(&$element, $processed_object) {
'#theme_wrappers' => [$this->getSetting('direction') . '_tabs'],
];
+ // Add auto-disable breakpoint.
+ if ($width_breakpoint = $this->getSetting('width_breakpoint')) {
+ $element['#attached']['drupalSettings']['widthBreakpoint'] = $width_breakpoint;
+ }
}
/**
@@ -99,6 +102,15 @@ public function settingsForm() {
'#weight' => 1,
];
+ $form['width_breakpoint'] = [
+ '#title' => $this->t('Width Breakpoint'),
+ '#description' => $this->t('Auto-disable the Tabs widget if the window width is equal or smaller than this breakpoint.'),
+ '#type' => 'number',
+ '#default_value' => $this->getSetting('width_breakpoint'),
+ '#weight' => 2,
+ '#min' => 0,
+ ];
+
return $form;
}
@@ -121,6 +133,7 @@ public function settingsSummary() {
public static function defaultContextSettings($context) {
return [
'direction' => 'vertical',
+ 'width_breakpoint' => 640,
] + parent::defaultContextSettings($context);
}
diff --git a/web/modules/field_group/templates/horizontal-tabs.html.twig b/web/modules/field_group/templates/horizontal-tabs.html.twig
index 9ed2a3a1153429dbb318a94271ddde6b550c665e..5c3da3778bbff2a1b84cfa140a0666918a075072 100644
--- a/web/modules/field_group/templates/horizontal-tabs.html.twig
+++ b/web/modules/field_group/templates/horizontal-tabs.html.twig
@@ -12,4 +12,7 @@
* @ingroup themeable
*/
#}
-<div data-horizontal-tabs-panes{{ attributes }}>{{ children }}</div>
+<div data-horizontal-tabs class="horizontal-tabs clearfix">
+ <ul data-horizontal-tabs-list class="horizontal-tabs-list visually-hidden"></ul>
+ <div data-horizontal-tabs-panes{{ attributes }}>{{ children }}</div>
+</div>
diff --git a/web/modules/field_group/tests/modules/field_group_test/field_group_test.info.yml b/web/modules/field_group/tests/modules/field_group_test/field_group_test.info.yml
index b5e79b5971e7fb140944f39ad4e1f67804f0b097..c7f5b784d13ff5e13a67551c9f1666ec7434339e 100644
--- a/web/modules/field_group/tests/modules/field_group_test/field_group_test.info.yml
+++ b/web/modules/field_group/tests/modules/field_group_test/field_group_test.info.yml
@@ -5,7 +5,7 @@ package: 'Fields'
type: module
hidden: TRUE
-# Information added by Drupal.org packaging script on 2020-06-10
-version: '8.x-3.1'
+# Information added by Drupal.org packaging script on 2021-08-09
+version: '8.x-3.2'
project: 'field_group'
-datestamp: 1591772570
+datestamp: 1628513588
diff --git a/web/modules/field_group/tests/src/Functional/ManageDisplayTest.php b/web/modules/field_group/tests/src/Functional/ManageDisplayTest.php
index f23f7f62c4e4af8c2c3eaf573bc9282c639549bd..610d3c9414b703b27f9500af066af5dbeaeb814a 100644
--- a/web/modules/field_group/tests/src/Functional/ManageDisplayTest.php
+++ b/web/modules/field_group/tests/src/Functional/ManageDisplayTest.php
@@ -71,15 +71,17 @@ public function testCreateGroup() {
];
$add_form_display = 'admin/structure/types/manage/' . $this->type . '/form-display/add-group';
- $this->drupalPostForm($add_form_display, $group, 'Save and continue');
+ $this->drupalGet($add_form_display);
+ $this->submitForm($group, 'Save and continue');
$this->assertSession()->pageTextContains('Machine-readable name field is required.');
// Add required field to form.
$group['group_name'] = $group_name_input;
// Add new group on the 'Manage form display' page.
- $this->drupalPostForm($add_form_display, $group, 'Save and continue');
- $this->drupalPostForm(NULL, [], 'Create group');
+ $this->drupalGet($add_form_display);
+ $this->submitForm($group, 'Save and continue');
+ $this->submitForm([], 'Create group');
$this->assertSession()->responseContains(t('New group %label successfully created.', ['%label' => $group_label]));
@@ -91,8 +93,9 @@ public function testCreateGroup() {
$this->assertEquals('hidden', $this->group->region);
// Add new group on the 'Manage display' page.
- $this->drupalPostForm('admin/structure/types/manage/' . $this->type . '/display/add-group', $group, 'Save and continue');
- $this->drupalPostForm(NULL, [], 'Create group');
+ $this->drupalGet('admin/structure/types/manage/' . $this->type . '/display/add-group');
+ $this->submitForm($group, 'Save and continue');
+ $this->submitForm([], 'Create group');
$this->assertSession()->responseContains(t('New group %label successfully created.', ['%label' => $group_label]));
@@ -112,7 +115,8 @@ public function testDeleteGroup() {
$group = $this->createGroup('node', $this->type, 'form', 'default', $data);
- $this->drupalPostForm('admin/structure/types/manage/' . $this->type . '/form-display/' . $group->group_name . '/delete', [], 'Delete');
+ $this->drupalGet('admin/structure/types/manage/' . $this->type . '/form-display/' . $group->group_name . '/delete');
+ $this->submitForm([], 'Delete');
$this->assertSession()->responseContains(t('The group %label has been deleted from the %type content type.', ['%label' => $group->label, '%type' => $this->type]));
// Test that group is not in the $groups array.
@@ -129,7 +133,8 @@ public function testDeleteGroup() {
$group = $this->createGroup('node', $this->type, 'view', 'default', $data);
- $this->drupalPostForm('admin/structure/types/manage/' . $this->type . '/display/' . $group->group_name . '/delete', [], t('Delete'));
+ $this->drupalGet('admin/structure/types/manage/' . $this->type . '/display/' . $group->group_name . '/delete');
+ $this->submitForm([], 'Delete');
$this->assertSession()->responseContains(t('The group %label has been deleted from the %type content type.', ['%label' => $group->label, '%type' => $this->type]));
// Test that group is not in the $groups array.
@@ -153,7 +158,8 @@ public function testNestField() {
$edit = [
'fields[body][parent]' => $group->group_name,
];
- $this->drupalPostForm('admin/structure/types/manage/' . $this->type . '/form-display', $edit, 'Save');
+ $this->drupalGet('admin/structure/types/manage/' . $this->type . '/form-display');
+ $this->submitForm($edit, 'Save');
$this->assertSession()->responseContains('Your settings have been saved.');
$group = field_group_load_field_group($group->group_name, 'node', $this->type, 'form', 'default');
diff --git a/web/modules/honeypot/.travis.yml b/web/modules/honeypot/.travis.yml
deleted file mode 100644
index f5d52a03543d46640f024878f7ed1d82a34d637a..0000000000000000000000000000000000000000
--- a/web/modules/honeypot/.travis.yml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-language: php
-php: '7.2'
-services: docker
-
-env:
- DOCKER_COMPOSE_VERSION: 1.23.2
-
-before_install:
- - sudo service mysql stop
-
- # Upgrade docker-compose.
- - sudo rm /usr/local/bin/docker-compose
- - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
- - chmod +x docker-compose
- - sudo mv docker-compose /usr/local/bin
-
-install:
- # Build environment.
- - docker-compose up -d
-
- # Wait for composer create-project to complete.
- - sleep 300
-
- # Structure the codebase and install necessary dependencies.
- - docker-compose exec drupal bash -c 'apt-get update && apt-get install -y sudo'
- - docker-compose exec drupal bash -c 'composer config platform --unset'
- - docker-compose exec drupal bash -c 'composer require --prefer-source --no-interaction --dev drush/drush'
- - docker-compose exec drupal bash -c 'composer update phpunit/phpunit symfony/phpunit-bridge phpspec/prophecy symfony/yaml --with-dependencies'
- - docker-compose exec drupal ln -s /opt/honeypot/ /var/www/html/web/modules/honeypot
-
- # Install Drupal and Honeypot/Testing.
- - docker-compose exec drupal bash -c 'sudo -u www-data vendor/bin/drush site:install standard --site-name="Honeypot Test" --account-pass admin -y'
- - docker-compose exec drupal bash -c 'vendor/bin/drush en -y honeypot simpletest'
-
-before_script:
- # Adjust permissions on the simpletest directories.
- - docker exec honeypot mkdir -p /var/www/html/web/sites/simpletest
- - docker exec honeypot chown -R www-data:www-data /var/www/html/web/sites/simpletest
-
-script:
- # Run module tests.
- - docker-compose exec drupal bash -c 'sudo -u www-data php web/core/scripts/run-tests.sh --module honeypot --url http://localhost/'
-
-after_failure:
- # Re-run tests with verbose output for debugging.
- - docker-compose exec drupal bash -c 'sudo -u www-data php web/core/scripts/run-tests.sh --verbose --module honeypot --url http://localhost/'
diff --git a/web/modules/honeypot/PATCHES.txt b/web/modules/honeypot/PATCHES.txt
index dfab2f981967ed6184cbe6f186ad63b3bc8d5d5b..44cc610c7bad2aa3fec6df0605b4153b2d79e03f 100644
--- a/web/modules/honeypot/PATCHES.txt
+++ b/web/modules/honeypot/PATCHES.txt
@@ -2,6 +2,6 @@ This file was automatically generated by Composer Patches (https://github.com/cw
Patches applied to this directory:
2811189
-Source: https://www.drupal.org/files/issues/2019-08-08/honeypot_field_weight_2811189-18.patch
+Source: https://www.drupal.org/files/issues/2022-05-25/honeypot-field_weight-2811189-27_0.patch
diff --git a/web/modules/honeypot/README.md b/web/modules/honeypot/README.md
index c096502ad351f2e5e2a758c8cf07942c50710fe6..1766454b40034c38a270265e71f5c6e837cc26ed 100644
--- a/web/modules/honeypot/README.md
+++ b/web/modules/honeypot/README.md
@@ -6,7 +6,7 @@
## Installation
-To install this module, `composer require` it, or place it in your modules
+To install this module, `composer require` it, or place it in your modules
folder and enable it on the modules page.
@@ -14,7 +14,7 @@ folder and enable it on the modules page.
All settings for this module are on the Honeypot configuration page, under the
Configuration section, in the Content authoring settings. You can visit the
-configuration page directly at admin/config/content/honeypot.
+configuration page directly at /admin/config/content/honeypot.
Note that, when testing Honeypot on your website, make sure you're not logged in
as an administrative user or user 1; Honeypot allows administrative users to
@@ -28,7 +28,7 @@ If you want to add honeypot to your own forms, or to any form through your own
module's hook_form_alter's, you can simply place the following function call
inside your form builder function (or inside a hook_form_alter):
- honeypot_add_form_protection(
+ \Drupal::service('honeypot')->addFormProtection(
$form,
$form_state,
['honeypot', 'time_restriction']
@@ -40,10 +40,12 @@ restriction on the form by including or not including the option in the array.
## Testing
-Honeypot includes a `docker-compose.yml` file that can be used for testing purposes. To build a Drupal 8 environment for local testing, do the following:
+Honeypot includes a `docker-compose.yml` file that can be used for testing
+purposes. To build a Drupal 8 environment for local testing, do the following:
- 1. Make sure you have Docker for Mac (or for whatever OS you're using) installed.
- 1. Run the following commands in this directory to start the environment and install Drush:
+ 1. Make sure you have Docker installed.
+ 1. Run the following commands in this directory to start the environment and
+ install Drush:
```
docker-compose up -d
@@ -63,7 +65,8 @@ Honeypot includes a `docker-compose.yml` file that can be used for testing purpo
docker-compose exec drupal bash -c 'vendor/bin/drush site:install standard --site-name="Honeypot Test" --account-pass admin -y && chown -R www-data:www-data web/sites/default/files'
```
- 1. Log into `http://localhost/` with `admin`/`admin` and enable Honeypot (and the Testing module, if desired).
+ 1. Log into `http://localhost/` with `admin`/`admin` and enable Honeypot (and
+ the Testing module, if desired).
## Credit
diff --git a/web/modules/honeypot/composer.json b/web/modules/honeypot/composer.json
index 7ee3c1b8f51eb65914aeee57df04bc92c2fc6384..868aea98231e3f28e8ea7680dd4e0b968139630c 100644
--- a/web/modules/honeypot/composer.json
+++ b/web/modules/honeypot/composer.json
@@ -1,22 +1,25 @@
{
- "name": "drupal/honeypot",
- "description": "Mitigates spam form submissions using the honeypot method.",
- "type": "drupal-module",
- "license": "GPL-2.0-or-later",
- "keywords": ["spam", "php", "form", "honeypot", "honeytrap", "deterrent"],
- "homepage": "https://www.drupal.org/project/honeypot",
- "minimum-stability": "dev",
- "authors": [
- {
- "name": "Jeff Geerling",
- "email": "geerlingguy@mac.com"
- }
- ],
- "support": {
- "issues": "https://www.drupal.org/project/issues/honeypot",
- "source": "https://git.drupalcode.org/project/honeypot"
- },
- "require": {
- "drupal/core": "^8.0 || ^9.0"
+ "name": "drupal/honeypot",
+ "description": "Mitigates spam form submissions using the honeypot method.",
+ "type": "drupal-module",
+ "license": "GPL-2.0-or-later",
+ "keywords": ["spam", "php", "form", "honeypot", "honeytrap", "deterrent"],
+ "homepage": "https://www.drupal.org/project/honeypot",
+ "minimum-stability": "dev",
+ "authors": [
+ {
+ "name": "Jeff Geerling",
+ "email": "geerlingguy@mac.com"
+ }
+ ],
+ "support": {
+ "issues": "https://www.drupal.org/project/issues/honeypot",
+ "source": "https://git.drupalcode.org/project/honeypot"
+ },
+ "require": {
+ "drupal/core": "^9.2 || ^10"
+ },
+ "require-dev": {
+ "drupal/rules": "^3.0"
}
}
diff --git a/web/modules/honeypot/config/optional/tour.tour.honeypot.yml b/web/modules/honeypot/config/optional/tour.tour.honeypot.yml
index 1de333a555490f1830c8910cc17f5d431bc8bdb7..af082f4238e7abb85df2705cec8574861e55d905 100644
--- a/web/modules/honeypot/config/optional/tour.tour.honeypot.yml
+++ b/web/modules/honeypot/config/optional/tour.tour.honeypot.yml
@@ -11,49 +11,52 @@ tips:
label: Honeypot
weight: -10
body: "Congratulations on installing Honeypot on your site! With just a few clicks, you can have your site well-protected against automated spam bots.\r\n\r\nClick Next to be guided through this configuration page."
- location: top
+ location: top-start
protect-all-forms:
id: protect-all-forms
plugin: text
label: 'Protect all forms'
weight: -9
- attributes:
- data-id: edit-protect-all-forms
+ selector: '#edit-protect-all-forms'
body: "Protecting all the forms is the easiest way to quickly cut down on spam on your site, but doing this disables Drupal's caching for every page where a form is displayed.\r\n\r\nNote: If you have the honeypot time limit enabled, this option may cause issues with Drupal Commerce product forms or similarly-sparse forms that are able to be completed in a very short time."
- location: bottom
+ location: bottom-start
log-blocked-form-submissions:
id: log-blocked-form-submissions
plugin: text
label: 'Log blocked form submissions'
weight: -8
- attributes:
- data-id: edit-log
+ selector: '#edit-log'
body: 'Check this box to log every form submission using watchdog. If you have Database Logging enabled, you can view these log entries in the Recent log messages page under Reports.'
- location: bottom
+ location: bottom-start
honeypot-element-name:
id: honeypot-element-name
plugin: text
label: 'Honeypot Element Name'
weight: -7
- attributes:
- data-id: edit-element-name
+ selector: '#edit-element-name'
body: 'Spam bots typically fill out any field they believe will help get links back to their site, so tempting them with a field named something like ''url'', ''homepage'', or ''link'' makes it hard for them to resist filling in the field—and easy to catch them in the trap and reject their submissions!'
- location: top
+ location: top-start
honeypot-time-limit:
id: honeypot-time-limit
plugin: text
label: 'Honeypot Time Limit'
weight: -6
- attributes:
- data-id: edit-time-limit
+ selector: '#edit-time-limit'
body: 'If you enter a positive value, Honeypot will require that all protected forms take at least that many seconds long to fill out. Most forms take at least 5-10 seconds to complete (if you''re a human), so setting this to a value < 5 will help protect against spam bots. Set to 0 to disable.'
- location: top
+ location: top-start
+ honeypot-expire:
+ id: honeypot-expire
+ plugin: text
+ label: 'Honeypot Expire'
+ weight: -5
+ selector: '#edit-expire'
+ body: 'If you enter a positive value, Honeypot will require that all protected forms take at least that many seconds long to fill out. Most forms take at least 5-10 seconds to complete (if you''re a human), so setting this to a value < 5 will help protect against spam bots. Set to 0 to disable.'
+ location: top-start
honeypot-form-specific-settings:
id: honeypot-form-specific-settings
plugin: text
label: 'Honeypot form-specific settings'
- weight: -5
- attributes:
- data-id: edit-form-settings
+ weight: -4
+ selector: '#edit-form-settings'
body: 'If you would like to choose particular forms to be protected by Honeypot, check the forms you wish to protect in this section. Most common types of forms are available for protection.'
- location: top
+ location: top-start
diff --git a/web/modules/honeypot/docker-compose.yml b/web/modules/honeypot/docker-compose.yml
deleted file mode 100644
index 3179e0438bb2d4bf30f1054ca959ee3b3b0c41f9..0000000000000000000000000000000000000000
--- a/web/modules/honeypot/docker-compose.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-version: "3"
-
-services:
- drupal:
- image: geerlingguy/drupal
- container_name: honeypot
- environment:
- DRUPAL_DATABASE_HOST: 'mysql'
- DRUPAL_DATABASE_PORT: '3306'
- DRUPAL_DATABASE_NAME: 'drupal'
- DRUPAL_DATABASE_USERNAME: 'drupal'
- DRUPAL_DATABASE_PASSWORD: 'drupal'
- DRUPAL_HASH_SALT: 'fe918c992fb1bcfa01f32303c8b21f3d0a0'
- DRUPAL_DOWNLOAD_IF_NOT_PRESENT: 'true'
- DRUPAL_DOWNLOAD_METHOD: 'composer'
- DRUPAL_PROJECT_ROOT: /var/www/html
- APACHE_DOCUMENT_ROOT: /var/www/html/web
- COMPOSER_MEMORY_LIMIT: '-1'
- ports:
- - "80:80"
- restart: always
- volumes:
- - ./:/opt/honeypot/:rw,delegated
-
- mysql:
- image: mysql:5.7
- container_name: drupal-mysql
- command: ['--max_allowed_packet=32505856']
- environment:
- MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
- MYSQL_DATABASE: drupal
- MYSQL_USER: drupal
- MYSQL_PASSWORD: drupal
- ports:
- - "3306:3306"
- volumes:
- - /var/lib/mysql
diff --git a/web/modules/honeypot/drupalci.yml b/web/modules/honeypot/drupalci.yml
deleted file mode 100644
index 9adfb33938e5b3d45c3f6c0dea51a36b19e00e84..0000000000000000000000000000000000000000
--- a/web/modules/honeypot/drupalci.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Learn to make one for your own drupal.org project:
-# https://www.drupal.org/drupalorg/docs/drupal-ci/customizing-drupalci-testing
-build:
- assessment:
- validate_codebase:
- phplint:
- container_composer:
- phpcs:
- # phpcs will use core's specified version of Coder.
- sniff-all-files: true
- halt-on-fail: false
- testing:
- # run_tests task is executed several times in order of performance speeds.
- # halt-on-fail can be set on the run_tests tasks in order to fail fast.
- # suppress-deprecations is false in order to be alerted to usages of
- # deprecated code.
- run_tests.standard:
- types: 'Simpletest,PHPUnit-Unit,PHPUnit-Kernel,PHPUnit-Functional'
- testgroups: '--all'
- suppress-deprecations: false
- run_tests.js:
- types: 'PHPUnit-FunctionalJavascript'
- testgroups: '--all'
- suppress-deprecations: false
- nightwatchjs: { }
diff --git a/web/modules/honeypot/honeypot.api.php b/web/modules/honeypot/honeypot.api.php
index efe433224b6aaab10ea625a6da057f4ebe2e1fff..9d90900cacebdb0f1193b90aa32e5a3b5fa28509 100644
--- a/web/modules/honeypot/honeypot.api.php
+++ b/web/modules/honeypot/honeypot.api.php
@@ -58,8 +58,8 @@ function hook_honeypot_add_form_protection(array $options, array $form) {
* 0 for anonymous users, otherwise the user ID of the user.
* @param string $type
* String indicating the reason the submission was blocked. Allowed values:
- * - honeypot: If honeypot field was filled in.
- * - honeypot_time: If form was completed before the configured time limit.
+ * - honeypot: If honeypot field was filled in.
+ * - honeypot_time: If form was completed before the configured time limit.
*/
function hook_honeypot_reject($form_id, $uid, $type) {
if ($form_id == 'mymodule_form') {
diff --git a/web/modules/honeypot/honeypot.info.yml b/web/modules/honeypot/honeypot.info.yml
index dcd9a9ae1b27870a9da86a5fe8201f33668d669c..287bff6fffcf8a703b411eedf74bc15d4cc424be 100644
--- a/web/modules/honeypot/honeypot.info.yml
+++ b/web/modules/honeypot/honeypot.info.yml
@@ -1,13 +1,14 @@
name: Honeypot
type: module
description: 'Mitigates spam form submissions using the honeypot method.'
-package: "Spam control"
-core: 8.x
-core_version_requirement: ^8 || ^9
+package: 'Spam control'
+core_version_requirement: ^9.2 || ^10
+test_dependencies:
+ - rules:rules
+
configure: honeypot.config
-hidden: false
-# Information added by Drupal.org packaging script on 2020-08-19
-version: '2.0.1'
+# Information added by Drupal.org packaging script on 2022-05-07
+version: '2.1.0'
project: 'honeypot'
-datestamp: 1597855130
+datestamp: 1651894956
diff --git a/web/modules/honeypot/honeypot.install b/web/modules/honeypot/honeypot.install
index 33ed67abcf0e6985f81266184e681b50dd8c47b1..edc958edc3bdf11951e6243b7da2235d6262914f 100644
--- a/web/modules/honeypot/honeypot.install
+++ b/web/modules/honeypot/honeypot.install
@@ -2,7 +2,7 @@
/**
* @file
- * Contains install and update functions for Honeypot.
+ * Install, update and uninstall functions for the Honeypot module.
*/
use Drupal\Core\Url;
@@ -46,11 +46,9 @@ function honeypot_schema() {
*/
function honeypot_install() {
if (PHP_SAPI !== 'cli') {
- $config_url = Url::fromUri('base://admin/config/content/honeypot');
- \Drupal::messenger()->addMessage(t(
- 'Honeypot installed successfully. Please <a href=":url">configure Honeypot</a> to protect your forms from spam bots.',
- [':url' => $config_url->toString()]
- ));
+ \Drupal::messenger()->addMessage(t('Honeypot installed successfully. Please <a href=":url">configure Honeypot</a> to protect your forms from spam bots.', [
+ ':url' => Url::fromRoute('honeypot.config')->toString(),
+ ]));
}
}
diff --git a/web/modules/honeypot/honeypot.module b/web/modules/honeypot/honeypot.module
index b54fd28ca58674c3b47c4fccfa44849fbf53413c..b1fcdf2a00d9e8c20152ed9e69bb15c2a1622990 100644
--- a/web/modules/honeypot/honeypot.module
+++ b/web/modules/honeypot/honeypot.module
@@ -6,8 +6,9 @@
*/
use Drupal\Core\Form\FormStateInterface;
-use Drupal\Component\Utility\Crypt;
use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Url;
+use Drupal\honeypot\Event\HoneypotRejectEvent;
/**
* Implements hook_help().
@@ -17,13 +18,13 @@ function honeypot_help($route_name, RouteMatchInterface $route_match) {
case 'help.page.honeypot':
$output = '';
$output .= '<h3>' . t('About') . '</h3>';
- $output .= '<p>' . t('The Honeypot module uses both the honeypot and timestamp methods of deterring spam bots from completing forms on your Drupal site. These methods are effective against many spam bots, and are not as intrusive as CAPTCHAs or other methods which punish the user. For more information, see the <a href=":url">online documentation for the Honeypot module</a>.', [':url' => 'https://www.drupal.org/docs/8/modules/honeypot']) . '</p>';
+ $output .= '<p>' . t('The Honeypot module uses both the honeypot and timestamp methods of deterring spam bots from completing forms on your Drupal site. These methods are effective against many spam bots, and are not as intrusive as CAPTCHAs or other methods which punish the user. For more information, see the <a href=":url">online documentation for the Honeypot module</a>.', [':url' => 'https://www.drupal.org/docs/contributed-modules/honeypot']) . '</p>';
$output .= '<h3>' . t('Uses') . '</h3>';
$output .= '<dl>';
$output .= '<dt>' . t('Configuring Honeypot') . '</dt>';
- $output .= '<dd>' . t('All settings for this module are on the Honeypot configuration page, under the Configuration section, in the Content authoring settings. You can visit the configuration page directly from the Honeypot configuration link below. The configuration settings are described in the <a href=":url">online documentation for the Honeypot module</a>.', [':url' => 'https://www.drupal.org/docs/8/modules/honeypot/using-honeypot']) . '</dd>';
+ $output .= '<dd>' . t('All settings for this module are on the Honeypot configuration page, under the Configuration section, in the Content authoring settings. You can visit the configuration page directly from the Honeypot configuration link below. The configuration settings are described in the <a href=":url">online documentation for the Honeypot module</a>.', [':url' => 'https://www.drupal.org/docs/contributed-modules/honeypot/using-honeypot']) . '</dd>';
$output .= '<dt>' . t('Setting up Honeypot in your own forms') . '</dt>';
- $output .= '<dd>' . t("Honeypot protection can be bypassed for certain user roles. For instance, site administrators, who just might be able to fill out a form in less than 5 seconds. And, Honeypot protection can be enabled only for certain forms. Or, it can protect all forms on the site. Finally, honeypot protection can be used in any of your own forms by simply including a little code snippet included on the module's project page.") . '</dd>';
+ $output .= '<dd>' . t("Honeypot protection can be bypassed for certain user roles. For instance, site administrators, who just might be able to fill out a form in less than 5 seconds. And, Honeypot protection can be enabled only for certain forms. Or, it can protect all forms on the site. Finally, honeypot protection can be used in any of your own forms by simply including a little code snippet included on the module's project page.") . '</dd>';
$output .= '</dl>';
return $output;
}
@@ -33,17 +34,41 @@ function honeypot_help($route_name, RouteMatchInterface $route_match) {
* Implements hook_cron().
*/
function honeypot_cron() {
- // Delete {honeypot_user} entries older than the value of honeypot_expire.
+ // Delete {honeypot_user} entries older than the value of 'expire'.
$expire_limit = \Drupal::config('honeypot.settings')->get('expire');
\Drupal::database()->delete('honeypot_user')
->condition('timestamp', \Drupal::time()->getRequestTime() - $expire_limit, '<')
->execute();
}
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
+function honeypot_form_system_performance_settings_alter(&$form, FormStateInterface $form_state, $form_id) {
+ // If time-based protection is effectively disabled, no need for a warning.
+ if (\Drupal::config('honeypot.settings')->get('time_limit') === 0) {
+ return;
+ }
+
+ // Add a warning about caching on the Performance settings page.
+ $description = '';
+ if (!empty($form['caching']['page_cache_maximum_age']['#description'])) {
+ // If there's existing description on 'caching' field, append a break to it
+ // so that our verbiage is on its own line.
+ $description .= $form['caching']['page_cache_maximum_age']['#description'] . '<br />';
+ }
+
+ $description .= t('<em>Page caching may be disabled on any pages where a form is present due to the <a href=":url">Honeypot module\'s configuration</a>.</em>', [
+ ':url' => Url::fromRoute('honeypot.config')->toString(),
+ ]);
+
+ $form['caching']['page_cache_maximum_age']['#description'] = $description;
+}
+
/**
* Implements hook_form_alter().
*
- * Add Honeypot features to forms enabled in the Honeypot admin interface.
+ * Adds Honeypot features to forms enabled in the Honeypot admin interface.
*/
function honeypot_form_alter(&$form, FormStateInterface $form_state, $form_id) {
// Don't use for maintenance mode forms (install, update, etc.).
@@ -65,275 +90,103 @@ function honeypot_form_alter(&$form, FormStateInterface $form_state, $form_id) {
// Don't protect system forms - only admins should have access, and system
// forms may be programmatically submitted by drush and other modules.
if (preg_match('/[^a-zA-Z]system_/', $form_id) === 0 && preg_match('/[^a-zA-Z]search_/', $form_id) === 0 && preg_match('/[^a-zA-Z]views_exposed_form_/', $form_id) === 0) {
- honeypot_add_form_protection($form, $form_state, ['honeypot', 'time_restriction']);
+ \Drupal::service('honeypot')->addFormProtection($form, $form_state, ['honeypot', 'time_restriction']);
}
}
-
- // Otherwise add form protection to admin-configured forms.
- elseif ($forms_to_protect = honeypot_get_protected_forms()) {
- foreach ($forms_to_protect as $protect_form_id) {
- // For most forms, do a straight check on the form ID.
- if ($form_id == $protect_form_id) {
- honeypot_add_form_protection($form, $form_state, ['honeypot', 'time_restriction']);
- }
- }
+ // Otherwise add form protection only to the admin-configured forms.
+ elseif (in_array($form_id, \Drupal::service('honeypot')->getProtectedForms())) {
+ // The $form_id of the form we're currently altering is found
+ // in the list of protected forms.
+ \Drupal::service('honeypot')->addFormProtection($form, $form_state, ['honeypot', 'time_restriction']);
}
}
/**
- * Build an array of all the protected forms on the site, by form_id.
+ * Builds an array of all the protected forms on the site.
+ *
+ * @return array
+ * An array whose values are the form_ids of all the protected forms
+ * on the site.
+ *
+ * @deprecated in honeypot:2.1.0 and is removed from honeypot:3.0.0. Use the
+ * 'honeypot' service instead. For example, \Drupal::service('honeypot')
+ * ->getProtectedForms().
+ *
+ * @see https://www.drupal.org/node/2949447
*/
function honeypot_get_protected_forms() {
- $forms = &drupal_static(__FUNCTION__);
-
- // If the data isn't already in memory, get from cache or look it up fresh.
- if (!isset($forms)) {
- if ($cache = \Drupal::cache()->get('honeypot_protected_forms')) {
- $forms = $cache->data;
- }
- else {
- $form_settings = \Drupal::config('honeypot.settings')->get('form_settings');
- if (!empty($form_settings)) {
- // Add each form that's enabled to the $forms array.
- foreach ($form_settings as $form_id => $enabled) {
- if ($enabled) {
- $forms[] = $form_id;
- }
- }
- }
- else {
- $forms = [];
- }
-
- // Save the cached data.
- \Drupal::cache()->set('honeypot_protected_forms', $forms);
- }
- }
-
- return $forms;
+ @trigger_error("honeypot_get_protected_forms() is deprecated in honeypot:2.1.0 and is removed from honeypot:3.0.0. Use the 'honeypot' service instead. For example, \Drupal::service('honeypot')->getProtectedForms(). See https://www.drupal.org/node/2949447", E_USER_DEPRECATED);
+ return \Drupal::service('honeypot')->getProtectedForms();
}
/**
* Form builder function to add different types of protection to forms.
*
* @param array $options
- * Array of options to be added to form. Currently accepts 'honeypot' and
- * 'time_restriction'.
- */
-function honeypot_add_form_protection(&$form, FormStateInterface $form_state, array $options = []) {
- $account = \Drupal::currentUser();
-
- // Allow other modules to alter the protections applied to this form.
- \Drupal::moduleHandler()->alter('honeypot_form_protections', $options, $form);
-
- // Don't add any protections if the user can bypass the Honeypot.
- if ($account->hasPermission('bypass honeypot protection')) {
- return;
- }
-
- // Build the honeypot element.
- if (in_array('honeypot', $options)) {
- // Get the element name (default is generic 'url').
- $honeypot_element = \Drupal::config('honeypot.settings')->get('element_name');
-
- // Build the honeypot element.
- $honeypot_class = $honeypot_element . '-textfield';
- $form[$honeypot_element] = [
- '#theme_wrappers' => [
- 0 => 'form_element',
- 'container' => [
- '#id' => NULL,
- '#attributes' => [
- 'class' => [
- $honeypot_class,
- ],
- 'style' => [
- 'display: none !important;',
- ],
- ],
- ],
- ],
- '#type' => 'textfield',
- '#title' => t('Leave this field blank'),
- '#size' => 20,
- '#weight' => -1,
- '#attributes' => ['autocomplete' => 'off'],
- '#element_validate' => ['_honeypot_honeypot_validate'],
- ];
-
- }
-
- // Set the time restriction for this form (if it's not disabled).
- if (in_array('time_restriction', $options) && \Drupal::config('honeypot.settings')->get('time_limit') != 0) {
- // Set the current time in a hidden value to be checked later.
- $input = $form_state->getUserInput();
- if (empty($input['honeypot_time'])) {
- $identifier = Crypt::randomBytesBase64();
- \Drupal::service('keyvalue.expirable')->get('honeypot_time_restriction')->setWithExpire($identifier, time(), 3600 * 24);
- }
- else {
- $identifier = $input['honeypot_time'];
- }
- $form['honeypot_time'] = [
- '#type' => 'hidden',
- '#title' => t('Timestamp'),
- '#weight' => -1,
- '#default_value' => $identifier,
- '#element_validate' => ['_honeypot_time_restriction_validate'],
- '#cache' => [
- 'max-age' => 0,
- ],
- ];
-
- // Disable page caching to make sure timestamp isn't cached.
- $account = \Drupal::currentUser();
- if ($account->id() == 0) {
- // TODO D8 - Use DIC? See: http://drupal.org/node/1539454
- // Should this now set 'omit_vary_cookie' instead?
- Drupal::service('page_cache_kill_switch')->trigger();
- }
- }
-
- // Allow other modules to react to addition of form protection.
- if (!empty($options)) {
- \Drupal::moduleHandler()->invokeAll('honeypot_add_form_protection', [$options, $form]);
- }
-}
-
-/**
- * Validate honeypot field.
- */
-function _honeypot_honeypot_validate($element, FormStateInterface $form_state) {
- // Get the honeypot field value.
- $honeypot_value = $element['#value'];
-
- // Make sure it's empty.
- if (!empty($honeypot_value) || $honeypot_value == '0') {
- _honeypot_log($form_state->getValue('form_id'), 'honeypot');
- $form_state->setErrorByName('', t('There was a problem with your form submission. Please refresh the page and try again.'));
- }
-}
-
-/**
- * Validate honeypot's time restriction field.
- */
-function _honeypot_time_restriction_validate($element, FormStateInterface $form_state) {
- if ($form_state->isProgrammed()) {
- // Don't do anything if the form was submitted programmatically.
- return;
- }
-
- $triggering_element = $form_state->getTriggeringElement();
- // Don't do anything if the triggering element is a preview button.
- if ($triggering_element['#value'] == t('Preview')) {
- return;
- }
-
- // Get the time value.
- $identifier = $form_state->getValue('honeypot_time', FALSE);
- $honeypot_time = \Drupal::service('keyvalue.expirable')->get('honeypot_time_restriction')->get($identifier, 0);
-
- // Get the honeypot_time_limit.
- $time_limit = honeypot_get_time_limit($form_state->getValues());
-
- // Make sure current time - (time_limit + form time value) is greater than 0.
- // If not, throw an error.
- if (!$honeypot_time || \Drupal::time()->getRequestTime() < ($honeypot_time + $time_limit)) {
- _honeypot_log($form_state->getValue('form_id'), 'honeypot_time');
- $time_limit = honeypot_get_time_limit();
- \Drupal::service('keyvalue.expirable')->get('honeypot_time_restriction')->setWithExpire($identifier, \Drupal::time()->getRequestTime(), 3600 * 24);
- $form_state->setErrorByName('', t('There was a problem with your form submission. Please wait @limit seconds and try again.', ['@limit' => $time_limit]));
- }
-}
-
-/**
- * Log blocked form submissions.
+ * (optional) Array of options to be added to form. Currently accepts
+ * 'honeypot' and 'time_restriction'.
*
- * @param string $form_id
- * Form ID for the form on which submission was blocked.
- * @param string $type
- * String indicating the reason the submission was blocked. Allowed values:
- * - honeypot: If honeypot field was filled in.
- * - honeypot_time: If form was completed before the configured time limit.
+ * @deprecated in honeypot:2.1.0 and is removed from honeypot:3.0.0. Use the
+ * 'honeypot' service instead. For example, \Drupal::service('honeypot')
+ * ->addFormProtection($form, $form_state, $options).
+ *
+ * @see https://www.drupal.org/node/2949447
*/
-function _honeypot_log($form_id, $type) {
- honeypot_log_failure($form_id, $type);
- if (\Drupal::config('honeypot.settings')->get('log')) {
- $variables = [
- '%form' => $form_id,
- '@cause' => ($type == 'honeypot') ? t('submission of a value in the honeypot field') : t('submission of the form in less than minimum required time'),
- ];
- \Drupal::logger('honeypot')->notice(t('Blocked submission of %form due to @cause.', $variables));
- }
+function honeypot_add_form_protection(&$form, FormStateInterface $form_state, array $options = []) {
+ @trigger_error("honeypot_add_form_protection() is deprecated in honeypot:2.1.0 and is removed from honeypot:3.0.0. Use the 'honeypot' service instead. For example, \Drupal::service('honeypot')->addFormProtection(\$form, \$form_state, \$options). See https://www.drupal.org/node/2949447", E_USER_DEPRECATED);
+ \Drupal::service('honeypot')->addFormProtection($form, $form_state, $options);
}
/**
- * Look up the time limit for the current user.
+ * Looks up the time limit for the current user.
*
* @param array $form_values
- * Array of form values (optional).
+ * (optional) Array of form values.
+ *
+ * @return int
+ * The time limit in seconds.
+ *
+ * @deprecated in honeypot:2.1.0 and is removed from honeypot:3.0.0. Use the
+ * 'honeypot' service instead. For example, \Drupal::service('honeypot')
+ * ->getTimeLimit($form_values).
+ *
+ * @see https://www.drupal.org/node/2949447
*/
function honeypot_get_time_limit(array $form_values = []) {
- $account = \Drupal::currentUser();
- $honeypot_time_limit = \Drupal::config('honeypot.settings')->get('time_limit');
-
- // Only calculate time limit if honeypot_time_limit has a value > 0.
- if ($honeypot_time_limit) {
- $expire_time = \Drupal::config('honeypot.settings')->get('expire');
-
- // Query the {honeypot_user} table to determine the number of failed
- // submissions for the current user.
- $uid = $account->id();
- $query = \Drupal::database()->select('honeypot_user', 'hu')
- ->condition('uid', $uid)
- ->condition('timestamp', \Drupal::time()->getRequestTime() - $expire_time, '>');
-
- // For anonymous users, take the hostname into account.
- if ($uid === 0) {
- $hostname = \Drupal::request()->getClientIp();
- $query->condition('hostname', $hostname);
- }
- $number = $query->countQuery()->execute()->fetchField();
-
- // Don't add more than 30 days' worth of extra time.
- $honeypot_time_limit = (int) min($honeypot_time_limit + exp($number) - 1, $expire_time);
- // TODO - Only accepts two args.
- $additions = \Drupal::moduleHandler()->invokeAll('honeypot_time_limit', [
- $honeypot_time_limit,
- $form_values,
- $number,
- ]);
- if (count($additions)) {
- $honeypot_time_limit += array_sum($additions);
- }
- }
- return $honeypot_time_limit;
+ @trigger_error("honeypot_get_time_limit() is deprecated in honeypot:2.1.0 and is removed from honeypot:3.0.0. Use the 'honeypot' service instead. For example, \Drupal::service('honeypot')->getTimeLimit(\$form_values). See https://www.drupal.org/node/2949447", E_USER_DEPRECATED);
+ return \Drupal::service('honeypot')->getTimeLimit($form_values);
}
/**
- * Log the failed submission with timestamp and hostname.
+ * Logs the failed submission with timestamp and hostname.
*
* @param string $form_id
* Form ID for the rejected form submission.
* @param string $type
* String indicating the reason the submission was blocked. Allowed values:
- * - honeypot: If honeypot field was filled in.
- * - honeypot_time: If form was completed before the configured time limit.
+ * - honeypot: If honeypot field was filled in.
+ * - honeypot_time: If form was completed before the configured time limit.
+ *
+ * @deprecated in honeypot:2.1.0 and is removed from honeypot:3.0.0. Use the
+ * 'honeypot' service instead. For example, \Drupal::service('honeypot')
+ * ->logFailure($form_id, $type).
+ *
+ * @see https://www.drupal.org/node/2949447
*/
function honeypot_log_failure($form_id, $type) {
- $account = \Drupal::currentUser();
- $uid = $account->id();
-
- // Log failed submissions.
- \Drupal::database()->insert('honeypot_user')
- ->fields([
- 'uid' => $uid,
- 'hostname' => Drupal::request()->getClientIp(),
- 'timestamp' => \Drupal::time()->getRequestTime(),
- ])
- ->execute();
+ @trigger_error("honeypot_log_failure() is deprecated in honeypot:2.1.0 and is removed from honeypot:3.0.0. Use the 'honeypot' service instead. For example, \Drupal::service('honeypot')->logFailure(\$form_id, \$type). See https://www.drupal.org/node/2949447", E_USER_DEPRECATED);
+ \Drupal::service('honeypot')->logFailure($form_id, $type);
+}
- // Allow other modules to react to honeypot rejections.
- // TODO - Only accepts two args.
- \Drupal::moduleHandler()->invokeAll('honeypot_reject', [$form_id, $uid, $type]);
+/**
+ * Implements hook_honeypot_reject().
+ *
+ * Generates an event when a form submission is rejected.
+ *
+ * @todo Only accepts two args - see above.
+ */
+function honeypot_honeypot_reject($form_id, $uid, $type) {
+ $event = new HoneypotRejectEvent($form_id, $uid, $type);
+ $event_dispatcher = \Drupal::service('event_dispatcher');
+ $event_dispatcher->dispatch($event, $event::EVENT_NAME);
}
diff --git a/web/modules/honeypot/honeypot.routing.yml b/web/modules/honeypot/honeypot.routing.yml
index 06c4963b1d8075c71566bb2cd041b54720ec93e4..62a294e3da22a09f172d5c38271b3bbd70d0778e 100644
--- a/web/modules/honeypot/honeypot.routing.yml
+++ b/web/modules/honeypot/honeypot.routing.yml
@@ -1,7 +1,7 @@
honeypot.config:
path: '/admin/config/content/honeypot'
defaults:
- _form: '\Drupal\honeypot\Controller\HoneypotSettingsController'
+ _form: '\Drupal\honeypot\Form\HoneypotSettingsForm'
_title: 'Honeypot configuration'
requirements:
_permission: 'administer honeypot'
diff --git a/web/modules/honeypot/honeypot.rules.events.yml b/web/modules/honeypot/honeypot.rules.events.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a1df634170661ef9daaaa8c68e0609ef0a249389
--- /dev/null
+++ b/web/modules/honeypot/honeypot.rules.events.yml
@@ -0,0 +1,13 @@
+honeypot.form_submission_rejected:
+ label: 'After rejecting a form submission'
+ category: 'Honeypot'
+ context_definitions:
+ form_id:
+ type: 'string'
+ label: 'Rejected form ID'
+ uid:
+ type: 'integer'
+ label: 'Rejected user ID'
+ type:
+ type: 'string'
+ label: 'Reason for rejection'
diff --git a/web/modules/honeypot/honeypot.services.yml b/web/modules/honeypot/honeypot.services.yml
new file mode 100644
index 0000000000000000000000000000000000000000..331a8c2bdb08362945bd1c4e31056fd96f359562
--- /dev/null
+++ b/web/modules/honeypot/honeypot.services.yml
@@ -0,0 +1,4 @@
+services:
+ honeypot:
+ class: Drupal\honeypot\HoneypotService
+ arguments: ['@current_user', '@module_handler', '@config.factory', '@keyvalue.expirable', '@page_cache_kill_switch', '@database', '@logger.factory', '@datetime.time', '@string_translation', '@cache.default', '@request_stack']
diff --git a/web/modules/honeypot/src/Event/HoneypotRejectEvent.php b/web/modules/honeypot/src/Event/HoneypotRejectEvent.php
new file mode 100644
index 0000000000000000000000000000000000000000..0ad0c74ee9428a659005245389febe0e57c37b71
--- /dev/null
+++ b/web/modules/honeypot/src/Event/HoneypotRejectEvent.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Drupal\honeypot\Event;
+
+use Drupal\Component\EventDispatcher\Event;
+
+/**
+ * Event that is fired when Honeypot rejects a form submission.
+ *
+ * @see hook_honeypot_reject()
+ */
+class HoneypotRejectEvent extends Event {
+
+ const EVENT_NAME = 'honeypot.form_submission_rejected';
+
+ /**
+ * Form ID of the form the user was disallowed from submitting.
+ *
+ * @var string
+ */
+ public $form_id;
+
+ /**
+ * The user account ID.
+ *
+ * @var int
+ */
+ public $uid;
+
+ /**
+ * String indicating the reason the submission was blocked.
+ *
+ * Allowed values:
+ * - honeypot: If honeypot field was filled in.
+ * - honeypot_time: If form was completed before the configured time limit.
+ *
+ * @var string
+ */
+ public $type;
+
+ /**
+ * Constructs the object.
+ *
+ * @param string $form_id
+ * Form ID of the form the user was disallowed from submitting.
+ * @param int $uid
+ * The account of the user after unblocking.
+ * @param string $type
+ * String indicating the reason the submission was blocked. Allowed values:
+ * - honeypot: If honeypot field was filled in.
+ * - honeypot_time: If form was completed before the configured time limit.
+ */
+ public function __construct($form_id, int $uid, $type) {
+ $this->form_id = $form_id;
+ $this->uid = $uid;
+ $this->type = $type;
+ }
+
+}
diff --git a/web/modules/honeypot/src/Controller/HoneypotSettingsController.php b/web/modules/honeypot/src/Form/HoneypotSettingsForm.php
similarity index 81%
rename from web/modules/honeypot/src/Controller/HoneypotSettingsController.php
rename to web/modules/honeypot/src/Form/HoneypotSettingsForm.php
index 18794d5a2acd857c5d935aa01bddbea6e8e9866d..040f12713c1bcbe653e53b22c5071f7ddb44d965 100644
--- a/web/modules/honeypot/src/Controller/HoneypotSettingsController.php
+++ b/web/modules/honeypot/src/Form/HoneypotSettingsForm.php
@@ -1,24 +1,21 @@
<?php
-namespace Drupal\honeypot\Controller;
+namespace Drupal\honeypot\Form;
use Drupal\Component\Utility\Html;
use Drupal\Core\Form\ConfigFormBase;
+use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Form\FormStateInterface;
-use Drupal\node\Entity\NodeType;
-use Drupal\comment\Entity\CommentType;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Messenger\MessengerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Returns responses for Honeypot module routes.
*/
-class HoneypotSettingsController extends ConfigFormBase {
+class HoneypotSettingsForm extends ConfigFormBase {
/**
* The module handler service.
@@ -48,13 +45,6 @@ class HoneypotSettingsController extends ConfigFormBase {
*/
protected $cache;
- /**
- * The Messenger service.
- *
- * @var \Drupal\Core\Messenger\MessengerInterface
- */
- protected $messenger;
-
/**
* Constructs a settings controller.
*
@@ -68,16 +58,13 @@ class HoneypotSettingsController extends ConfigFormBase {
* The entity type bundle info service.
* @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
* The cache backend interface.
- * @param \Drupal\Core\Messenger\MessengerInterface $messenger
- * The messenger service.
*/
- public function __construct(ConfigFactoryInterface $config_factory, ModuleHandlerInterface $module_handler, EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $entity_type_bundle_info, CacheBackendInterface $cache_backend, MessengerInterface $messenger) {
+ public function __construct(ConfigFactoryInterface $config_factory, ModuleHandlerInterface $module_handler, EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $entity_type_bundle_info, CacheBackendInterface $cache_backend) {
parent::__construct($config_factory);
$this->moduleHandler = $module_handler;
$this->entityTypeManager = $entity_type_manager;
$this->entityTypeBundleInfo = $entity_type_bundle_info;
$this->cache = $cache_backend;
- $this->messenger = $messenger;
}
/**
@@ -89,24 +76,15 @@ public static function create(ContainerInterface $container) {
$container->get('module_handler'),
$container->get('entity_type.manager'),
$container->get('entity_type.bundle.info'),
- $container->get('cache.default'),
- $container->get('messenger')
+ $container->get('cache.default')
);
}
/**
- * Get a value from the retrieved form settings array.
+ * {@inheritdoc}
*/
- public function getFormSettingsValue($form_settings, $form_id) {
- // If there are settings in the array and the form ID already has a setting,
- // return the saved setting for the form ID.
- if (!empty($form_settings) && isset($form_settings[$form_id])) {
- return $form_settings[$form_id];
- }
- // Default to false.
- else {
- return 0;
- }
+ public function getFormId() {
+ return 'honeypot_settings_form';
}
/**
@@ -116,18 +94,12 @@ protected function getEditableConfigNames() {
return ['honeypot.settings'];
}
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'honeypot_settings_form';
- }
-
/**
* {@inheritdoc}
*/
public function buildForm(array $form, FormStateInterface $form_state) {
// Honeypot Configuration.
+ $honeypot_config = $this->config('honeypot.settings');
$form['configuration'] = [
'#type' => 'fieldset',
'#title' => $this->t('Honeypot Configuration'),
@@ -138,36 +110,48 @@ public function buildForm(array $form, FormStateInterface $form_state) {
'#type' => 'checkbox',
'#title' => $this->t('Protect all forms with Honeypot'),
'#description' => $this->t('Enable Honeypot protection for ALL forms on this site (it is best to only enable Honeypot for the forms you need below).'),
- '#default_value' => $this->config('honeypot.settings')->get('protect_all_forms'),
+ '#default_value' => $honeypot_config->get('protect_all_forms'),
];
$form['configuration']['protect_all_forms']['#description'] .= '<br />' . $this->t('<strong>Page caching will be disabled on any page where a form is present if the Honeypot time limit is not set to 0.</strong>');
$form['configuration']['log'] = [
'#type' => 'checkbox',
'#title' => $this->t('Log blocked form submissions'),
'#description' => $this->t('Log submissions that are blocked due to Honeypot protection.'),
- '#default_value' => $this->config('honeypot.settings')->get('log'),
+ '#default_value' => $honeypot_config->get('log'),
];
$form['configuration']['element_name'] = [
'#type' => 'textfield',
'#title' => $this->t('Honeypot element name'),
- '#description' => $this->t("The name of the Honeypot form field. It's usually most effective to use a generic name like email, homepage, or link, but this should be changed if it interferes with fields that are already in your forms. Must not contain spaces or special characters."),
- '#default_value' => $this->config('honeypot.settings')->get('element_name'),
+ '#description' => $this->t("The name of the Honeypot form field. It's usually most effective to use a generic name like email, homepage, or link, but this should be changed if it interferes with fields that are already in your forms. Must not contain spaces or special characters. Should not contain words like 'honeypot', as these may allow a spam bot to identify the purpose of this field."),
+ '#default_value' => $honeypot_config->get('element_name'),
'#required' => TRUE,
'#size' => 30,
];
$form['configuration']['time_limit'] = [
- '#type' => 'textfield',
+ '#type' => 'number',
'#title' => $this->t('Honeypot time limit'),
'#description' => $this->t('Minimum time required before form should be considered entered by a human instead of a bot. Set to 0 to disable.'),
- '#default_value' => $this->config('honeypot.settings')->get('time_limit'),
+ '#default_value' => $honeypot_config->get('time_limit'),
'#required' => TRUE,
+ '#min' => 0,
'#size' => 5,
'#field_suffix' => $this->t('seconds'),
];
$form['configuration']['time_limit']['#description'] .= '<br />' . $this->t('<strong>Page caching will be disabled if there is a form protected by time limit on the page.</strong>');
+ $form['configuration']['expire'] = [
+ '#type' => 'number',
+ '#title' => $this->t('Honeypot expire'),
+ '#description' => $this->t("Entries in the {honeypot_user} table that are older than the value of 'expire' will be deleted when cron is run."),
+ '#default_value' => $honeypot_config->get('expire'),
+ '#required' => TRUE,
+ '#min' => 0,
+ '#size' => 5,
+ '#field_suffix' => $this->t('seconds'),
+ ];
+
// Honeypot Enabled forms.
- $form_settings = $this->config('honeypot.settings')->get('form_settings');
+ $form_settings = $honeypot_config->get('form_settings');
$form['form_settings'] = [
'#type' => 'fieldset',
'#title' => $this->t('Honeypot Enabled Forms'),
@@ -222,7 +206,8 @@ public function buildForm(array $form, FormStateInterface $form_state) {
// Node types for node forms.
if ($this->moduleHandler->moduleExists('node')) {
- $types = NodeType::loadMultiple();
+ /** @var \Drupal\Core\Config\Entity\ConfigEntityInterface[] $types */
+ $types = $this->entityTypeManager->getStorage('node_type')->loadMultiple();
if (!empty($types)) {
// Node forms.
$form['form_settings']['node_forms'] = ['#markup' => '<h5>' . $this->t('Node Forms') . '</h5>'];
@@ -239,7 +224,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
// Comment types for comment forms.
if ($this->moduleHandler->moduleExists('comment')) {
- $types = CommentType::loadMultiple();
+ $types = $this->entityTypeManager->getStorage('comment_type')->loadMultiple();
if (!empty($types)) {
$form['form_settings']['comment_forms'] = ['#markup' => '<h5>' . $this->t('Comment Forms') . '</h5>'];
foreach ($types as $type) {
@@ -262,35 +247,13 @@ public function buildForm(array $form, FormStateInterface $form_state) {
}
$form_state->setStorage(['keys' => $keys_to_save]);
- // For now, manually add submit button. Hopefully, by the time D8 is
- // released, there will be something like system_settings_form() in D7.
- $form['actions']['#type'] = 'container';
- $form['actions']['submit'] = [
- '#type' => 'submit',
- '#value' => $this->t('Save configuration'),
- ];
-
- return $form;
+ return parent::buildForm($form, $form_state);
}
/**
* {@inheritdoc}
*/
public function validateForm(array &$form, FormStateInterface $form_state) {
- // Make sure the time limit is a positive integer or 0.
- $time_limit = $form_state->getValue('time_limit');
- if ((is_numeric($time_limit) && $time_limit > 0) || $time_limit === '0') {
- if (ctype_digit($time_limit)) {
- // Good to go.
- }
- else {
- $form_state->setErrorByName('time_limit', $this->t("The time limit must be a positive integer or 0."));
- }
- }
- else {
- $form_state->setErrorByName('time_limit', $this->t("The time limit must be a positive integer or 0."));
- }
-
// Make sure Honeypot element name only contains A-Z, 0-9.
if (!preg_match("/^[-_a-zA-Z0-9]+$/", $form_state->getValue('element_name'))) {
$form_state->setErrorByName('element_name', $this->t("The element name cannot contain spaces or other special characters."));
@@ -334,8 +297,32 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
// Clear the honeypot protected forms cache.
$this->cache->delete('honeypot_protected_forms');
- // Tell the user the settings have been saved.
- $this->messenger->addMessage($this->t('The configuration options have been saved.'));
+ parent::submitForm($form, $form_state);
+ }
+
+ /**
+ * Gets a value from the retrieved form settings array.
+ *
+ * @param array $form_settings
+ * Array of configuration settings that Honeypot uses to determine which
+ * forms to protect. Keys are form IDs, values are boolean to indicate
+ * whether that form ID should be protected.
+ * @param string $form_id
+ * The Form ID.
+ *
+ * @return bool
+ * TRUE if the form is protected.
+ */
+ protected function getFormSettingsValue(array $form_settings, string $form_id) {
+ // If there are settings in the array and the form ID already has a setting,
+ // return the saved setting for the form ID.
+ if (!empty($form_settings) && isset($form_settings[$form_id])) {
+ return $form_settings[$form_id];
+ }
+ // Default to false.
+ else {
+ return FALSE;
+ }
}
}
diff --git a/web/modules/honeypot/src/HoneypotService.php b/web/modules/honeypot/src/HoneypotService.php
new file mode 100644
index 0000000000000000000000000000000000000000..c2b72dc0bd63b8e146661c6b90002e01fc5aa16c
--- /dev/null
+++ b/web/modules/honeypot/src/HoneypotService.php
@@ -0,0 +1,388 @@
+<?php
+
+namespace Drupal\honeypot;
+
+use Drupal\Component\Datetime\TimeInterface;
+use Drupal\Component\Utility\Crypt;
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Config\ConfigFactory;
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\KeyValueStore\KeyValueExpirableFactory;
+use Drupal\Core\Logger\LoggerChannelFactoryInterface;
+use Drupal\Core\PageCache\ResponsePolicy\KillSwitch;
+use Drupal\Core\Session\AccountProxyInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Core\StringTranslation\TranslationInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * Provides a service to append Honeypot protection to forms.
+ */
+class HoneypotService implements HoneypotServiceInterface {
+ use StringTranslationTrait;
+
+ /**
+ * Drupal account object.
+ *
+ * @var \Drupal\Core\Session\AccountProxyInterface
+ */
+ protected $account;
+
+ /**
+ * The module_handler service.
+ *
+ * @var \Drupal\Core\Extension\ModuleHandlerInterface
+ */
+ protected $moduleHandler;
+
+ /**
+ * Drupal configuration object factory service.
+ *
+ * @var \Drupal\Core\Config\ImmutableConfig
+ */
+ protected $config;
+
+ /**
+ * Drupal key value factory store factory.
+ *
+ * @var \Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface
+ */
+ protected $keyValue;
+
+ /**
+ * Killswitch policy object.
+ *
+ * @var \Drupal\Core\PageCache\ResponsePolicy\KillSwitch
+ */
+ protected $killSwitch;
+
+ /**
+ * The database connection to use.
+ *
+ * @var \Drupal\Core\Database\Connection
+ */
+ protected $connection;
+
+ /**
+ * The Honeypot logger channel.
+ *
+ * @var \Drupal\Core\Logger\LoggerChannelInterface
+ */
+ protected $logger;
+
+ /**
+ * The datetime.time service.
+ *
+ * @var \Drupal\Component\Datetime\TimeInterface
+ */
+ protected $timeService;
+
+ /**
+ * A cache backend interface.
+ *
+ * @var \Drupal\Core\Cache\CacheBackendInterface
+ */
+ protected $cacheBackend;
+
+ /**
+ * The request stack service.
+ *
+ * @var \Symfony\Component\HttpFoundation\RequestStack
+ */
+ protected $requestStack;
+
+ /**
+ * HoneypotService constructor.
+ *
+ * @param \Drupal\Core\Session\AccountProxyInterface $account
+ * Drupal account object.
+ * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+ * The module_handler service.
+ * @param \Drupal\Core\Config\ConfigFactory $config_factory
+ * Drupal configuration object factory service.
+ * @param \Drupal\Core\KeyValueStore\KeyValueExpirableFactory $key_value
+ * Drupal key value factory store factory.
+ * @param \Drupal\Core\PageCache\ResponsePolicy\KillSwitch $kill_switch
+ * Killswitch policy object.
+ * @param \Drupal\Core\Database\Connection $connection
+ * The database connection.
+ * @param \Drupal\Core\Logger\LoggerChannelFactoryInterface $logger_factory
+ * The logger.factory service.
+ * @param \Drupal\Component\Datetime\TimeInterface $time_service
+ * The datetime.time service.
+ * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
+ * The string translation service.
+ * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
+ * The cache backend interface.
+ * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
+ * The request stack service.
+ */
+ public function __construct(AccountProxyInterface $account, ModuleHandlerInterface $module_handler, ConfigFactory $config_factory, KeyValueExpirableFactory $key_value, KillSwitch $kill_switch, Connection $connection, LoggerChannelFactoryInterface $logger_factory, TimeInterface $time_service, TranslationInterface $string_translation, CacheBackendInterface $cache_backend, RequestStack $request_stack) {
+ $this->account = $account;
+ $this->moduleHandler = $module_handler;
+ $this->config = $config_factory->get('honeypot.settings');
+ $this->keyValue = $key_value->get('honeypot_time_restriction');
+ $this->killSwitch = $kill_switch;
+ $this->connection = $connection;
+ $this->logger = $logger_factory->get('honeypot');
+ $this->timeService = $time_service;
+ $this->stringTranslation = $string_translation;
+ $this->cacheBackend = $cache_backend;
+ $this->requestStack = $request_stack;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getProtectedForms(): array {
+ $forms = &drupal_static(__METHOD__);
+
+ // If the data isn't already in memory, get from cache or look it up fresh.
+ if (!isset($forms)) {
+ if ($cache = $this->cacheBackend->get('honeypot_protected_forms')) {
+ $forms = $cache->data;
+ }
+ else {
+ $forms = [];
+ $form_settings = $this->config->get('form_settings');
+ if (!empty($form_settings)) {
+ // Add each form that's enabled to the $forms array.
+ foreach ($form_settings as $form_id => $enabled) {
+ if ($enabled) {
+ $forms[] = $form_id;
+ }
+ }
+ }
+
+ // Save the cached data.
+ $this->cacheBackend->set('honeypot_protected_forms', $forms);
+ }
+ }
+
+ return $forms;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getTimeLimit(array $form_values = []): int {
+ $honeypot_time_limit = $this->config->get('time_limit');
+
+ // Only calculate time limit if honeypot_time_limit has a value > 0.
+ if ($honeypot_time_limit > 0) {
+ $expire_time = $this->config->get('expire');
+
+ // Query the {honeypot_user} table to determine the number of failed
+ // submissions for the current user.
+ $uid = $this->account->id();
+ $query = $this->connection->select('honeypot_user', 'hu')
+ ->condition('uid', $uid)
+ ->condition('timestamp', $this->timeService->getRequestTime() - $expire_time, '>');
+
+ // For anonymous users, take the hostname into account.
+ if ($uid === 0) {
+ $hostname = $this->requestStack->getCurrentRequest()->getClientIp();
+ $query->condition('hostname', $hostname);
+ }
+ $number = $query->countQuery()->execute()->fetchField();
+
+ // Don't add more time than the expiration window.
+ $honeypot_time_limit = (int) min($honeypot_time_limit + exp($number) - 1, $expire_time);
+ // @todo Only accepts two args.
+ $additions = $this->moduleHandler->invokeAll('honeypot_time_limit', [
+ $honeypot_time_limit,
+ $form_values,
+ $number,
+ ]);
+ if (count($additions)) {
+ $honeypot_time_limit += array_sum($additions);
+ }
+ }
+
+ return $honeypot_time_limit;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function addFormProtection(array &$form, FormStateInterface $form_state, array $options = []): void {
+ // Allow other modules to alter the protections applied to this form.
+ $this->moduleHandler->alter('honeypot_form_protections', $options, $form);
+
+ // Don't add any protections if the user can bypass the Honeypot.
+ if ($this->account->hasPermission('bypass honeypot protection')) {
+ return;
+ }
+
+ // Build the honeypot element.
+ if (in_array('honeypot', $options)) {
+ // Get the element name (default is generic 'url').
+ $honeypot_element = $this->config->get('element_name');
+
+ // Build the honeypot element.
+ $honeypot_class = $honeypot_element . '-textfield';
+ $form[$honeypot_element] = [
+ '#theme_wrappers' => [
+ 0 => 'form_element',
+ 'container' => [
+ '#id' => NULL,
+ '#attributes' => [
+ 'class' => [$honeypot_class],
+ 'style' => ['display: none !important;'],
+ ],
+ ],
+ ],
+ '#type' => 'textfield',
+ '#title' => $this->t('Leave this field blank'),
+ '#size' => 20,
+ '#weight' => 1,
+ '#attributes' => ['autocomplete' => 'off'],
+ '#element_validate' => [
+ [$this, 'validateHoneypot'],
+ ],
+ ];
+
+ }
+
+ // Set the time restriction for this form (if it's not disabled).
+ if (in_array('time_restriction', $options) && $this->config->get('time_limit') != 0) {
+ // Set the current time in a hidden value to be checked later.
+ $input = $form_state->getUserInput();
+ if (empty($input['honeypot_time'])) {
+ $identifier = Crypt::randomBytesBase64();
+ $this->keyValue->setWithExpire($identifier, $this->timeService->getCurrentTime(), 3600 * 24);
+ }
+ else {
+ $identifier = $input['honeypot_time'];
+ }
+ $form['honeypot_time'] = [
+ '#type' => 'hidden',
+ '#title' => $this->t('Timestamp'),
+ '#default_value' => $identifier,
+ '#element_validate' => [
+ [$this, 'validateTimeRestriction'],
+ ],
+ '#cache' => ['max-age' => 0],
+ ];
+
+ // Disable page caching to make sure timestamp isn't cached.
+ if ($this->account->id() == 0) {
+ // @todo D8 - Use DIC?
+ // @see https://www.drupal.org/node/1539454
+ // Should this now set 'omit_vary_cookie' instead?
+ $this->killSwitch->trigger();
+ }
+ }
+
+ // Allow other modules to react to addition of form protection.
+ if (!empty($options)) {
+ $this->moduleHandler->invokeAll('honeypot_add_form_protection', [$options, $form]);
+ }
+ }
+
+ /**
+ * An #element_validate callback for the honeypot field.
+ *
+ * @param array $element
+ * An associative array containing the properties and children of the
+ * generic form element.
+ * @param \Drupal\Core\Form\FormStateInterface $form_state
+ * The current state of the form.
+ * @param array $complete_form
+ * The complete form structure.
+ */
+ public function validateHoneypot(array &$element, FormStateInterface $form_state, array &$complete_form): void {
+ // Get the honeypot field value.
+ $honeypot_value = $element['#value'];
+
+ // Make sure it's empty.
+ if (!empty($honeypot_value) || $honeypot_value == '0') {
+ $this->log($form_state->getValue('form_id'), 'honeypot');
+ $form_state->setErrorByName('', $this->t('There was a problem with your form submission. Please refresh the page and try again.'));
+ }
+ }
+
+ /**
+ * An #element_validate callback for the honeypot time restriction field.
+ *
+ * @param array $element
+ * An associative array containing the properties and children of the
+ * generic form element.
+ * @param \Drupal\Core\Form\FormStateInterface $form_state
+ * The current state of the form.
+ * @param array $complete_form
+ * The complete form structure.
+ */
+ public function validateTimeRestriction(array &$element, FormStateInterface $form_state, array &$complete_form): void {
+ if ($form_state->isProgrammed()) {
+ // Don't do anything if the form was submitted programmatically.
+ return;
+ }
+
+ $triggering_element = $form_state->getTriggeringElement();
+ // Don't do anything if the triggering element is a preview button.
+ if ($triggering_element['#value'] == $this->t('Preview')) {
+ return;
+ }
+
+ // Get the time value.
+ $identifier = $form_state->getValue('honeypot_time', FALSE);
+ $honeypot_time = $this->keyValue->get($identifier, 0);
+
+ // Get the honeypot_time_limit.
+ $time_limit = $this->getTimeLimit($form_state->getValues());
+
+ // Make sure current time - (time_limit + form time value) is greater
+ // than 0. If not, throw an error.
+ if (!$honeypot_time || $this->timeService->getRequestTime() < ($honeypot_time + $time_limit)) {
+ $this->log($form_state->getValue('form_id'), 'honeypot_time');
+ $time_limit = $this->getTimeLimit();
+ $this->keyValue->setWithExpire($identifier, $this->timeService->getRequestTime(), 3600 * 24);
+ $form_state->setErrorByName('', $this->t('There was a problem with your form submission. Please wait @limit seconds and try again.', ['@limit' => $time_limit]));
+ }
+ }
+
+ /**
+ * Logs blocked form submissions.
+ *
+ * @param string $form_id
+ * Form ID for the form on which submission was blocked.
+ * @param string $type
+ * String indicating the reason the submission was blocked. Allowed values:
+ * - honeypot: If honeypot field was filled in.
+ * - honeypot_time: If form was completed before the configured time limit.
+ */
+ protected function log(string $form_id, string $type): void {
+ $this->logFailure($form_id, $type);
+ if ($this->config->get('log')) {
+ $variables = [
+ '%form' => $form_id,
+ '@cause' => ($type == 'honeypot') ? $this->t('submission of a value in the honeypot field') : $this->t('submission of the form in less than minimum required time'),
+ ];
+ $this->logger->notice('Blocked submission of %form due to @cause.', $variables);
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function logFailure(string $form_id, string $type): void {
+ $uid = $this->account->id();
+
+ // Log failed submissions.
+ $this->connection->insert('honeypot_user')
+ ->fields([
+ 'uid' => $uid,
+ 'hostname' => $this->requestStack->getCurrentRequest()->getClientIp(),
+ 'timestamp' => $this->timeService->getRequestTime(),
+ ])
+ ->execute();
+
+ // Allow other modules to react to honeypot rejections.
+ // @todo Only accepts two args.
+ $this->moduleHandler->invokeAll('honeypot_reject', [$form_id, $uid, $type]);
+ }
+
+}
diff --git a/web/modules/honeypot/src/HoneypotServiceInterface.php b/web/modules/honeypot/src/HoneypotServiceInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..d0bcd567e8454dddd3d0ed0f6cae408533ed0bcc
--- /dev/null
+++ b/web/modules/honeypot/src/HoneypotServiceInterface.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Drupal\honeypot;
+
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Provides a service to append Honeypot protection to forms.
+ */
+interface HoneypotServiceInterface {
+
+ /**
+ * Builds an array of all the protected forms on the site.
+ *
+ * @return array
+ * An array whose values are the form_ids of all the protected forms
+ * on the site.
+ */
+ public function getProtectedForms(): array;
+
+ /**
+ * Looks up the time limit for the current user.
+ *
+ * @param array $form_values
+ * (optional) Array of form values.
+ *
+ * @return int
+ * The time limit in seconds.
+ */
+ public function getTimeLimit(array $form_values = []): int;
+
+ /**
+ * Adds honeypot protection to provided form.
+ *
+ * @param array $form
+ * Drupal form array.
+ * @param \Drupal\Core\Form\FormStateInterface $form_state
+ * Drupal form state object.
+ * @param array $options
+ * (optional) Array of options to be added to form. Currently accepts
+ * 'honeypot' and 'time_restriction'.
+ */
+ public function addFormProtection(array &$form, FormStateInterface $form_state, array $options = []): void;
+
+ /**
+ * Logs the failed submission with timestamp and hostname.
+ *
+ * @param string $form_id
+ * Form ID for the rejected form submission.
+ * @param string $type
+ * String indicating the reason the submission was blocked. Allowed values:
+ * - honeypot: If honeypot field was filled in.
+ * - honeypot_time: If form was completed before the configured time limit.
+ */
+ public function logFailure(string $form_id, string $type): void;
+
+}
diff --git a/web/modules/honeypot/tests/modules/honeypot_test/honeypot_test.info.yml b/web/modules/honeypot/tests/modules/honeypot_test/honeypot_test.info.yml
index 0e0777c6118e249f791b4a2dca9bf1b08c3212d8..68ba249c2c8f38d294c4aa765990c05fd9e1a0b9 100644
--- a/web/modules/honeypot/tests/modules/honeypot_test/honeypot_test.info.yml
+++ b/web/modules/honeypot/tests/modules/honeypot_test/honeypot_test.info.yml
@@ -3,7 +3,7 @@ type: module
description: Support module for Honeypot internal testing purposes.
package: Testing
-# Information added by Drupal.org packaging script on 2020-08-19
-version: '2.0.1'
+# Information added by Drupal.org packaging script on 2022-05-07
+version: '2.1.0'
project: 'honeypot'
-datestamp: 1597855130
+datestamp: 1651894956
diff --git a/web/modules/honeypot/tests/modules/honeypot_test/src/Controller/HoneypotTestController.php b/web/modules/honeypot/tests/modules/honeypot_test/src/Controller/HoneypotTestController.php
index 56844615b273d644c49ac46ec83abd69b201f079..a9d2e9f47cd094292a86bf9b98dc6ae4b744cd6e 100644
--- a/web/modules/honeypot/tests/modules/honeypot_test/src/Controller/HoneypotTestController.php
+++ b/web/modules/honeypot/tests/modules/honeypot_test/src/Controller/HoneypotTestController.php
@@ -2,16 +2,42 @@
namespace Drupal\honeypot_test\Controller;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\Form\FormBuilderInterface;
use Drupal\Core\Form\FormState;
+use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\JsonResponse;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
/**
* Controller for honeypot_test routes.
*/
-class HoneypotTestController {
+class HoneypotTestController implements ContainerInjectionInterface {
- use StringTranslationTrait;
+ /**
+ * The form_builder service.
+ *
+ * @var \Drupal\Core\Form\FormBuilderInterface
+ */
+ protected $formBuilder;
+
+ /**
+ * Constructs a HoneypotTestController.
+ *
+ * @param \Drupal\Core\Form\FormBuilderInterface $form_builder
+ * The form builder service.
+ */
+ public function __construct(FormBuilderInterface $form_builder) {
+ $this->formBuilder = $form_builder;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function create(ContainerInterface $container) {
+ return new static(
+ $container->get('form_builder')
+ );
+ }
/**
* Page that triggers a programmatic form submission.
@@ -23,10 +49,10 @@ public function submitFormPage() {
$values = [
'name' => 'robo-user',
'mail' => 'robouser@example.com',
- 'op' => $this->t('Submit'),
+ 'op' => 'Submit',
];
$form_state->setValues($values);
- \Drupal::formBuilder()->submitForm('\Drupal\user\Form\UserPasswordForm', $form_state);
+ $this->formBuilder->submitForm('\Drupal\user\Form\UserPasswordForm', $form_state);
return new JsonResponse($form_state->getErrors());
}
diff --git a/web/modules/honeypot/tests/src/Functional/HoneypotAdminFormTest.php b/web/modules/honeypot/tests/src/Functional/HoneypotAdminFormTest.php
index e46d2b7800e0b7d64ac52b27ad1b9e1f020a02b0..6b9cc7a46398355172dacd381ebd97446ab7b6c7 100644
--- a/web/modules/honeypot/tests/src/Functional/HoneypotAdminFormTest.php
+++ b/web/modules/honeypot/tests/src/Functional/HoneypotAdminFormTest.php
@@ -3,7 +3,6 @@
namespace Drupal\Tests\honeypot\Functional;
use Drupal\Tests\BrowserTestBase;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
/**
* Test Honeypot spam protection admin form functionality.
@@ -12,8 +11,6 @@
*/
class HoneypotAdminFormTest extends BrowserTestBase {
- use StringTranslationTrait;
-
/**
* Admin user.
*
@@ -22,24 +19,19 @@ class HoneypotAdminFormTest extends BrowserTestBase {
protected $adminUser;
/**
- * Default theme.
- *
- * @var string
+ * {@inheritdoc}
*/
protected $defaultTheme = 'stark';
/**
- * Modules to enable.
- *
- * @var array
+ * {@inheritdoc}
*/
- public static $modules = ['honeypot'];
+ protected static $modules = ['honeypot'];
/**
- * Setup before test.
+ * {@inheritdoc}
*/
- public function setUp() {
- // Enable modules required for this test.
+ protected function setUp(): void {
parent::setUp();
// Set up admin user.
@@ -52,35 +44,41 @@ public function setUp() {
/**
* Test a valid element name.
*/
- public function testElementNameUpdateSuccess() {
+ public function testElementNameUpdateSuccess(): void {
+ /** @var \Drupal\Tests\WebAssert $assert */
+ $assert = $this->assertSession();
+
// Log in the admin user.
$this->drupalLogin($this->adminUser);
// Set up form and submit it.
$edit['element_name'] = "test";
- $this->drupalPostForm('admin/config/content/honeypot', $edit, $this->t('Save configuration'));
+ $this->drupalGet('admin/config/content/honeypot');
+ $this->submitForm($edit, 'Save configuration');
// Form should have been submitted successfully.
- $this->assertSession()->pageTextContains('The configuration options have been saved.');
+ $assert->pageTextContains('The configuration options have been saved.');
// Set up form and submit it.
$edit['element_name'] = "test-1";
- $this->drupalPostForm('admin/config/content/honeypot', $edit, $this->t('Save configuration'));
+ $this->drupalGet('admin/config/content/honeypot');
+ $this->submitForm($edit, 'Save configuration');
// Form should have been submitted successfully.
- $this->assertSession()->pageTextContains('The configuration options have been saved.');
+ $assert->pageTextContains('The configuration options have been saved.');
}
/**
* Test an invalid element name (invalid first character).
*/
- public function testElementNameUpdateFirstCharacterFail() {
+ public function testElementNameUpdateFirstCharacterFail(): void {
// Log in the admin user.
$this->drupalLogin($this->adminUser);
// Set up form and submit it.
$edit['element_name'] = "1test";
- $this->drupalPostForm('admin/config/content/honeypot', $edit, $this->t('Save configuration'));
+ $this->drupalGet('admin/config/content/honeypot');
+ $this->submitForm($edit, 'Save configuration');
// Form submission should fail.
$this->assertSession()->pageTextContains('The element name must start with a letter.');
@@ -89,23 +87,28 @@ public function testElementNameUpdateFirstCharacterFail() {
/**
* Test an invalid element name (invalid character in name).
*/
- public function testElementNameUpdateInvalidCharacterFail() {
+ public function testElementNameUpdateInvalidCharacterFail(): void {
+ /** @var \Drupal\Tests\WebAssert $assert */
+ $assert = $this->assertSession();
+
// Log in the admin user.
$this->drupalLogin($this->adminUser);
// Set up form and submit it.
$edit['element_name'] = "special-character-&";
- $this->drupalPostForm('admin/config/content/honeypot', $edit, $this->t('Save configuration'));
+ $this->drupalGet('admin/config/content/honeypot');
+ $this->submitForm($edit, 'Save configuration');
// Form submission should fail.
- $this->assertSession()->pageTextContains('The element name cannot contain spaces or other special characters.');
+ $assert->pageTextContains('The element name cannot contain spaces or other special characters.');
// Set up form and submit it.
$edit['element_name'] = "space in name";
- $this->drupalPostForm('admin/config/content/honeypot', $edit, $this->t('Save configuration'));
+ $this->drupalGet('admin/config/content/honeypot');
+ $this->submitForm($edit, 'Save configuration');
// Form submission should fail.
- $this->assertSession()->pageTextContains('The element name cannot contain spaces or other special characters.');
+ $assert->pageTextContains('The element name cannot contain spaces or other special characters.');
}
}
diff --git a/web/modules/honeypot/tests/src/Functional/HoneypotFormCacheTest.php b/web/modules/honeypot/tests/src/Functional/HoneypotFormCacheTest.php
index 69ccb5d1a943957158c908cb557c2f9aed5d0380..1c3ed6b73da663df78a444da342b633c20447518 100644
--- a/web/modules/honeypot/tests/src/Functional/HoneypotFormCacheTest.php
+++ b/web/modules/honeypot/tests/src/Functional/HoneypotFormCacheTest.php
@@ -16,13 +16,10 @@
* @group honeypot
*/
class HoneypotFormCacheTest extends BrowserTestBase {
-
use CommentTestTrait;
/**
- * Default theme.
- *
- * @var string
+ * {@inheritdoc}
*/
protected $defaultTheme = 'stark';
@@ -34,16 +31,14 @@ class HoneypotFormCacheTest extends BrowserTestBase {
protected $node;
/**
- * Modules to enable.
- *
- * @var array
+ * {@inheritdoc}
*/
- public static $modules = ['honeypot', 'node', 'comment', 'contact'];
+ protected static $modules = ['honeypot', 'node', 'comment', 'contact'];
/**
* {@inheritdoc}
*/
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
// Set up required Honeypot configuration.
@@ -73,7 +68,10 @@ protected function setUp() {
/**
* Test enabling and disabling of page cache based on time limit settings.
*/
- public function testCacheContactForm() {
+ public function testCacheContactForm(): void {
+ /** @var \Drupal\Tests\WebAssert $assert */
+ $assert = $this->assertSession();
+
// Create a Website feedback contact form.
$feedback_form = ContactForm::create([
'id' => 'feedback',
@@ -96,7 +94,7 @@ public function testCacheContactForm() {
// Test on cache header with time limit enabled, cache should miss.
$this->drupalGet('contact/feedback');
- $this->assertEquals('', $this->drupalGetHeader('X-Drupal-Cache'), 'Page was not cached.');
+ $assert->responseHeaderEquals('X-Drupal-Cache', NULL);
// Disable time limit.
\Drupal::configFactory()->getEditable('honeypot.settings')->set('time_limit', 0)->save();
@@ -105,18 +103,21 @@ public function testCacheContactForm() {
$this->drupalGet('contact/feedback');
// Test on cache header with time limit disabled, cache should hit.
$this->drupalGet('contact/feedback');
- $this->assertEquals('HIT', $this->drupalGetHeader('X-Drupal-Cache'), 'Page was cached.');
+ $assert->responseHeaderEquals('X-Drupal-Cache', 'HIT');
// Re-enable the time limit, we should not be seeing the cached version.
\Drupal::configFactory()->getEditable('honeypot.settings')->set('time_limit', 5)->save();
$this->drupalGet('contact/feedback');
- $this->assertEquals('', $this->drupalGetHeader('X-Drupal-Cache'), 'Page was not cached.');
+ $assert->responseHeaderEquals('X-Drupal-Cache', NULL);
}
/**
* Test enabling and disabling of page cache based on time limit settings.
*/
- public function testCacheCommentForm() {
+ public function testCacheCommentForm(): void {
+ /** @var \Drupal\Tests\WebAssert $assert */
+ $assert = $this->assertSession();
+
// Set up example node.
$this->node = $this->drupalCreateNode([
'type' => 'article',
@@ -134,7 +135,7 @@ public function testCacheCommentForm() {
// Test on cache header with time limit enabled, cache should miss.
$this->drupalGet('node/' . $this->node->id());
- $this->assertEquals('', $this->drupalGetHeader('X-Drupal-Cache'), 'Page was not cached.');
+ $assert->responseHeaderEquals('X-Drupal-Cache', NULL);
// Disable time limit.
\Drupal::configFactory()->getEditable('honeypot.settings')->set('time_limit', 0)->save();
@@ -144,8 +145,7 @@ public function testCacheCommentForm() {
// Test on cache header with time limit disabled, cache should hit.
$this->drupalGet('node/' . $this->node->id());
- $this->assertEquals('HIT', $this->drupalGetHeader('X-Drupal-Cache'), 'Page was cached.');
-
+ $assert->responseHeaderEquals('X-Drupal-Cache', 'HIT');
}
}
diff --git a/web/modules/honeypot/tests/src/Functional/HoneypotFormProgrammaticSubmissionTest.php b/web/modules/honeypot/tests/src/Functional/HoneypotFormProgrammaticSubmissionTest.php
index 50996ecc3cedef548223aa3a34848198cc9062c5..256e306d07f1ce579d236e61a286dc38dedd1c3c 100644
--- a/web/modules/honeypot/tests/src/Functional/HoneypotFormProgrammaticSubmissionTest.php
+++ b/web/modules/honeypot/tests/src/Functional/HoneypotFormProgrammaticSubmissionTest.php
@@ -13,23 +13,19 @@
class HoneypotFormProgrammaticSubmissionTest extends BrowserTestBase {
/**
- * Default theme.
- *
- * @var string
+ * {@inheritdoc}
*/
protected $defaultTheme = 'stark';
/**
- * Modules to enable.
- *
- * @var array
+ * {@inheritdoc}
*/
- public static $modules = ['honeypot', 'honeypot_test', 'user'];
+ protected static $modules = ['honeypot', 'honeypot_test', 'user'];
/**
* {@inheritdoc}
*/
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
// Set up required Honeypot configuration.
@@ -46,7 +42,7 @@ protected function setUp() {
/**
* Trigger a programmatic form submission and verify the validation errors.
*/
- public function testProgrammaticFormSubmission() {
+ public function testProgrammaticFormSubmission(): void {
$result = $this->drupalGet('/honeypot_test/submit_form');
$form_errors = (array) Json::decode($result);
$this->assertSession()->responseNotContains('There was a problem with your form submission. Please wait 6 seconds and try again.');
diff --git a/web/modules/honeypot/tests/src/Functional/HoneypotFormTest.php b/web/modules/honeypot/tests/src/Functional/HoneypotFormTest.php
index 0477d50d4650b0462cad232a6d7ef95be41222ee..fe3483905b44b12348d9f716806601a7d17016dc 100644
--- a/web/modules/honeypot/tests/src/Functional/HoneypotFormTest.php
+++ b/web/modules/honeypot/tests/src/Functional/HoneypotFormTest.php
@@ -5,7 +5,6 @@
use Drupal\comment\Tests\CommentTestTrait;
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
use Drupal\contact\Entity\ContactForm;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
use Drupal\Tests\BrowserTestBase;
use Drupal\user\UserInterface;
@@ -15,9 +14,7 @@
* @group honeypot
*/
class HoneypotFormTest extends BrowserTestBase {
-
use CommentTestTrait;
- use StringTranslationTrait;
/**
* Admin user.
@@ -41,24 +38,19 @@ class HoneypotFormTest extends BrowserTestBase {
protected $node;
/**
- * Default theme.
- *
- * @var string
+ * {@inheritdoc}
*/
protected $defaultTheme = 'stark';
/**
- * Modules to enable.
- *
- * @var array
+ * {@inheritdoc}
*/
- public static $modules = ['honeypot', 'node', 'comment', 'contact'];
+ protected static $modules = ['honeypot', 'node', 'comment', 'contact'];
/**
* {@inheritdoc}
*/
- public function setUp() {
- // Enable modules required for this test.
+ protected function setUp(): void {
parent::setUp();
// Set up required Honeypot configuration.
@@ -114,7 +106,7 @@ public function setUp() {
/**
* Make sure user login form is not protected.
*/
- public function testUserLoginNotProtected() {
+ public function testUserLoginNotProtected(): void {
$this->drupalGet('user');
$this->assertSession()->responseNotContains('id="edit-url" name="url"');
}
@@ -122,11 +114,12 @@ public function testUserLoginNotProtected() {
/**
* Test user registration (anonymous users).
*/
- public function testProtectRegisterUserNormal() {
+ public function testProtectRegisterUserNormal(): void {
// Set up form and submit it.
$edit['name'] = $this->randomMachineName();
$edit['mail'] = $edit['name'] . '@example.com';
- $this->drupalPostForm('user/register', $edit, $this->t('Create new account'));
+ $this->drupalGet('user/register');
+ $this->submitForm($edit, 'Create new account');
// Form should have been submitted successfully.
$this->assertSession()->pageTextContains('A welcome message with further instructions has been sent to your email address.');
@@ -135,12 +128,13 @@ public function testProtectRegisterUserNormal() {
/**
* Test for user register honeypot filled.
*/
- public function testProtectUserRegisterHoneypotFilled() {
+ public function testProtectUserRegisterHoneypotFilled(): void {
// Set up form and submit it.
$edit['name'] = $this->randomMachineName();
$edit['mail'] = $edit['name'] . '@example.com';
$edit['url'] = 'http://www.example.com/';
- $this->drupalPostForm('user/register', $edit, $this->t('Create new account'));
+ $this->drupalGet('user/register');
+ $this->submitForm($edit, 'Create new account');
// Form should have error message.
$this->assertSession()->pageTextContains('There was a problem with your form submission. Please refresh the page and try again.');
@@ -149,7 +143,11 @@ public function testProtectUserRegisterHoneypotFilled() {
/**
* Test for user register too fast.
*/
- public function testProtectRegisterUserTooFast() {
+ public function testProtectRegisterUserTooFast(): void {
+ /** @var \Drupal\Tests\WebAssert $assert */
+ $assert = $this->assertSession();
+
+ // Set the time limit to 1 second.
\Drupal::configFactory()->getEditable('honeypot.settings')->set('time_limit', 1)->save();
// First attempt a submission that does not trigger honeypot.
@@ -157,8 +155,8 @@ public function testProtectRegisterUserTooFast() {
$edit['mail'] = $edit['name'] . '@example.com';
$this->drupalGet('user/register');
sleep(2);
- $this->drupalPostForm(NULL, $edit, $this->t('Create new account'));
- $this->assertNoText($this->t('There was a problem with your form submission.'));
+ $this->submitForm($edit, 'Create new account');
+ $assert->pageTextNotContains('There was a problem with your form submission.');
// Set the time limit a bit higher so we can trigger honeypot.
\Drupal::configFactory()->getEditable('honeypot.settings')->set('time_limit', 5)->save();
@@ -166,7 +164,8 @@ public function testProtectRegisterUserTooFast() {
// Set up form and submit it.
$edit['name'] = $this->randomMachineName();
$edit['mail'] = $edit['name'] . '@example.com';
- $this->drupalPostForm('user/register', $edit, $this->t('Create new account'));
+ $this->drupalGet('user/register');
+ $this->submitForm($edit, 'Create new account');
// Form should have error message.
$this->assertSession()->pageTextContains('There was a problem with your form submission. Please wait 6 seconds and try again.');
@@ -175,7 +174,7 @@ public function testProtectRegisterUserTooFast() {
/**
* Test that any (not-strict-empty) value triggers protection.
*/
- public function testStrictEmptinessOnHoneypotField() {
+ public function testStrictEmptinessOnHoneypotField(): void {
// Initialise the form values.
$edit['name'] = $this->randomMachineName();
$edit['mail'] = $edit['name'] . '@example.com';
@@ -183,15 +182,18 @@ public function testStrictEmptinessOnHoneypotField() {
// Any value that is not strictly empty should trigger Honeypot.
foreach (['0', ' '] as $value) {
$edit['url'] = $value;
- $this->drupalPostForm('user/register', $edit, $this->t('Create new account'));
- $this->assertText($this->t('There was a problem with your form submission. Please refresh the page and try again.'), "Honeypot protection is triggered when the honeypot field contains '{$value}'.");
+ $this->drupalGet('user/register');
+ $this->submitForm($edit, 'Create new account');
+ // Assert that Honeypot protection is triggered when the honeypot field
+ // contains $value.
+ $this->assertSession()->pageTextContains('There was a problem with your form submission. Please refresh the page and try again.');
}
}
/**
* Test comment form protection.
*/
- public function testProtectCommentFormNormal() {
+ public function testProtectCommentFormNormal(): void {
$comment = 'Test comment.';
// Disable time limit for honeypot.
@@ -202,14 +204,15 @@ public function testProtectCommentFormNormal() {
// Set up form and submit it.
$edit["comment_body[0][value]"] = $comment;
- $this->drupalPostForm('comment/reply/node/' . $this->node->id() . '/comment', $edit, $this->t('Save'));
+ $this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment');
+ $this->submitForm($edit, 'Save');
$this->assertSession()->pageTextContains('Your comment has been queued for review');
}
/**
* Test for comment form honeypot filled.
*/
- public function testProtectCommentFormHoneypotFilled() {
+ public function testProtectCommentFormHoneypotFilled(): void {
$comment = 'Test comment.';
// Log in the web user.
@@ -218,14 +221,15 @@ public function testProtectCommentFormHoneypotFilled() {
// Set up form and submit it.
$edit["comment_body[0][value]"] = $comment;
$edit['url'] = 'http://www.example.com/';
- $this->drupalPostForm('comment/reply/node/' . $this->node->id() . '/comment', $edit, $this->t('Save'));
+ $this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment');
+ $this->submitForm($edit, 'Save');
$this->assertSession()->pageTextContains('There was a problem with your form submission. Please refresh the page and try again.');
}
/**
* Test for comment form honeypot bypass.
*/
- public function testProtectCommentFormHoneypotBypass() {
+ public function testProtectCommentFormHoneypotBypass(): void {
// Log in the admin user.
$this->drupalLogin($this->adminUser);
@@ -237,7 +241,7 @@ public function testProtectCommentFormHoneypotBypass() {
/**
* Test node form protection.
*/
- public function testProtectNodeFormTooFast() {
+ public function testProtectNodeFormTooFast(): void {
// Log in the admin user.
$this->drupalLogin($this->webUser);
@@ -246,27 +250,29 @@ public function testProtectNodeFormTooFast() {
// Set up the form and submit it.
$edit["title[0][value]"] = 'Test Page';
- $this->drupalPostForm('node/add/article', $edit, $this->t('Save'));
+ $this->drupalGet('node/add/article');
+ $this->submitForm($edit, 'Save');
$this->assertSession()->pageTextContains('There was a problem with your form submission.');
}
/**
* Test node form protection.
*/
- public function testProtectNodeFormPreviewPassthru() {
+ public function testProtectNodeFormPreviewPassthru(): void {
// Log in the admin user.
$this->drupalLogin($this->webUser);
// Post a node form using the 'Preview' button and make sure it's allowed.
$edit["title[0][value]"] = 'Test Page';
- $this->drupalPostForm('node/add/article', $edit, $this->t('Preview'));
+ $this->drupalGet('node/add/article');
+ $this->submitForm($edit, 'Preview');
$this->assertSession()->pageTextNotContains('There was a problem with your form submission.');
}
/**
* Test protection on the Contact form.
*/
- public function testProtectContactForm() {
+ public function testProtectContactForm(): void {
$this->drupalLogin($this->adminUser);
// Disable 'protect_all_forms'.
@@ -288,9 +294,11 @@ public function testProtectContactForm() {
$contact_settings->set('default_form', 'feedback')->save();
// Submit the admin form so we can verify the right forms are displayed.
- $this->drupalPostForm('admin/config/content/honeypot', [
- 'form_settings[contact_message_feedback_form]' => TRUE,
- ], $this->t('Save configuration'));
+ $this->drupalGet('admin/config/content/honeypot');
+ $this->submitForm(
+ ['form_settings[contact_message_feedback_form]' => TRUE],
+ 'Save configuration'
+ );
$this->drupalLogin($this->webUser);
$this->drupalGet('contact/feedback');
diff --git a/web/modules/honeypot/tests/src/Kernel/EventIntegrationTest.php b/web/modules/honeypot/tests/src/Kernel/EventIntegrationTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..da490a86147d34e2b612ca6c62700f1c5557fb2b
--- /dev/null
+++ b/web/modules/honeypot/tests/src/Kernel/EventIntegrationTest.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Drupal\Tests\honeypot\Kernel;
+
+use Drupal\Tests\rules\Kernel\RulesKernelTestBase;
+
+/**
+ * Tests for the Symfony event mapping to Rules events.
+ *
+ * @group honeypot
+ */
+class EventIntegrationTest extends RulesKernelTestBase {
+
+ /**
+ * The entity storage for Rules config entities.
+ *
+ * @var \Drupal\Core\Entity\EntityStorageInterface
+ */
+ protected $storage;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = [
+ 'honeypot',
+ 'rules',
+ 'typed_data',
+ 'field',
+ 'node',
+ 'text',
+ 'user',
+ ];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp(): void {
+ parent::setUp();
+ $this->storage = $this->container->get('entity_type.manager')->getStorage('rules_reaction_rule');
+
+ $this->installEntitySchema('user');
+ $this->installEntitySchema('node');
+
+ $this->installConfig(['system']);
+ $this->installConfig(['field']);
+ $this->installConfig(['node']);
+ $this->installSchema('node', ['node_access']);
+ $this->installSchema('system', ['sequences']);
+ }
+
+ /**
+ * Tests that rejecting a form submission triggers the Rules event listener.
+ */
+ public function testHoneypotRejectEvent(): void {
+ $rule = $this->expressionManager->createRule();
+ $rule->addCondition('rules_test_true');
+ $rule->addAction('rules_test_debug_log');
+
+ $config_entity = $this->storage->create([
+ 'id' => 'test_rule',
+ 'events' => [['event_name' => 'honeypot.form_submission_rejected']],
+ 'expression' => $rule->getConfiguration(),
+ ]);
+ $config_entity->save();
+
+ // The logger instance has changed, refresh it.
+ $this->logger = $this->container->get('logger.channel.rules_debug');
+ $this->logger->addLogger($this->debugLog);
+
+ // Invoke hook_honeypot_reject() manually, which should trigger the rule.
+ $account = $this->container->get('current_user');
+ honeypot_honeypot_reject('test_form_id', $account->id(), 'honeypot');
+
+ // Test that the action in the rule logged something.
+ $this->assertRulesDebugLogEntryExists('action called');
+ }
+
+}
diff --git a/web/modules/honeypot/tests/src/Kernel/HoneypotLegacyTest.php b/web/modules/honeypot/tests/src/Kernel/HoneypotLegacyTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..753dd1849034c163f800b95938287e16107b8b36
--- /dev/null
+++ b/web/modules/honeypot/tests/src/Kernel/HoneypotLegacyTest.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Drupal\Tests\honeypot\Kernel;
+
+use Drupal\Core\Form\FormState;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests legacy honeypot functionality.
+ *
+ * @group honeypot
+ * @group legacy
+ */
+class HoneypotLegacyTest extends KernelTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = ['honeypot', 'user'];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp(): void {
+ parent::setUp();
+ $this->installEntitySchema('user');
+ $this->installSchema('honeypot', ['honeypot_user']);
+ $this->installConfig(['honeypot']);
+ }
+
+ /**
+ * Tests the deprecation message for honeypot_get_protected_forms().
+ */
+ public function testGetProtectedForms(): void {
+ $this->expectDeprecation("honeypot_get_protected_forms() is deprecated in honeypot:2.1.0 and is removed from honeypot:3.0.0. Use the 'honeypot' service instead. For example, \Drupal::service('honeypot')->getProtectedForms(). See https://www.drupal.org/node/2949447");
+ $this->assertIsArray(honeypot_get_protected_forms());
+ }
+
+ /**
+ * Tests the deprecation message for honeypot_add_form_protection().
+ */
+ public function testAddFormProtection(): void {
+ $this->expectDeprecation("honeypot_add_form_protection() is deprecated in honeypot:2.1.0 and is removed from honeypot:3.0.0. Use the 'honeypot' service instead. For example, \Drupal::service('honeypot')->addFormProtection(\$form, \$form_state, \$options). See https://www.drupal.org/node/2949447");
+ $form = [];
+ $form_state = new FormState();
+ honeypot_add_form_protection($form, $form_state, ['honeypot']);
+ }
+
+ /**
+ * Tests the deprecation message for honeypot_get_time_limit().
+ */
+ public function testGetTimeLimit(): void {
+ $this->expectDeprecation("honeypot_get_time_limit() is deprecated in honeypot:2.1.0 and is removed from honeypot:3.0.0. Use the 'honeypot' service instead. For example, \Drupal::service('honeypot')->getTimeLimit(\$form_values). See https://www.drupal.org/node/2949447");
+ $this->assertIsInt(honeypot_get_time_limit());
+ }
+
+ /**
+ * Tests the deprecation message for honeypot_log_failure().
+ */
+ public function testLogFailure(): void {
+ $this->expectDeprecation("honeypot_log_failure() is deprecated in honeypot:2.1.0 and is removed from honeypot:3.0.0. Use the 'honeypot' service instead. For example, \Drupal::service('honeypot')->logFailure(\$form_id, \$type). See https://www.drupal.org/node/2949447");
+ honeypot_log_failure('user_login_form', 'honeypot');
+ }
+
+}
diff --git a/web/modules/honeypot/tests/src/Unit/Integration/Event/EventTestBase.php b/web/modules/honeypot/tests/src/Unit/Integration/Event/EventTestBase.php
new file mode 100644
index 0000000000000000000000000000000000000000..90f46e6f819f07e32dc979fc591712c9da914c20
--- /dev/null
+++ b/web/modules/honeypot/tests/src/Unit/Integration/Event/EventTestBase.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\Tests\honeypot\Unit\Integration\Event;
+
+use Drupal\rules\Core\RulesEventManager;
+use Drupal\Tests\rules\Unit\Integration\Event\EventTestBase as RulesEventTestBase;
+
+/**
+ * Base class containing common code for Honeypot event tests.
+ *
+ * @group honeypot
+ *
+ * @requires module rules
+ */
+abstract class EventTestBase extends RulesEventTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp(): void {
+ parent::setUp();
+
+ // Must enable our module to make our plugins discoverable.
+ $this->enableModule('honeypot');
+
+ // Tell the plugin manager where to look for plugins.
+ $this->moduleHandler->getModuleDirectories()
+ ->willReturn(['honeypot' => __DIR__ . '/../../../../../']);
+
+ // Create a real plugin manager with a mock moduleHandler.
+ $this->eventManager = new RulesEventManager($this->moduleHandler->reveal(), $this->entityTypeBundleInfo->reveal());
+ }
+
+}
diff --git a/web/modules/honeypot/tests/src/Unit/Integration/Event/HoneypotRejectEventTest.php b/web/modules/honeypot/tests/src/Unit/Integration/Event/HoneypotRejectEventTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..bc5c1ac3e955069cb34003d3c93e0e805b3dcb41
--- /dev/null
+++ b/web/modules/honeypot/tests/src/Unit/Integration/Event/HoneypotRejectEventTest.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Drupal\Tests\honeypot\Unit\Integration\Event;
+
+/**
+ * Tests the definition of the "honeypot.form_submission_rejected" event.
+ *
+ * @coversDefaultClass \Drupal\honeypot\Event\HoneypotRejectEvent
+ *
+ * @group honeypot
+ *
+ * @requires module rules
+ */
+class HoneypotRejectEventTest extends EventTestBase {
+
+ /**
+ * Tests the event metadata.
+ */
+ public function testHoneypotRejectEvent(): void {
+ $plugin_definition = $this->eventManager->getDefinition('honeypot.form_submission_rejected');
+ $this->assertSame('After rejecting a form submission', (string) $plugin_definition['label']);
+
+ $event = $this->eventManager->createInstance('honeypot.form_submission_rejected');
+
+ $form_id_context_definition = $event->getContextDefinition('form_id');
+ $this->assertSame('string', $form_id_context_definition->getDataType());
+ $this->assertSame(
+ 'Rejected form ID',
+ $form_id_context_definition->getLabel()
+ );
+
+ $uid_context_definition = $event->getContextDefinition('uid');
+ $this->assertSame('integer', $uid_context_definition->getDataType());
+ $this->assertSame(
+ 'Rejected user ID',
+ $uid_context_definition->getLabel()
+ );
+
+ $type_context_definition = $event->getContextDefinition('type');
+ $this->assertSame('string', $type_context_definition->getDataType());
+ $this->assertSame(
+ 'Reason for rejection',
+ $type_context_definition->getLabel()
+ );
+ }
+
+}