Merge pull request #28 from ing-bank/fix/rename-airlock

rename airlock to rokku

.travis.yml

@@ -29,13 +29,13 @@ script:
 
 after_success:
 - bash <(curl -s https://codecov.io/bash)
-- export AIRLOCK_STS_VERSION="${TRAVIS_BRANCH/\//_}"
+- export ROKKU_STS_VERSION="${TRAVIS_BRANCH/\//_}"
 - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 - if [ "${TRAVIS_BRANCH}" != "master" ]; then
-    echo "Build image for with name $DOCKER_REPO:$AIRLOCK_STS_VERSION";
+    echo "Build image for with name $DOCKER_REPO:$ROKKU_STS_VERSION";
     sbt clean docker:publish;
   fi
 - if [ -n "$TRAVIS_TAG" ]; then
-    docker tag $DOCKER_REPO:$AIRLOCK_STS_VERSION $DOCKER_REPO:latest;
+    docker tag $DOCKER_REPO:$ROKKU_STS_VERSION $DOCKER_REPO:latest;
     docker push $DOCKER_REPO:latest;
   fi

build.sbt

@@ -2,10 +2,10 @@ import com.typesafe.sbt.packager.docker
 import com.typesafe.sbt.packager.docker.ExecCmd
 import scalariform.formatter.preferences._
 
-val airlockStsVersion = scala.sys.env.getOrElse("AIRLOCK_STS_VERSION", "SNAPSHOT")
+val rokkuStsVersion = scala.sys.env.getOrElse("ROKKU_STS_VERSION", "SNAPSHOT")
 
-name := "airlock-sts"
-version := airlockStsVersion
+name := "rokku-sts"
+version := rokkuStsVersion
 scalaVersion := "2.12.8"
 
 scalacOptions := Seq(
@@ -21,7 +21,7 @@ scalacOptions := Seq(
 // Experimental: improved update resolution.
 updateOptions := updateOptions.value.withCachedResolution(cachedResoluton = true)
 
-assemblyJarName in assembly := "airlock-sts.jar"
+assemblyJarName in assembly := "rokku-sts.jar"
 
 val akkaVersion = "2.5.19"
 val akkaHttpVersion = "10.1.5"
@@ -59,7 +59,7 @@ Defaults.itSettings
 parallelExecution in IntegrationTest := false
 
 javaOptions in Universal ++= Seq(
-  "-Dlogback.configurationFile=/airlock/logback.xml"
+  "-Dlogback.configurationFile=/rokku/logback.xml"
 )
 
 enablePlugins(JavaAppPackaging)
@@ -69,7 +69,7 @@ fork := true
 dockerExposedPorts := Seq(12345)
 dockerCommands += ExecCmd("ENV", "PROXY_HOST", "0.0.0.0")
 dockerBaseImage := "openjdk:8u171-jre-slim-stretch"
-dockerAlias := docker.DockerAlias(Some("docker.io"), Some("wbaa"), "airlock-sts", Some(airlockStsVersion))
+dockerAlias := docker.DockerAlias(Some("docker.io"), Some("wbaa"), "rokku-sts", Some(rokkuStsVersion))
 
 scalariformPreferences := scalariformPreferences.value
   .setPreference(AlignSingleLineCaseStatements, true)

docker-compose.yml

@@ -2,15 +2,15 @@ version: "2"
 services:
 
   keycloak:
-    image: wbaa/airlock-dev-keycloak:0.0.3
+    image: wbaa/rokku-dev-keycloak:0.0.5
     environment:
       - KEYCLOAK_USER=admin
       - KEYCLOAK_PASSWORD=admin
     ports:
       - 8080:8080
 
   mariadb:
-    image: wbaa/airlock-dev-mariadb:0.0.2
+    image: wbaa/rokku-dev-mariadb:0.0.3
     environment:
       - MYSQL_ROOT_PASSWORD=admin
     ports:

src/it/scala/com/ing/wbaa/airlock/sts/AWSSTSClient.scala → src/it/scala/com/ing/wbaa/rokku/sts/AWSSTSClient.scala

@@ -1,4 +1,4 @@
-package com.ing.wbaa.airlock.sts
+package com.ing.wbaa.rokku.sts
 
 import akka.http.scaladsl.model.Uri.Authority
 import com.amazonaws.auth.{AWSStaticCredentialsProvider, BasicAWSCredentials}

src/it/scala/com/ing/wbaa/airlock/sts/StsServiceItTest.scala → src/it/scala/com/ing/wbaa/rokku/sts/StsServiceItTest.scala

@@ -1,4 +1,4 @@
-package com.ing.wbaa.airlock.sts
+package com.ing.wbaa.rokku.sts
 
 import java.time.Instant
 
@@ -7,14 +7,14 @@ import akka.http.scaladsl.model.Uri.{Authority, Host}
 import akka.stream.ActorMaterializer
 import com.amazonaws.services.securitytoken.AWSSecurityTokenService
 import com.amazonaws.services.securitytoken.model.{AWSSecurityTokenServiceException, GetSessionTokenRequest}
-import com.ing.wbaa.airlock.sts.config.{HttpSettings, KeycloakSettings, MariaDBSettings, StsSettings}
-import com.ing.wbaa.airlock.sts.data.UserName
-import com.ing.wbaa.airlock.sts.data.aws._
-import com.ing.wbaa.airlock.sts.helper.{KeycloackToken, OAuth2TokenRequest}
-import com.ing.wbaa.airlock.sts.keycloak.KeycloakTokenVerifier
-import com.ing.wbaa.airlock.sts.service.UserTokenDbService
-import com.ing.wbaa.airlock.sts.service.db.MariaDb
-import com.ing.wbaa.airlock.sts.service.db.dao.STSUserAndGroupDAO
+import com.ing.wbaa.rokku.sts.config.{HttpSettings, KeycloakSettings, MariaDBSettings, StsSettings}
+import com.ing.wbaa.rokku.sts.data.UserName
+import com.ing.wbaa.rokku.sts.data.aws._
+import com.ing.wbaa.rokku.sts.helper.{KeycloackToken, OAuth2TokenRequest}
+import com.ing.wbaa.rokku.sts.keycloak.KeycloakTokenVerifier
+import com.ing.wbaa.rokku.sts.service.UserTokenDbService
+import com.ing.wbaa.rokku.sts.service.db.MariaDb
+import com.ing.wbaa.rokku.sts.service.db.dao.STSUserAndGroupDAO
 import org.scalatest._
 
 import scala.concurrent.duration.Duration
@@ -27,10 +27,10 @@ class StsServiceItTest extends AsyncWordSpec with DiagrammedAssertions
   override implicit val materializer: ActorMaterializer = ActorMaterializer()(testSystem)
   override implicit val exContext: ExecutionContextExecutor = testSystem.dispatcher
 
-  private val validCredentials = Map("grant_type" -> "password", "username" -> "userone", "password" -> "password", "client_id" -> "sts-airlock")
+  private val validCredentials = Map("grant_type" -> "password", "username" -> "userone", "password" -> "password", "client_id" -> "sts-rokku")
   private val invalidCredentials = validCredentials + ("password" -> "xxx")
 
-  private[this] val airlockHttpSettings: HttpSettings = new HttpSettings(testSystem.settings.config) {
+  private[this] val rokkuHttpSettings: HttpSettings = new HttpSettings(testSystem.settings.config) {
     override val httpPort: Int = 0
     override val httpBind: String = "127.0.0.1"
   }
@@ -52,11 +52,11 @@ class StsServiceItTest extends AsyncWordSpec with DiagrammedAssertions
       with MariaDb {
       override implicit def system: ActorSystem = testSystem
 
-      override protected[this] def httpSettings: HttpSettings = airlockHttpSettings
+      override protected[this] def httpSettings: HttpSettings = rokkuHttpSettings
 
       override protected[this] def keycloakSettings: KeycloakSettings = new KeycloakSettings(testSystem.settings.config) {
         override val realmPublicKeyId: String = "FJ86GcF3jTbNLOco4NvZkUCIUmfYCqoqtOQeMfbhNlE"
-        override val issuerForList: Set[String] = Set("sts-airlock")
+        override val issuerForList: Set[String] = Set("sts-rokku")
       }
 
       override protected[this] def stsSettings: StsSettings = StsSettings(testSystem)

src/it/scala/com/ing/wbaa/airlock/sts/helper/OAuth2TokenRequest.scala → src/it/scala/com/ing/wbaa/rokku/sts/helper/OAuth2TokenRequest.scala

@@ -1,12 +1,12 @@
-package com.ing.wbaa.airlock.sts.helper
+package com.ing.wbaa.rokku.sts.helper
 
 import akka.actor.ActorSystem
 import akka.http.scaladsl.Http
 import akka.http.scaladsl.model._
 import akka.http.scaladsl.model.headers.RawHeader
 import akka.stream.ActorMaterializer
 import akka.stream.scaladsl.Sink
-import com.ing.wbaa.airlock.sts.config.KeycloakSettings
+import com.ing.wbaa.rokku.sts.config.KeycloakSettings
 
 import scala.concurrent.{ExecutionContextExecutor, Future}
 

src/it/scala/com/ing/wbaa/airlock/sts/keycloak/KeycloakTokenVerifierTest.scala → src/it/scala/com/ing/wbaa/rokku/sts/keycloak/KeycloakTokenVerifierTest.scala

@@ -1,10 +1,10 @@
-package com.ing.wbaa.airlock.sts.keycloak
+package com.ing.wbaa.rokku.sts.keycloak
 
 import akka.actor.ActorSystem
 import akka.stream.ActorMaterializer
-import com.ing.wbaa.airlock.sts.config.KeycloakSettings
-import com.ing.wbaa.airlock.sts.data.{BearerToken, UserGroup, UserName}
-import com.ing.wbaa.airlock.sts.helper.{KeycloackToken, OAuth2TokenRequest}
+import com.ing.wbaa.rokku.sts.config.KeycloakSettings
+import com.ing.wbaa.rokku.sts.data.{BearerToken, UserGroup, UserName}
+import com.ing.wbaa.rokku.sts.helper.{KeycloackToken, OAuth2TokenRequest}
 import org.keycloak.common.VerificationException
 import org.keycloak.representations.JsonWebToken
 import org.scalatest.{Assertion, AsyncWordSpec, DiagrammedAssertions}
@@ -19,15 +19,15 @@ class KeycloakTokenVerifierTest extends AsyncWordSpec with DiagrammedAssertions
 
   override val keycloakSettings: KeycloakSettings = new KeycloakSettings(testSystem.settings.config) {
     override val realmPublicKeyId: String = "FJ86GcF3jTbNLOco4NvZkUCIUmfYCqoqtOQeMfbhNlE"
-    override val issuerForList: Set[String] = Set("sts-airlock")
+    override val issuerForList: Set[String] = Set("sts-rokku")
   }
 
   private def withOAuth2TokenRequest(formData: Map[String, String])(testCode: KeycloackToken => Assertion): Future[Assertion] = {
     keycloackToken(formData).map(testCode)
   }
 
-  private val validCredentialsUser1 = Map("grant_type" -> "password", "username" -> "userone", "password" -> "password", "client_id" -> "sts-airlock")
-  private val validCredentialsUser2 = Map("grant_type" -> "password", "username" -> "testuser", "password" -> "password", "client_id" -> "sts-airlock")
+  private val validCredentialsUser1 = Map("grant_type" -> "password", "username" -> "userone", "password" -> "password", "client_id" -> "sts-rokku")
+  private val validCredentialsUser2 = Map("grant_type" -> "password", "username" -> "testuser", "password" -> "password", "client_id" -> "sts-rokku")
 
   "Keycloak verifier" should {
     "return verified token for user 1" in withOAuth2TokenRequest(validCredentialsUser1) { keycloakToken =>

src/it/scala/com/ing/wbaa/airlock/sts/service/db/MariaDbItTest.scala → src/it/scala/com/ing/wbaa/rokku/sts/service/db/MariaDbItTest.scala

@@ -1,7 +1,7 @@
-package com.ing.wbaa.airlock.sts.service.db
+package com.ing.wbaa.rokku.sts.service.db
 
 import akka.actor.ActorSystem
-import com.ing.wbaa.airlock.sts.config.{MariaDBSettings, StsSettings}
+import com.ing.wbaa.rokku.sts.config.{MariaDBSettings, StsSettings}
 import org.scalatest.AsyncWordSpec
 
 import scala.util.{Failure, Success}

src/it/scala/com/ing/wbaa/airlock/sts/service/db/dao/STSTokenDAOItTest.scala → src/it/scala/com/ing/wbaa/rokku/sts/service/db/dao/STSTokenDAOItTest.scala

@@ -1,13 +1,13 @@
-package com.ing.wbaa.airlock.sts.service.db.dao
+package com.ing.wbaa.rokku.sts.service.db.dao
 
 import java.time.Instant
 
 import akka.actor.ActorSystem
-import com.ing.wbaa.airlock.sts.config.{MariaDBSettings, StsSettings}
-import com.ing.wbaa.airlock.sts.data.UserName
-import com.ing.wbaa.airlock.sts.data.aws.{AwsCredential, AwsSessionToken, AwsSessionTokenExpiration}
-import com.ing.wbaa.airlock.sts.service.TokenGeneration
-import com.ing.wbaa.airlock.sts.service.db.MariaDb
+import com.ing.wbaa.rokku.sts.config.{MariaDBSettings, StsSettings}
+import com.ing.wbaa.rokku.sts.data.UserName
+import com.ing.wbaa.rokku.sts.data.aws.{AwsCredential, AwsSessionToken, AwsSessionTokenExpiration}
+import com.ing.wbaa.rokku.sts.service.TokenGeneration
+import com.ing.wbaa.rokku.sts.service.db.MariaDb
 import org.scalatest.{Assertion, AsyncWordSpec}
 
 import scala.concurrent.Future

src/it/scala/com/ing/wbaa/airlock/sts/service/db/dao/STSUserAndGroupDAOItTest.scala → src/it/scala/com/ing/wbaa/rokku/sts/service/db/dao/STSUserAndGroupDAOItTest.scala

@@ -1,11 +1,11 @@
-package com.ing.wbaa.airlock.sts.service.db.dao
+package com.ing.wbaa.rokku.sts.service.db.dao
 
 import akka.actor.ActorSystem
-import com.ing.wbaa.airlock.sts.config.{MariaDBSettings, StsSettings}
-import com.ing.wbaa.airlock.sts.data.{UserGroup, UserName}
-import com.ing.wbaa.airlock.sts.data.aws.{AwsAccessKey, AwsCredential}
-import com.ing.wbaa.airlock.sts.service.TokenGeneration
-import com.ing.wbaa.airlock.sts.service.db.MariaDb
+import com.ing.wbaa.rokku.sts.config.{MariaDBSettings, StsSettings}
+import com.ing.wbaa.rokku.sts.data.{UserGroup, UserName}
+import com.ing.wbaa.rokku.sts.data.aws.{AwsAccessKey, AwsCredential}
+import com.ing.wbaa.rokku.sts.service.TokenGeneration
+import com.ing.wbaa.rokku.sts.service.db.MariaDb
 import org.scalatest.AsyncWordSpec
 
 import scala.util.Random

src/main/resources/application.conf

@@ -10,7 +10,7 @@ akka {
     }
 }
 
-airlock {
+rokku {
     sts {
         # Default interface and port to listen on.
         http {

src/main/resources/logback.xml

@@ -5,7 +5,7 @@
     <!-- encoders are  by default assigned the type
          ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
     <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-      <layout class="com.ing.wbaa.airlock.sts.util.MaskingPatternJsonLayout">
+      <layout class="com.ing.wbaa.rokku.sts.util.MaskingPatternJsonLayout">
         <!-- Insert here the regexes to sanitize the log messages.
              Replacement supports pattern groups with variables named $1, $2, etc -->
         <replace>

src/main/resources/reference.conf

@@ -1,4 +1,4 @@
-airlock {
+rokku {
     sts {
         # Default interface and port to listen on.
         http {
@@ -8,8 +8,8 @@ airlock {
         # Default keycloak configuration file and realm public key id
         keycloak {
             realmPublicKeyId = "FJ86GcF3jTbNLOco4NvZkUCIUmfYCqoqtOQeMfbhNlE"
-            realm = "auth-airlock"
-            resource = "sts-airlock"
+            realm = "auth-rokku"
+            resource = "sts-rokku"
             url = "http://127.0.0.1:8080"
 
             verifyToken {
@@ -29,7 +29,7 @@ airlock {
 
 
 mariadb {
-    url = "jdbc:mysql:loadbalance://localhost:3307,localhost:3307/airlock"
+    url = "jdbc:mysql:loadbalance://localhost:3307,localhost:3307/rokku"
     username = "root"
     password = "admin"
 }

src/main/scala/com/ing/wbaa/airlock/sts/AirlockStsService.scala → src/main/scala/com/ing/wbaa/rokku/sts/AirlockStsService.scala

@@ -1,4 +1,4 @@
-package com.ing.wbaa.airlock.sts
+package com.ing.wbaa.rokku.sts
 
 import akka.Done
 import akka.actor.ActorSystem
@@ -7,8 +7,8 @@ import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server.Route
 import akka.stream.ActorMaterializer
 import ch.megard.akka.http.cors.scaladsl.CorsDirectives.cors
-import com.ing.wbaa.airlock.sts.api.{ AdminApi, STSApi, ServerApi, UserApi }
-import com.ing.wbaa.airlock.sts.config.HttpSettings
+import com.ing.wbaa.rokku.sts.api.{ AdminApi, STSApi, ServerApi, UserApi }
+import com.ing.wbaa.rokku.sts.config.HttpSettings
 import com.typesafe.scalalogging.LazyLogging
 
 import scala.concurrent.{ ExecutionContext, Future }

src/main/scala/com/ing/wbaa/airlock/sts/Server.scala → src/main/scala/com/ing/wbaa/rokku/sts/Server.scala

@@ -1,15 +1,15 @@
-package com.ing.wbaa.airlock.sts
+package com.ing.wbaa.rokku.sts
 
 import akka.actor.ActorSystem
-import com.ing.wbaa.airlock.sts.config._
-import com.ing.wbaa.airlock.sts.keycloak.KeycloakTokenVerifier
-import com.ing.wbaa.airlock.sts.service.UserTokenDbService
-import com.ing.wbaa.airlock.sts.service.db.MariaDb
-import com.ing.wbaa.airlock.sts.service.db.dao.{ STSTokenDAO, STSUserAndGroupDAO }
+import com.ing.wbaa.rokku.sts.config._
+import com.ing.wbaa.rokku.sts.keycloak.KeycloakTokenVerifier
+import com.ing.wbaa.rokku.sts.service.UserTokenDbService
+import com.ing.wbaa.rokku.sts.service.db.MariaDb
+import com.ing.wbaa.rokku.sts.service.db.dao.{ STSTokenDAO, STSUserAndGroupDAO }
 
 object Server extends App {
   new AirlockStsService with KeycloakTokenVerifier with UserTokenDbService with STSUserAndGroupDAO with STSTokenDAO with MariaDb {
-    override implicit lazy val system: ActorSystem = ActorSystem.create("airlock-sts")
+    override implicit lazy val system: ActorSystem = ActorSystem.create("rokku-sts")
 
     override protected[this] def httpSettings: HttpSettings = HttpSettings(system)
 

src/main/scala/com/ing/wbaa/airlock/sts/api/AdminApi.scala → src/main/scala/com/ing/wbaa/rokku/sts/api/AdminApi.scala

@@ -1,12 +1,12 @@
-package com.ing.wbaa.airlock.sts.api
+package com.ing.wbaa.rokku.sts.api
 
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server.{ AuthorizationFailedRejection, Route }
-import com.ing.wbaa.airlock.sts.api.directive.STSDirectives.authorizeToken
-import com.ing.wbaa.airlock.sts.config.StsSettings
-import com.ing.wbaa.airlock.sts.data.aws.{ AwsAccessKey, AwsCredential, AwsSecretKey }
-import com.ing.wbaa.airlock.sts.data.{ AuthenticationUserInfo, BearerToken, UserGroup, UserName }
-import com.ing.wbaa.airlock.sts.service.db.security.Encryption
+import com.ing.wbaa.rokku.sts.api.directive.STSDirectives.authorizeToken
+import com.ing.wbaa.rokku.sts.config.StsSettings
+import com.ing.wbaa.rokku.sts.data.aws.{ AwsAccessKey, AwsCredential, AwsSecretKey }
+import com.ing.wbaa.rokku.sts.data.{ AuthenticationUserInfo, BearerToken, UserGroup, UserName }
+import com.ing.wbaa.rokku.sts.service.db.security.Encryption
 import com.typesafe.scalalogging.LazyLogging
 
 import scala.concurrent.Future