From 6796554e44154392f9e743bbb50b923917c5380e Mon Sep 17 00:00:00 2001 From: bcweaver <brianweaver@gmail.com> Date: Wed, 20 Feb 2019 17:04:35 -0500 Subject: [PATCH] SECURITY update for 'metatag' module: 8.x-1.7 --> 8.x-1.8 --- composer.json | 2 +- composer.lock | 19 +++++++------ vendor/composer/installed.json | 16 +++++------ web/modules/metatag/CHANGELOG.txt | 5 ++++ web/modules/metatag/metatag.info.yml | 6 ++-- .../metatag_app_links.info.yml | 6 ++-- .../metatag/metatag_dc/metatag_dc.info.yml | 6 ++-- .../metatag_dc_advanced.info.yml | 6 ++-- .../metatag_facebook.info.yml | 6 ++-- .../metatag_favicons.info.yml | 6 ++-- .../metatag_google_cse.info.yml | 6 ++-- .../metatag_google_plus.info.yml | 6 ++-- .../metatag_hreflang.info.yml | 6 ++-- .../metatag_mobile/metatag_mobile.info.yml | 6 ++-- .../metatag_open_graph.info.yml | 6 ++-- .../metatag_open_graph_products.info.yml | 6 ++-- .../metatag_page_manager.info.yml | 6 ++-- .../metatag_pinterest.info.yml | 6 ++-- .../metatag_twitter_cards.info.yml | 6 ++-- .../metatag_verification.info.yml | 6 ++-- .../metatag_views/metatag_views.info.yml | 6 ++-- .../metatag/src/MetatagServiceProvider.php | 5 ---- .../src/Normalizer/FieldItemNormalizer.php | 28 ------------------- .../src/Normalizer/MetatagHalNormalizer.php | 1 - .../Field/FieldType/MetatagFieldItem.php | 5 +++- .../metatag_test_custom_route.info.yml | 6 ++-- .../metatag_test_tag.info.yml | 6 ++-- 27 files changed, 85 insertions(+), 110 deletions(-) delete mode 100644 web/modules/metatag/src/Normalizer/FieldItemNormalizer.php diff --git a/composer.json b/composer.json index 3736f61fbc..73af302154 100644 --- a/composer.json +++ b/composer.json @@ -118,7 +118,7 @@ "drupal/media_entity_twitter": "2.0-alpha2", "drupal/menu_block": "1.4", "drupal/menu_breadcrumb": "^1.7", - "drupal/metatag": "^1.7", + "drupal/metatag": "1.8", "drupal/migrate_devel": "1.x-dev", "drupal/migrate_plus": "4.0", "drupal/migrate_tools": "4.0", diff --git a/composer.lock b/composer.lock index 21cc15adf0..3e53ce9f88 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "f610ca861b2413536928a19a8bdc73a9", + "content-hash": "0d2fa0dcb9c4d9c66c5e70f113f77084", "packages": [ { "name": "alchemy/zippy", @@ -4759,17 +4759,17 @@ }, { "name": "drupal/metatag", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://git.drupal.org/project/metatag", - "reference": "8.x-1.7" + "reference": "8.x-1.8" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.7.zip", - "reference": "8.x-1.7", - "shasum": "93decaefd053c524918ceae5b5ef05dd77de0857" + "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.8.zip", + "reference": "8.x-1.8", + "shasum": "fb5d31aa08c8c2e175f096f9917e9741db152ea8" }, "require": { "drupal/core": "*", @@ -4791,8 +4791,8 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.7", - "datestamp": "1535726393", + "version": "8.x-1.8", + "datestamp": "1550692511", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4864,7 +4864,8 @@ "homepage": "https://www.drupal.org/project/migrate_devel", "support": { "source": "http://cgit.drupalcode.org/migrate_devel" - } + }, + "time": "2017-06-25T23:46:13+00:00" }, { "name": "drupal/migrate_plus", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 93a3dd808c..5f58769ea3 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -4906,18 +4906,18 @@ }, { "name": "drupal/metatag", - "version": "1.7.0", - "version_normalized": "1.7.0.0", + "version": "1.8.0", + "version_normalized": "1.8.0.0", "source": { "type": "git", "url": "https://git.drupal.org/project/metatag", - "reference": "8.x-1.7" + "reference": "8.x-1.8" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.7.zip", - "reference": "8.x-1.7", - "shasum": "93decaefd053c524918ceae5b5ef05dd77de0857" + "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.8.zip", + "reference": "8.x-1.8", + "shasum": "fb5d31aa08c8c2e175f096f9917e9741db152ea8" }, "require": { "drupal/core": "*", @@ -4939,8 +4939,8 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.7", - "datestamp": "1535726393", + "version": "8.x-1.8", + "datestamp": "1550692511", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/web/modules/metatag/CHANGELOG.txt b/web/modules/metatag/CHANGELOG.txt index 512dc59273..8955618d35 100644 --- a/web/modules/metatag/CHANGELOG.txt +++ b/web/modules/metatag/CHANGELOG.txt @@ -1,3 +1,8 @@ +Metatag 8.x-1.8, 2019-02-20 +--------------------------- +By samuel.mortenson, Berdir, DamienMcKenna: Fix data property definition. + + Metatag 8.x-1.7, 2018-08-31 --------------------------- #2994979 by DamienMcKenna, dspachos, ynotpeanutbutter, oxy86, IT-Cru, kdeds, diff --git a/web/modules/metatag/metatag.info.yml b/web/modules/metatag/metatag.info.yml index 37efe692bb..e92edaa593 100644 --- a/web/modules/metatag/metatag.info.yml +++ b/web/modules/metatag/metatag.info.yml @@ -13,8 +13,8 @@ test_dependencies: - restui:restui - schema_metatag:schema_web_page -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_app_links/metatag_app_links.info.yml b/web/modules/metatag/metatag_app_links/metatag_app_links.info.yml index 0c438e8270..1f79a53f00 100644 --- a/web/modules/metatag/metatag_app_links/metatag_app_links.info.yml +++ b/web/modules/metatag/metatag_app_links/metatag_app_links.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_dc/metatag_dc.info.yml b/web/modules/metatag/metatag_dc/metatag_dc.info.yml index 3123b511b6..33eaa6e0a3 100644 --- a/web/modules/metatag/metatag_dc/metatag_dc.info.yml +++ b/web/modules/metatag/metatag_dc/metatag_dc.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml b/web/modules/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml index e9fc95e9ef..45c1213421 100644 --- a/web/modules/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml +++ b/web/modules/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml @@ -7,8 +7,8 @@ dependencies: - metatag:metatag - metatag:metatag_dc -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_facebook/metatag_facebook.info.yml b/web/modules/metatag/metatag_facebook/metatag_facebook.info.yml index ed308edda6..859e96f3dd 100644 --- a/web/modules/metatag/metatag_facebook/metatag_facebook.info.yml +++ b/web/modules/metatag/metatag_facebook/metatag_facebook.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_favicons/metatag_favicons.info.yml b/web/modules/metatag/metatag_favicons/metatag_favicons.info.yml index af4b6caa61..5ebb9ac313 100644 --- a/web/modules/metatag/metatag_favicons/metatag_favicons.info.yml +++ b/web/modules/metatag/metatag_favicons/metatag_favicons.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_google_cse/metatag_google_cse.info.yml b/web/modules/metatag/metatag_google_cse/metatag_google_cse.info.yml index 7ae07312a5..4246003b49 100644 --- a/web/modules/metatag/metatag_google_cse/metatag_google_cse.info.yml +++ b/web/modules/metatag/metatag_google_cse/metatag_google_cse.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_google_plus/metatag_google_plus.info.yml b/web/modules/metatag/metatag_google_plus/metatag_google_plus.info.yml index 6a2dd43f16..da67659b7c 100644 --- a/web/modules/metatag/metatag_google_plus/metatag_google_plus.info.yml +++ b/web/modules/metatag/metatag_google_plus/metatag_google_plus.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_hreflang/metatag_hreflang.info.yml b/web/modules/metatag/metatag_hreflang/metatag_hreflang.info.yml index fde674e1f5..1901aaed42 100644 --- a/web/modules/metatag/metatag_hreflang/metatag_hreflang.info.yml +++ b/web/modules/metatag/metatag_hreflang/metatag_hreflang.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_mobile/metatag_mobile.info.yml b/web/modules/metatag/metatag_mobile/metatag_mobile.info.yml index fb1c833d5c..da52a0823f 100644 --- a/web/modules/metatag/metatag_mobile/metatag_mobile.info.yml +++ b/web/modules/metatag/metatag_mobile/metatag_mobile.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_open_graph/metatag_open_graph.info.yml b/web/modules/metatag/metatag_open_graph/metatag_open_graph.info.yml index 7755b893b4..16ef28d0b9 100644 --- a/web/modules/metatag/metatag_open_graph/metatag_open_graph.info.yml +++ b/web/modules/metatag/metatag_open_graph/metatag_open_graph.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml b/web/modules/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml index 39090f3ba8..2e7721e51d 100644 --- a/web/modules/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml +++ b/web/modules/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml @@ -7,8 +7,8 @@ dependencies: - metatag:metatag - metatag:metatag_open_graph -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_page_manager/metatag_page_manager.info.yml b/web/modules/metatag/metatag_page_manager/metatag_page_manager.info.yml index c25fa9338c..4da08b5678 100644 --- a/web/modules/metatag/metatag_page_manager/metatag_page_manager.info.yml +++ b/web/modules/metatag/metatag_page_manager/metatag_page_manager.info.yml @@ -7,8 +7,8 @@ dependencies: - page_manager:page_manager - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_pinterest/metatag_pinterest.info.yml b/web/modules/metatag/metatag_pinterest/metatag_pinterest.info.yml index 8364186799..3f91423255 100644 --- a/web/modules/metatag/metatag_pinterest/metatag_pinterest.info.yml +++ b/web/modules/metatag/metatag_pinterest/metatag_pinterest.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml b/web/modules/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml index 122e885cad..ba3461f194 100644 --- a/web/modules/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml +++ b/web/modules/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_verification/metatag_verification.info.yml b/web/modules/metatag/metatag_verification/metatag_verification.info.yml index 336c45f089..7d4b7e4c17 100644 --- a/web/modules/metatag/metatag_verification/metatag_verification.info.yml +++ b/web/modules/metatag/metatag_verification/metatag_verification.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_views/metatag_views.info.yml b/web/modules/metatag/metatag_views/metatag_views.info.yml index db451743cc..20bbe66bf7 100644 --- a/web/modules/metatag/metatag_views/metatag_views.info.yml +++ b/web/modules/metatag/metatag_views/metatag_views.info.yml @@ -7,8 +7,8 @@ dependencies: - metatag:metatag - drupal:views -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/src/MetatagServiceProvider.php b/web/modules/metatag/src/MetatagServiceProvider.php index 811485a407..aa1ac3051b 100644 --- a/web/modules/metatag/src/MetatagServiceProvider.php +++ b/web/modules/metatag/src/MetatagServiceProvider.php @@ -4,7 +4,6 @@ use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\DependencyInjection\ServiceProviderBase; -use Drupal\metatag\Normalizer\FieldItemNormalizer; use Drupal\metatag\Normalizer\MetatagHalNormalizer; use Drupal\metatag\Normalizer\MetatagNormalizer; use Symfony\Component\DependencyInjection\Definition; @@ -30,10 +29,6 @@ public function alter(ContainerBuilder $container) { $metatag_hal = new Definition(MetatagHalNormalizer::class); $metatag_hal->addTag('normalizer', ['priority' => 31]); $container->setDefinition('metatag.normalizer.metatag.hal', $metatag_hal); - - $metatag_field = new Definition(FieldItemNormalizer::class); - $metatag_field->addTag('normalizer', ['priority' => 30]); - $container->setDefinition('metatag.normalizer.metatag_field', $metatag_field); } } diff --git a/web/modules/metatag/src/Normalizer/FieldItemNormalizer.php b/web/modules/metatag/src/Normalizer/FieldItemNormalizer.php deleted file mode 100644 index c567750fe6..0000000000 --- a/web/modules/metatag/src/Normalizer/FieldItemNormalizer.php +++ /dev/null @@ -1,28 +0,0 @@ -<?php - -namespace Drupal\metatag\Normalizer; - -use Drupal\serialization\Normalizer\NormalizerBase; - -/** - * Converts the Metatag field item object structure to METATAG array structure. - */ -class FieldItemNormalizer extends NormalizerBase { - - /** - * {@inheritdoc} - */ - protected $supportedInterfaceOrClass = 'Drupal\metatag\Plugin\Field\FieldType\MetatagFieldItem'; - - /** - * {@inheritdoc} - */ - public function normalize($field_item, $format = NULL, array $context = []) { - $values = $field_item->getValue(); - - $normalized['value'] = unserialize($values['value']); - - return $normalized; - } - -} diff --git a/web/modules/metatag/src/Normalizer/MetatagHalNormalizer.php b/web/modules/metatag/src/Normalizer/MetatagHalNormalizer.php index 03c26361cd..4d0aff94e2 100644 --- a/web/modules/metatag/src/Normalizer/MetatagHalNormalizer.php +++ b/web/modules/metatag/src/Normalizer/MetatagHalNormalizer.php @@ -19,7 +19,6 @@ public function normalize($field_item, $format = NULL, array $context = []) { $normalized = parent::normalize($field_item, $format, $context); // Mock the field array similar to the other fields. - // @see Drupal\hal\Normalizer\FieldItemNormalizer return [ 'metatag' => [$normalized], ]; diff --git a/web/modules/metatag/src/Plugin/Field/FieldType/MetatagFieldItem.php b/web/modules/metatag/src/Plugin/Field/FieldType/MetatagFieldItem.php index 1a6726a804..5e23ffd7ce 100644 --- a/web/modules/metatag/src/Plugin/Field/FieldType/MetatagFieldItem.php +++ b/web/modules/metatag/src/Plugin/Field/FieldType/MetatagFieldItem.php @@ -14,7 +14,10 @@ * label = @Translation("Meta tags"), * description = @Translation("This field stores code meta tags."), * default_widget = "metatag_firehose", - * default_formatter = "metatag_empty_formatter" + * default_formatter = "metatag_empty_formatter", + * serialized_property_names = { + * "value" + * } * ) */ class MetatagFieldItem extends FieldItemBase { diff --git a/web/modules/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml b/web/modules/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml index dad9f064ab..23c33ace19 100644 --- a/web/modules/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml +++ b/web/modules/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml @@ -6,8 +6,8 @@ package: Testing dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml b/web/modules/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml index 04a5a51c8f..ab69327c18 100644 --- a/web/modules/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml +++ b/web/modules/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml @@ -6,8 +6,8 @@ package: Testing dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 -- GitLab