Merge 3110461 into f4a5857

guardian · Jan 20, 2024 · 3bdc4ba · 3bdc4ba
2 parents f4a5857 + 3110461
commit 3bdc4ba
Show file tree

Hide file tree

Showing 30 changed files with 1,374 additions and 1,000 deletions.
diff --git a/dev/config/usage_rights.json b/dev/config/usage_rights.json
@@ -227,4 +227,4 @@
         "Xinhua News Agency"
       ]
     }
-  }
+  }
diff --git a/dev/script/generate-config/service-config.js b/dev/script/generate-config/service-config.js
@@ -94,6 +94,15 @@ function getKahunaConfig(config){
         |  }
         |]`;
 
+    const permissionsOptions = `[{\\"id\\":\\"allPermissions\\",\\"label\\":\\"All permissions\\",\\"mapping\\":\\"\\",\\"payable\\":\\"none\\"},{\\"id\\":\\"usableForNews\\",\\"label\\":\\"Usable for News\\",\\"mapping\\":\\"category:agency\\",\\"payable\\":\\"false\\"}]`;
+
+    const permissionsConfig = stripMargin`
+        |usageRightsSummary=true
+        |usePermissionsFilter=true
+        |permissionsDefault="allPermissions"
+        |permissionsOptions="${permissionsOptions}"
+        `;
+
     return stripMargin`${getCommonConfig(config)}
         |aws.region="${config.AWS_DEFAULT_REGION}"
         |origin.full="images.media.${config.DOMAIN}"
@@ -108,6 +117,7 @@ function getKahunaConfig(config){
         |security.cors.allowedOrigins="${getCorsAllowedOriginString(config)}"
         |security.frameAncestors="https://*.${config.DOMAIN}"
         |metrics.request.enabled=false
+        |${permissionsConfig}
         |${pinboardConfig}
         |`;
 }

diff --git a/kahuna/app/lib/KahunaConfig.scala b/kahuna/app/lib/KahunaConfig.scala
@@ -3,6 +3,8 @@ package lib
 import com.gu.mediaservice.lib.auth.Permissions.Pinboard
 import com.gu.mediaservice.lib.auth.SimplePermission
 import com.gu.mediaservice.lib.config.{CommonConfig, GridConfigResources}
+import play.api.libs.json._
+
 
 case class ScriptToLoad(
   host: String,
@@ -39,6 +41,12 @@ class KahunaConfig(resources: GridConfigResources) extends CommonConfig(resource
   val restrictDownload: Option[Boolean] = booleanOpt("restrictDownload")
   val useReaper: Option[Boolean] = booleanOpt("useReaper")
 
+  // interim permissions filter configuration settings
+  val usePermissionsFilter: Option[Boolean] = booleanOpt("usePermissionsFilter")
+  val usageRightsSummary: Option[Boolean] = booleanOpt("usageRightsSummary")
+  val permissionsDefault: Option[String] = stringOpt("permissionsDefault").filterNot(_.isEmpty)
+  val permissionsOptions: Option[String] = stringOpt("permissionsOptions").filterNot(_.isEmpty)
+
   val showDenySyndicationWarning: Option[Boolean] = booleanOpt("showDenySyndicationWarning")
 
   val frameAncestors: Set[String] = getStringSet("security.frameAncestors")

diff --git a/kahuna/app/views/main.scala.html b/kahuna/app/views/main.scala.html
@@ -75,6 +75,10 @@
           useReaper: @kahunaConfig.useReaper.getOrElse(false),
           featureSwitches: @Html(featureSwitches),
           telemetryUri: '@kahunaConfig.telemetryUri.getOrElse("")',
+          usePermissionsFilter: @kahunaConfig.usePermissionsFilter.getOrElse(false),
+          usageRightsSummary: @kahunaConfig.usageRightsSummary.getOrElse(false),
+          permissionsOptions: '@Html(kahunaConfig.permissionsOptions)',
+          permissionsDefault: "@kahunaConfig.permissionsDefault",
           defaultShouldBlurGraphicImages: @kahunaConfig.defaultShouldBlurGraphicImages,
           shouldUploadStraightToBucket: @kahunaConfig.shouldUploadStraightToBucket,
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -227,4 +227,4 @@ @@
             "Xinhua News Agency"
           ]
         }
-      }
+      }