diff --git a/composer.json b/composer.json index 615b3d344c2ba530efa42d8c4389236f40349e76..060f7a9919f46927c6c07fb188e416422f0f9f90 100644 --- a/composer.json +++ b/composer.json @@ -292,6 +292,9 @@ "drupal/focal_point": { "3106445": "https://www.drupal.org/files/issues/2020-01-23/Focal_point-Referential_Integrity-3106445-4.patch" }, + "drupal/honeypot": { + "2811189": "https://www.drupal.org/files/issues/2019-08-08/honeypot_field_weight_2811189-18.patch" + }, "drupal/linkit": { "2712951": "https://www.drupal.org/files/issues/2019-11-27/linkit_for_link_field-2712951-140.patch" }, diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 78c6f10c83c5cf959ea28b3ed6b73ba1f4506982..22958b8a224d302d08ed0bc3446eea3f48d23663 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -5385,6 +5385,9 @@ "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" } }, "installation-source": "dist", diff --git a/vendor/simplesamlphp/simplesamlphp/config/config.php b/vendor/simplesamlphp/simplesamlphp/config/config.php index 578d36b00175ec3c6776feb4b9c70736f6b9e585..c4b5de123a05dcf1dd234dfb29bf423fa8d597a2 100644 --- a/vendor/simplesamlphp/simplesamlphp/config/config.php +++ b/vendor/simplesamlphp/simplesamlphp/config/config.php @@ -6,7 +6,7 @@ if (empty($_SERVER['PATH_INFO']) && !empty($_SERVER['DOCUMENT_URI'])) { $index = strpos($_SERVER['DOCUMENT_URI'], '.php'); if($index) { - $_SERVER['PATH_INFO'] = substr($_SERVER['DOCUMENT_URI'], $index+4); + $_SERVER['PATH_INFO'] = substr($_SERVER['DOCUMENT_URI'], $index+4); } } @@ -22,15 +22,6 @@ $drop_id = $ps['conf']['pantheon_binding']; $db = $ps['databases']['default']['default']; - -if($_SERVER['HOME'] == '/') { - $temp_path = '/tmp'; -} -else { - $temp_path = $_SERVER['HOME'] . '/tmp/simplesaml'; -} -// error_log("temp_path: " . $temp_path); - // Set metadata path $metadata_folder = __DIR__ . '/../../../../web/sites/default/files/private/simplesamlphp/metadata'; // error_log("config.php - metadata_folder: $metadata_folder"); @@ -135,7 +126,7 @@ 'certdir' => $cert_folder, 'loggingdir' => 'log/', 'datadir' => 'data/', - 'tempdir' => $temp_path, + 'tempdir' => '/srv/bindings/' . $drop_id . '/tmp/simplesaml', 'supressportnumber' => TRUE, 'cronkey' => '5nvD3MgHLDDStnEKgK0au3vhqEjNNnvkHLmbVWvObIl2lpx0guXx5h', diff --git a/web/modules/honeypot/PATCHES.txt b/web/modules/honeypot/PATCHES.txt new file mode 100644 index 0000000000000000000000000000000000000000..dfab2f981967ed6184cbe6f186ad63b3bc8d5d5b --- /dev/null +++ b/web/modules/honeypot/PATCHES.txt @@ -0,0 +1,7 @@ +This file was automatically generated by Composer Patches (https://github.com/cweagans/composer-patches) +Patches applied to this directory: + +2811189 +Source: https://www.drupal.org/files/issues/2019-08-08/honeypot_field_weight_2811189-18.patch + + diff --git a/web/modules/honeypot/honeypot.module b/web/modules/honeypot/honeypot.module index 1da86a6609e083a1d0c0f743cb18c024db29eadc..1f2d7e94b3d84d91fd5164fdbc07653a317b1d9d 100644 --- a/web/modules/honeypot/honeypot.module +++ b/web/modules/honeypot/honeypot.module @@ -156,7 +156,7 @@ function honeypot_add_form_protection(&$form, FormStateInterface $form_state, ar '#type' => 'textfield', '#title' => t('Leave this field blank'), '#size' => 20, - '#weight' => 100, + '#weight' => -1, '#attributes' => ['autocomplete' => 'off'], '#element_validate' => ['_honeypot_honeypot_validate'], ]; @@ -177,6 +177,7 @@ function honeypot_add_form_protection(&$form, FormStateInterface $form_state, ar $form['honeypot_time'] = [ '#type' => 'hidden', '#title' => t('Timestamp'), + '#weight' => -1, '#default_value' => $identifier, '#element_validate' => ['_honeypot_time_restriction_validate'], '#cache' => [