Merge pull request #624 from UN-OCHA/develop

Seckit update and add export
UN-OCHA · Jun 7, 2022 · 6857641 · 6857641
2 parents 1f50120 + ff3e585
commit 6857641
Show file tree

Hide file tree

Showing 7 changed files with 906 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -21,6 +21,10 @@
         {
             "type": "vcs",
             "url": "https://github.com/UN-OCHA/file_checker"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/UN-OCHA/ocha_security.git"
         }
     ],
     "require": {
@@ -82,6 +86,7 @@
         "drupal/twig_tweak": "^2.8",
         "drupal/user_expire": "^1.0",
         "drupal/variationcache": "^1.0",
+        "drupal/views_data_export": "^1.1",
         "drupal/viewsreference": "^2.0.0",
         "drupal/webform": "^6.1.2",
         "drush/drush": "^10.0.0",
@@ -92,6 +97,7 @@
         "unocha/common_design": "^5.0.0",
         "unocha/file_checker": "dev-8.x-1.x",
         "unocha/ocha_integrations": "^1.0",
+        "unocha/ocha_security": "^1.0",
         "unocha/un_date": "^1.0.1",
         "vlucas/phpdotenv": "^2.4",
         "webflo/drupal-finder": "^1.0.0",

diff --git a/composer.lock b/composer.lock
diff --git a/composer.patches.json b/composer.patches.json
@@ -1,24 +1,30 @@
 {
   "patches": {
-    "drupal/paragraphs": {
-      "https://www.drupal.org/project/paragraphs/issues/2868252#comment-13622986": "https://www.drupal.org/files/issues/2020-05-20/i2868252-28.patch"
-    },
-    "drupal/viewsreference": {
-      "https://dgo.to/3166490 - Trigger ajax refresh when display ID is changed": "https://www.drupal.org/files/issues/2020-09-02/viewsreference-ajax_after_display_selection-3166490-3.patch"
+    "drupal/core": {
+      "https://www.drupal.org/project/drupal/issues/1819538#comment-14019597 - More link disappears when time-based views cache is enabled": "https://www.drupal.org/files/issues/2021-03-05/1819538-57-D9.patch",
+      "https://www.drupal.org/project/drupal/issues/2833734 - Allow views attachment display use own pager options": "https://www.drupal.org/files/issues/2020-11-29/2833734-allow-attachment-pager-42.patch"
     },
     "drupal/group": {
       "https://www.drupal.org/project/group/issues/2817109 - How to redirect to the owning group after adding a gnode?": "https://www.drupal.org/files/issues/2817109-by-rachel_norfolk-ericras-How-to-redir.patch"
     },
+    "drupal/paragraphs": {
+      "https://www.drupal.org/project/paragraphs/issues/2868252#comment-13622986": "https://www.drupal.org/files/issues/2020-05-20/i2868252-28.patch"
+    },
     "drupal/search_api": {
       "https://www.drupal.org/project/search_api/issues/3130004 - Facets query part is lost in views": "https://git.drupalcode.org/project/search_api/-/merge_requests/8.diff"
     },
+    "drupal/seckit": {
+      "https://www.drupal.org/project/seckit/issues/2844205#comment-14455849": "https://www.drupal.org/files/issues/2021-09-13/2844205-alter-csp-directives-10.patch"
+    },
     "drupal/user_expire": {
       "Allow the notification email to be customised": "https://git.drupalcode.org/project/user_expire/-/merge_requests/5.diff",
       "Reset expiration when user is reactivated": "https://git.drupalcode.org/project/user_expire/-/merge_requests/6.diff"
     },
-    "drupal/core": {
-      "https://www.drupal.org/project/drupal/issues/1819538#comment-14019597 - More link disappears when time-based views cache is enabled": "https://www.drupal.org/files/issues/2021-03-05/1819538-57-D9.patch",
-      "https://www.drupal.org/project/drupal/issues/2833734 - Allow views attachment display use own pager options": "https://www.drupal.org/files/issues/2020-11-29/2833734-allow-attachment-pager-42.patch"
+    "drupal/views_data_export": {
+      "https://www.drupal.org/project/views_data_export/issues/3173296": "https://www.drupal.org/files/issues/2021-02-12/3173296-9-batch-query-alter.patch"
+    },
+    "drupal/viewsreference": {
+      "https://dgo.to/3166490 - Trigger ajax refresh when display ID is changed": "https://www.drupal.org/files/issues/2020-09-02/viewsreference-ajax_after_display_selection-3166490-3.patch"
     }
   }
 }
diff --git a/config/core.extension.yml b/config/core.extension.yml
@@ -16,6 +16,7 @@ module:
   config: 0
   config_split: 0
   contextual: 0
+  csv_serialization: 0
   ctools: 0
   date_recur: 0
   date_recur_modular: 0
@@ -68,6 +69,7 @@ module:
   node: 0
   node_view_permissions: 0
   ocha_integrations: 0
+  ocha_security: 0
   ocha_viewsreference_filter: 0
   options: 0
   page_cache: 0
@@ -80,6 +82,7 @@ module:
   rdf: 0
   realname: 0
   redirect: 0
+  rest: 0
   search_api: 0
   search_api_attachments: 0
   search_api_db: 0
@@ -90,6 +93,7 @@ module:
   select2_facets: 0
   select_a11y: 0
   select_or_other: 0
+  serialization: 0
   shortcut: 0
   social_api: 0
   social_auth: 0
@@ -111,6 +115,7 @@ module:
   user: 0
   user_expire: 0
   variationcache: 0
+  views_data_export: 0
   viewsreference: 0
   webform: 0
   webform_submission_log: 0

diff --git a/config/seckit.settings.yml b/config/seckit.settings.yml
@@ -8,7 +8,7 @@ seckit_xss:
       webkit: false
     report-only: true
     default-src: ''
-    script-src: '''self'' ''unsafe-inline'' fonts.googleapis.com www.gstatic.com platform.twitter.com *.twimg.com www.google.com www.googletagmanager.com www.google-analytics.com cdn.jsdelivr.net'
+    script-src: '''self'' fonts.googleapis.com www.gstatic.com platform.twitter.com *.twimg.com www.google.com www.googletagmanager.com www.google-analytics.com cdn.jsdelivr.net'
     object-src: ''
     style-src: ''
     img-src: '''self'' data: *.twimg.com *.twitter.com *.google-analytics.com www.googletagmanager.com *.ytimg.com *.google.com mcusercontent.com *.mailchimp.com *.gstatic.com'