Docker cert (#8400)

* adds certificate to Dockerfile

* have feature overwrites in global config

---------

Co-authored-by: Norman Rzepka <code@normanrz.com>
Co-authored-by: Michael Büßemeyer <frameworklinux+MichaelBuessemeyer@users.noreply.github.com>

Author: 3 people

Dockerfile

@@ -28,4 +28,6 @@ USER webknossos
 
 EXPOSE 9000
 
+ENV CERTIFICATE "eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzY2FsYWJsZW1pbmRzIiwiaWF0IjoxNzM5ODExMTc3LCJleHAiOjE4OTM0NTYwMDAsImZlYXR1cmVzIjp7Im9wZW5JZENvbm5lY3RFbmFibGVkIjpmYWxzZSwic2VnbWVudEFueXRoaW5nRW5hYmxlZCI6ZmFsc2UsImVkaXRhYmxlTWFwcGluZ3NFbmFibGVkIjpmYWxzZX19.c_zBzj7bKPCXp5eTjFrCC4YmOxSH9uQx3BRMYbVx9dPsiCwlyvi7jepqOP7bS8QIcdoSHnrhHpZ-tQKkTi3rkw"
+
 ENTRYPOINT [ "/docker-entrypoint.sh" ]

app/utils/WkConf.scala

@@ -2,18 +2,26 @@ package utils
 
 import com.scalableminds.util.time.Instant
 import com.scalableminds.util.tools.ConfigReader
+import com.typesafe.config.ConfigFactory
 import com.typesafe.scalalogging.LazyLogging
 import play.api.Configuration
 import security.CertificateValidationService
 
 import javax.inject.Inject
 import scala.concurrent.duration._
+import scala.jdk.CollectionConverters._
 
 class WkConf @Inject()(configuration: Configuration, certificateValidationService: CertificateValidationService)
     extends ConfigReader
     with LazyLogging {
-  override def raw: Configuration = configuration
   lazy val featureOverrides: Map[String, Boolean] = certificateValidationService.getFeatureOverrides
+  override val raw: Configuration = {
+    // Applying feature overwrites to the configuration.
+    Configuration(
+      ConfigFactory
+        .parseMap(featureOverrides.map { case (k, v) => s"features.$k" -> v }.asJava)
+        .withFallback(configuration.underlying))
+  }
 
   object Http {
     val uri: String = get[String]("http.uri")

util/src/main/scala/com/scalableminds/util/tools/ConfigReader.scala

@@ -5,7 +5,7 @@ import com.typesafe.config.Config
 import play.api.{ConfigLoader, Configuration}
 
 trait ConfigReader {
-  def raw: Configuration
+  val raw: Configuration
 
   implicit val instantConfigLoader: ConfigLoader[Instant] = (rootConfig: Config, path: String) => {
     val literal = rootConfig.getString(path)

webknossos-datastore/app/com/scalableminds/webknossos/datastore/DataStoreConfig.scala

@@ -7,7 +7,7 @@ import play.api.Configuration
 import scala.concurrent.duration._
 
 class DataStoreConfig @Inject()(configuration: Configuration) extends ConfigReader {
-  override def raw: Configuration = configuration
+  override val raw: Configuration = configuration
 
   object Http {
     val uri: String = get[String]("http.uri")

webknossos-tracingstore/app/com/scalableminds/webknossos/tracingstore/TracingStoreConfig.scala

@@ -5,7 +5,7 @@ import com.scalableminds.util.tools.ConfigReader
 import play.api.Configuration
 
 class TracingStoreConfig @Inject()(configuration: Configuration) extends ConfigReader {
-  override def raw: Configuration = configuration
+  override val raw: Configuration = configuration
 
   object Http {
     val uri: String = get[String]("http.uri")