Merge pull request #128 from UN-OCHA/develop

[OPS-8338] core security update
UN-OCHA · May 30, 2022 · f1795ea · f1795ea
2 parents cc8e022 + a37d770
commit f1795ea
Show file tree

Hide file tree

Showing 9 changed files with 208 additions and 96 deletions.
diff --git a/Makefile b/Makefile
@@ -14,6 +14,7 @@ build:  clean
 				--build-arg GITHUB_SHA=`git rev-parse --short HEAD` \
 		. --file docker/Dockerfile --tag public.ecr.aws/unocha/gms9-site:local \
 		2>&1 | tee buildlog.txt
+	@echo "Built a shiny new public.ecr.aws/unocha/gms9-site:local for you."
 
 clean:
 	rm -rf ./buildlog.txt

diff --git a/composer.json b/composer.json
@@ -164,6 +164,7 @@
         "drupal/token": "^1.9",
         "drupal/token_filter": "^1.2",
         "drupal/tome": "^1.4",
+        "drupal/user_expire": "^1.0",
         "drupal/userprotect": "^1.1",
         "drupal/video_embed_field": "^2.4",
         "drupal/views_base_url": "^2.0@beta",

diff --git a/composer.lock b/composer.lock
diff --git a/composer.patches.json b/composer.patches.json
@@ -1,5 +1,9 @@
 {
     "patches": {
+        "drupal/anchor_link": {
+              "Design Issue": "patches/anchorlink/anchor_link-Integration-with-LinkIt-2958532.patch",
+          "CSS dialog Design Issue": "patches/anchorlink/anchor_link-styling_issue_in_link_dialog-2986268-11.patch"
+        },
         "drupal/core": {
           "CKeditor Image": "patches/ckeditor/2642808-69.patch",
           "Warning": "patches/core/CoreError.patch"
@@ -13,9 +17,9 @@
         "drupal/scrollup": {
           "title update": "patches/ScrollUp/3151294-3.patch"
         },
-		"drupal/anchor_link": {
-          "Design Issue": "patches/anchorlink/anchor_link-Integration-with-LinkIt-2958532.patch",
-		  "CSS dialog Design Issue": "patches/anchorlink/anchor_link-styling_issue_in_link_dialog-2986268-11.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"
         }
     }
 }
diff --git a/config/core.extension.yml b/config/core.extension.yml
@@ -115,6 +115,7 @@ module:
   tour: 0
   update: 0
   user: 0
+  user_expire: 0
   user_login: 0
   userprotect: 0
   video_embed_field: 0

diff --git a/config/user_expire.settings.yml b/config/user_expire.settings.yml
@@ -0,0 +1,6 @@
+_core:
+  default_config_hash: PeDvVH4C3IZ7QFkvC1BUv3BZJVc7jLwQmJAEttVuVOw
+frequency: 432000
+offset: 604800
+user_expire_roles:
+  authenticated: 15552000
diff --git a/html/themes/custom/gms_ocha_common/package-lock.json b/html/themes/custom/gms_ocha_common/package-lock.json
diff --git a/symfony.lock b/symfony.lock
@@ -392,6 +392,9 @@
     "drupal/tome_sync": {
         "version": "1.4.0"
     },
+    "drupal/user_expire": {
+        "version": "1.0.0"
+    },
     "drupal/userprotect": {
         "version": "1.1.0"
     },

diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
@@ -19,16 +19,6 @@ services:
     networks:
       - default
 
-  redis:
-    restart: always
-    image: public.ecr.aws/unocha/redis:5
-    hostname: gms9-test-redis
-    container_name: gms9-test-redis
-    ports:
-      - "6379"
-    networks:
-      - default
-
   drupal:
     image: public.ecr.aws/unocha/gms9-site:local
     hostname: gms9-test-site
@@ -56,4 +46,3 @@ services:
       - default
     depends_on:
       - mysql
-      - redis