-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #182 from ing-bank/feature/namespace-check
Healthcheck
- Loading branch information
Showing
6 changed files
with
209 additions
and
195 deletions.
There are no files selected for viewing
139 changes: 70 additions & 69 deletions
139
src/it/scala/com/ing/wbaa/rokku/proxy/RokkuS3ProxyWithNamespaceItTest.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,69 +1,70 @@ | ||
| package com.ing.wbaa.rokku.proxy | ||
|
|
||
| import akka.actor.ActorSystem | ||
| import akka.http.scaladsl.model.Uri.{Authority, Host} | ||
| import akka.stream.Materializer | ||
| import com.amazonaws.auth.BasicAWSCredentials | ||
| import com.amazonaws.services.securitytoken.AWSSecurityTokenService | ||
| import com.ing.wbaa.rokku.proxy.config._ | ||
| import com.ing.wbaa.rokku.proxy.data.{RequestId, S3Request, User} | ||
| import com.ing.wbaa.rokku.proxy.handler.FilterRecursiveListBucketHandler | ||
| import com.ing.wbaa.rokku.proxy.handler.namespace.{NamespaceName, RequestHandlerS3WithNamespaces} | ||
| import com.ing.wbaa.rokku.proxy.handler.parsers.RequestParser | ||
| import com.ing.wbaa.rokku.proxy.provider._ | ||
| import com.ing.wbaa.rokku.proxy.queue.MemoryUserRequestQueue | ||
| import org.scalatest.Assertion | ||
|
|
||
| import scala.collection.immutable.ListMap | ||
| import scala.concurrent.Future | ||
|
|
||
| class RokkuS3ProxyWithNamespaceItTest extends RokkuS3ProxyItTest { | ||
|
|
||
| /** | ||
| * Fixture for starting and stopping a test proxy that tests can interact with. | ||
| * | ||
| * @param testCode Code that accepts the created STS sdk and an authority for an S3 sdk | ||
| * @return Future[Assertion] | ||
| */ | ||
| override def withSdkToMockProxy(testCode: (AWSSecurityTokenService, Authority) => Future[Assertion]): Future[Assertion] = { | ||
| val proxy: RokkuS3Proxy = new RokkuS3Proxy with RequestHandlerS3WithNamespaces | ||
| with FilterRecursiveListBucketHandler with AuthenticationProviderSTS | ||
| with AuthorizationProviderRanger with SignatureProviderAws | ||
| with MessageProviderKafka with AuditLogProvider with MemoryUserRequestQueue with RequestParser { | ||
| override implicit lazy val system: ActorSystem = testSystem | ||
| override def materializer: Materializer = Materializer(system) | ||
| override val httpSettings: HttpSettings = rokkuHttpSettings | ||
| override val storageS3Settings: StorageS3Settings = StorageS3Settings(testSystem) | ||
| override val stsSettings: StsSettings = StsSettings(testSystem) | ||
| override val kafkaSettings: KafkaSettings = KafkaSettings(testSystem) | ||
|
|
||
| override protected def rangerSettings: RangerSettings = RangerSettings(testSystem) | ||
|
|
||
| override def isUserAuthorizedForRequest(request: S3Request, user: User)(implicit id: RequestId): Boolean = { | ||
| user match { | ||
| case User(userName, _, _, _, _) if userName.value == "testuser" => true | ||
| case _ => super.isUserAuthorizedForRequest(request, user) | ||
| } | ||
| } | ||
|
|
||
| override val namespaceSettings: NamespaceSettings = new NamespaceSettings(system.settings.config) { | ||
| override val isEnabled: Boolean = true | ||
| override val namespaceCredentialsMap: ListMap[NamespaceName, BasicAWSCredentials] = | ||
| ListMap( | ||
| NamespaceName("fakeNsName1") -> new BasicAWSCredentials("fake1", "fake2"), | ||
| NamespaceName("nsName1") -> new BasicAWSCredentials("nsAccessKeyOne", "nsSecretKeyOne"), | ||
| NamespaceName("fakeNsName2") -> new BasicAWSCredentials("fake11", "fake11"), | ||
| NamespaceName("nsName2") -> new BasicAWSCredentials("nsAccessKeyTwo", "nsSecretKeyTwo"), | ||
| NamespaceName("nsName") -> new BasicAWSCredentials("accesskey", "secretkey"), | ||
| NamespaceName("fakeNsName3") -> new BasicAWSCredentials("fake111", "fake111"), | ||
| ) | ||
| } | ||
| } | ||
| proxy.startup.flatMap { binding => | ||
| val authority = Authority(Host(binding.localAddress.getAddress), binding.localAddress.getPort) | ||
| testCode(getAmazonSTSSdk(StsSettings(testSystem).stsBaseUri), authority) | ||
| .andThen { case _ => proxy.shutdown() } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| //TODO - disable namespace test because we have only one storage so now it is not possible to interpret 403 response | ||
| //package com.ing.wbaa.rokku.proxy | ||
| // | ||
| //import akka.actor.ActorSystem | ||
| //import akka.http.scaladsl.model.Uri.{Authority, Host} | ||
| //import akka.stream.Materializer | ||
| //import com.amazonaws.auth.BasicAWSCredentials | ||
| //import com.amazonaws.services.securitytoken.AWSSecurityTokenService | ||
| //import com.ing.wbaa.rokku.proxy.config._ | ||
| //import com.ing.wbaa.rokku.proxy.data.{RequestId, S3Request, User} | ||
| //import com.ing.wbaa.rokku.proxy.handler.FilterRecursiveListBucketHandler | ||
| //import com.ing.wbaa.rokku.proxy.handler.namespace.{NamespaceName, RequestHandlerS3WithNamespaces} | ||
| //import com.ing.wbaa.rokku.proxy.handler.parsers.RequestParser | ||
| //import com.ing.wbaa.rokku.proxy.provider._ | ||
| //import com.ing.wbaa.rokku.proxy.queue.MemoryUserRequestQueue | ||
| //import org.scalatest.Assertion | ||
| // | ||
| //import scala.collection.immutable.ListMap | ||
| //import scala.concurrent.Future | ||
| // | ||
| //class RokkuS3ProxyWithNamespaceItTest extends RokkuS3ProxyItTest { | ||
| // | ||
| // /** | ||
| // * Fixture for starting and stopping a test proxy that tests can interact with. | ||
| // * | ||
| // * @param testCode Code that accepts the created STS sdk and an authority for an S3 sdk | ||
| // * @return Future[Assertion] | ||
| // */ | ||
| // override def withSdkToMockProxy(testCode: (AWSSecurityTokenService, Authority) => Future[Assertion]): Future[Assertion] = { | ||
| // val proxy: RokkuS3Proxy = new RokkuS3Proxy with RequestHandlerS3WithNamespaces | ||
| // with FilterRecursiveListBucketHandler with AuthenticationProviderSTS | ||
| // with AuthorizationProviderRanger with SignatureProviderAws | ||
| // with MessageProviderKafka with AuditLogProvider with MemoryUserRequestQueue with RequestParser { | ||
| // override implicit lazy val system: ActorSystem = testSystem | ||
| // override def materializer: Materializer = Materializer(system) | ||
| // override val httpSettings: HttpSettings = rokkuHttpSettings | ||
| // override val storageS3Settings: StorageS3Settings = StorageS3Settings(testSystem) | ||
| // override val stsSettings: StsSettings = StsSettings(testSystem) | ||
| // override val kafkaSettings: KafkaSettings = KafkaSettings(testSystem) | ||
| // | ||
| // override protected def rangerSettings: RangerSettings = RangerSettings(testSystem) | ||
| // | ||
| // override def isUserAuthorizedForRequest(request: S3Request, user: User)(implicit id: RequestId): Boolean = { | ||
| // user match { | ||
| // case User(userName, _, _, _, _) if userName.value == "testuser" => true | ||
| // case _ => super.isUserAuthorizedForRequest(request, user) | ||
| // } | ||
| // } | ||
| // | ||
| // override val namespaceSettings: NamespaceSettings = new NamespaceSettings(system.settings.config) { | ||
| // override val isEnabled: Boolean = true | ||
| // override val namespaceCredentialsMap: ListMap[NamespaceName, BasicAWSCredentials] = | ||
| // ListMap( | ||
| // NamespaceName("fakeNsName1") -> new BasicAWSCredentials("fake1", "fake2"), | ||
| // NamespaceName("nsName1") -> new BasicAWSCredentials("nsAccessKeyOne", "nsSecretKeyOne"), | ||
| // NamespaceName("fakeNsName2") -> new BasicAWSCredentials("fake11", "fake11"), | ||
| // NamespaceName("nsName2") -> new BasicAWSCredentials("nsAccessKeyTwo", "nsSecretKeyTwo"), | ||
| // NamespaceName("nsName") -> new BasicAWSCredentials("accesskey", "secretkey"), | ||
| // NamespaceName("fakeNsName3") -> new BasicAWSCredentials("fake111", "fake111"), | ||
| // ) | ||
| // } | ||
| // } | ||
| // proxy.startup.flatMap { binding => | ||
| // val authority = Authority(Host(binding.localAddress.getAddress), binding.localAddress.getPort) | ||
| // testCode(getAmazonSTSSdk(StsSettings(testSystem).stsBaseUri), authority) | ||
| // .andThen { case _ => proxy.shutdown() } | ||
| // } | ||
| // } | ||
| //} | ||
| // |
235 changes: 118 additions & 117 deletions
235
...ala/com/ing/wbaa/rokku/proxy/handler/namespace/RequestHandlerS3WithNamespacesItTest.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,117 +1,118 @@ | ||
| package com.ing.wbaa.rokku.proxy.handler.namespace | ||
|
|
||
| import akka.actor.ActorSystem | ||
| import akka.http.scaladsl.model.Uri.{Authority, Host} | ||
| import com.amazonaws.SdkClientException | ||
| import com.amazonaws.auth.BasicAWSCredentials | ||
| import com.amazonaws.services.s3.AmazonS3 | ||
| import com.ing.wbaa.rokku.proxy.RokkuS3Proxy | ||
| import com.ing.wbaa.rokku.proxy.config.{HttpSettings, KafkaSettings, NamespaceSettings, StorageS3Settings} | ||
| import com.ing.wbaa.rokku.proxy.data._ | ||
| import com.ing.wbaa.rokku.proxy.handler.FilterRecursiveListBucketHandler | ||
| import com.ing.wbaa.rokku.proxy.handler.parsers.RequestParser | ||
| import com.ing.wbaa.rokku.proxy.provider.{AuditLogProvider, MessageProviderKafka, SignatureProviderAws} | ||
| import com.ing.wbaa.rokku.proxy.queue.MemoryUserRequestQueue | ||
| import com.ing.wbaa.testkit.RokkuFixtures | ||
| import org.scalatest.Assertion | ||
| import org.scalatest.diagrams.Diagrams | ||
| import org.scalatest.wordspec.AsyncWordSpec | ||
|
|
||
| import java.io.File | ||
| import scala.collection.immutable.ListMap | ||
| import scala.concurrent.Future | ||
|
|
||
| class RequestHandlerS3WithNamespacesItTest extends AsyncWordSpec with Diagrams with RokkuFixtures { | ||
|
|
||
| final implicit val testSystem: ActorSystem = ActorSystem.create("test-system") | ||
|
|
||
| // Settings for tests: | ||
| // - Force a random port to listen on. | ||
| // - Explicitly bind to loopback, irrespective of any default value. | ||
| val rokkuHttpSettings: HttpSettings = new HttpSettings(testSystem.settings.config) { | ||
| override val httpPort: Int = 0 | ||
| override val httpBind: String = "127.0.0.1" | ||
| } | ||
|
|
||
| /** | ||
| * Fixture for starting and stopping a test proxy that tests can interact with. | ||
| * | ||
| * @param testCode Code that accepts the created sdk | ||
| * @return Assertion | ||
| */ | ||
| def withS3SdkToMockProxy(testCode: AmazonS3 => Assertion): Future[Assertion] = { | ||
| val proxy: RokkuS3Proxy = new RokkuS3Proxy with RequestHandlerS3WithNamespaces with SignatureProviderAws | ||
| with FilterRecursiveListBucketHandler with MessageProviderKafka with AuditLogProvider with MemoryUserRequestQueue with RequestParser { | ||
| override implicit lazy val system: ActorSystem = testSystem | ||
| override val httpSettings: HttpSettings = rokkuHttpSettings | ||
|
|
||
| override def isUserAuthorizedForRequest(request: S3Request, user: User)(implicit id: RequestId): Boolean = true | ||
|
|
||
| override val storageS3Settings: StorageS3Settings = StorageS3Settings(testSystem) | ||
| override val kafkaSettings: KafkaSettings = KafkaSettings(testSystem) | ||
|
|
||
| override def areCredentialsActive(awsRequestCredential: AwsRequestCredential)(implicit id: RequestId): Future[Option[User]] = | ||
| Future(Some(User(UserRawJson("userId", Some(Set("group")), "accesskey", "secretkey", None)))) | ||
|
|
||
| override val namespaceSettings: NamespaceSettings = new NamespaceSettings(system.settings.config) { | ||
| override val isEnabled: Boolean = true | ||
| override val namespaceCredentialsMap: ListMap[NamespaceName, BasicAWSCredentials] = | ||
| ListMap( | ||
| NamespaceName("fakeNsName1") -> new BasicAWSCredentials("fake1", "fake2"), | ||
| NamespaceName("nsName1") -> new BasicAWSCredentials("nsAccessKeyOne", "nsSecretKeyOne"), | ||
| NamespaceName("fakeNsName2") -> new BasicAWSCredentials("fake11", "fake11"), | ||
| NamespaceName("nsName2") -> new BasicAWSCredentials("nsAccessKeyTwo", "nsSecretKeyTwo"), | ||
| NamespaceName("fakeNsName3") -> new BasicAWSCredentials("fake111", "fake111"), | ||
| ) | ||
| } | ||
| } | ||
| proxy.startup.map { binding => | ||
| try testCode(getAmazonS3( | ||
| authority = Authority(Host(binding.localAddress.getAddress), binding.localAddress.getPort) | ||
| )) | ||
| finally proxy.shutdown() | ||
| } | ||
| } | ||
|
|
||
|
|
||
| ListMap("nsName1" -> "nsOneBucket_1", "nsName2" -> "nsTwoBucket_1")foreach { case (namespace, testBucket) => | ||
| s"S3 Proxy for $namespace (where $testBucket exists)" should { | ||
| "put, get and delete an object from the bucket" in withS3SdkToMockProxy { sdk => | ||
| withFile(1024 * 1024) { filename => | ||
| val testKeyContent = "keyPutFileByContent" | ||
| val testKeyFile = "keyPutFileByFile" | ||
| val testContent = "content" | ||
|
|
||
| // PUT | ||
| sdk.putObject(testBucket, testKeyContent, testContent) | ||
| sdk.putObject(testBucket, testKeyFile, new File(filename)) | ||
|
|
||
| // GET | ||
| val checkContent = sdk.getObjectAsString(testBucket, testKeyContent) | ||
| assert(checkContent == testContent) | ||
| val keys1 = getKeysInBucket(sdk, testBucket) | ||
| List(testKeyContent, testKeyFile).map(k => assert(keys1.contains(k))) | ||
|
|
||
| // DELETE | ||
| sdk.deleteObject(testBucket, testKeyContent) | ||
| val keys2 = getKeysInBucket(sdk, testBucket) | ||
| assert(!keys2.contains(testKeyContent)) | ||
| assert(keys2.contains(testKeyFile)) | ||
|
|
||
| sdk.deleteObject(testBucket, testKeyFile) | ||
| val keys3 = getKeysInBucket(sdk, testBucket) | ||
| assert(!keys3.contains(testKeyFile)) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| "S3 Proxy for not existing bucket" should { | ||
| val testBucket = "notexistingbucket" | ||
| "throw SdkClientException exception" in withS3SdkToMockProxy { sdk => | ||
| assertThrows[SdkClientException] { | ||
| sdk.listObjectsV2(testBucket) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| //TODO - disable namespace test because we have only one storage so now it is not possible to interpret 403 response | ||
| //package com.ing.wbaa.rokku.proxy.handler.namespace | ||
| // | ||
| //import akka.actor.ActorSystem | ||
| //import akka.http.scaladsl.model.Uri.{Authority, Host} | ||
| //import com.amazonaws.SdkClientException | ||
| //import com.amazonaws.auth.BasicAWSCredentials | ||
| //import com.amazonaws.services.s3.AmazonS3 | ||
| //import com.ing.wbaa.rokku.proxy.RokkuS3Proxy | ||
| //import com.ing.wbaa.rokku.proxy.config.{HttpSettings, KafkaSettings, NamespaceSettings, StorageS3Settings} | ||
| //import com.ing.wbaa.rokku.proxy.data._ | ||
| //import com.ing.wbaa.rokku.proxy.handler.FilterRecursiveListBucketHandler | ||
| //import com.ing.wbaa.rokku.proxy.handler.parsers.RequestParser | ||
| //import com.ing.wbaa.rokku.proxy.provider.{AuditLogProvider, MessageProviderKafka, SignatureProviderAws} | ||
| //import com.ing.wbaa.rokku.proxy.queue.MemoryUserRequestQueue | ||
| //import com.ing.wbaa.testkit.RokkuFixtures | ||
| //import org.scalatest.Assertion | ||
| //import org.scalatest.diagrams.Diagrams | ||
| //import org.scalatest.wordspec.AsyncWordSpec | ||
| // | ||
| //import java.io.File | ||
| //import scala.collection.immutable.ListMap | ||
| //import scala.concurrent.Future | ||
| // | ||
| //class RequestHandlerS3WithNamespacesItTest extends AsyncWordSpec with Diagrams with RokkuFixtures { | ||
| // | ||
| // final implicit val testSystem: ActorSystem = ActorSystem.create("test-system") | ||
| // | ||
| // // Settings for tests: | ||
| // // - Force a random port to listen on. | ||
| // // - Explicitly bind to loopback, irrespective of any default value. | ||
| // val rokkuHttpSettings: HttpSettings = new HttpSettings(testSystem.settings.config) { | ||
| // override val httpPort: Int = 0 | ||
| // override val httpBind: String = "127.0.0.1" | ||
| // } | ||
| // | ||
| // /** | ||
| // * Fixture for starting and stopping a test proxy that tests can interact with. | ||
| // * | ||
| // * @param testCode Code that accepts the created sdk | ||
| // * @return Assertion | ||
| // */ | ||
| // def withS3SdkToMockProxy(testCode: AmazonS3 => Assertion): Future[Assertion] = { | ||
| // val proxy: RokkuS3Proxy = new RokkuS3Proxy with RequestHandlerS3WithNamespaces with SignatureProviderAws | ||
| // with FilterRecursiveListBucketHandler with MessageProviderKafka with AuditLogProvider with MemoryUserRequestQueue with RequestParser { | ||
| // override implicit lazy val system: ActorSystem = testSystem | ||
| // override val httpSettings: HttpSettings = rokkuHttpSettings | ||
| // | ||
| // override def isUserAuthorizedForRequest(request: S3Request, user: User)(implicit id: RequestId): Boolean = true | ||
| // | ||
| // override val storageS3Settings: StorageS3Settings = StorageS3Settings(testSystem) | ||
| // override val kafkaSettings: KafkaSettings = KafkaSettings(testSystem) | ||
| // | ||
| // override def areCredentialsActive(awsRequestCredential: AwsRequestCredential)(implicit id: RequestId): Future[Option[User]] = | ||
| // Future(Some(User(UserRawJson("userId", Some(Set("group")), "accesskey", "secretkey", None)))) | ||
| // | ||
| // override val namespaceSettings: NamespaceSettings = new NamespaceSettings(system.settings.config) { | ||
| // override val isEnabled: Boolean = true | ||
| // override val namespaceCredentialsMap: ListMap[NamespaceName, BasicAWSCredentials] = | ||
| // ListMap( | ||
| // NamespaceName("fakeNsName1") -> new BasicAWSCredentials("fake1", "fake2"), | ||
| // NamespaceName("nsName1") -> new BasicAWSCredentials("nsAccessKeyOne", "nsSecretKeyOne"), | ||
| // NamespaceName("fakeNsName2") -> new BasicAWSCredentials("fake11", "fake11"), | ||
| // NamespaceName("nsName2") -> new BasicAWSCredentials("nsAccessKeyTwo", "nsSecretKeyTwo"), | ||
| // NamespaceName("fakeNsName3") -> new BasicAWSCredentials("fake111", "fake111"), | ||
| // ) | ||
| // } | ||
| // } | ||
| // proxy.startup.map { binding => | ||
| // try testCode(getAmazonS3( | ||
| // authority = Authority(Host(binding.localAddress.getAddress), binding.localAddress.getPort) | ||
| // )) | ||
| // finally proxy.shutdown() | ||
| // } | ||
| // } | ||
| // | ||
| // | ||
| // ListMap("nsName1" -> "nsOneBucket_1", "nsName2" -> "nsTwoBucket_1")foreach { case (namespace, testBucket) => | ||
| // s"S3 Proxy for $namespace (where $testBucket exists)" should { | ||
| // "put, get and delete an object from the bucket" in withS3SdkToMockProxy { sdk => | ||
| // withFile(1024 * 1024) { filename => | ||
| // val testKeyContent = "keyPutFileByContent" | ||
| // val testKeyFile = "keyPutFileByFile" | ||
| // val testContent = "content" | ||
| // | ||
| // // PUT | ||
| // sdk.putObject(testBucket, testKeyContent, testContent) | ||
| // sdk.putObject(testBucket, testKeyFile, new File(filename)) | ||
| // | ||
| // // GET | ||
| // val checkContent = sdk.getObjectAsString(testBucket, testKeyContent) | ||
| // assert(checkContent == testContent) | ||
| // val keys1 = getKeysInBucket(sdk, testBucket) | ||
| // List(testKeyContent, testKeyFile).map(k => assert(keys1.contains(k))) | ||
| // | ||
| // // DELETE | ||
| // sdk.deleteObject(testBucket, testKeyContent) | ||
| // val keys2 = getKeysInBucket(sdk, testBucket) | ||
| // assert(!keys2.contains(testKeyContent)) | ||
| // assert(keys2.contains(testKeyFile)) | ||
| // | ||
| // sdk.deleteObject(testBucket, testKeyFile) | ||
| // val keys3 = getKeysInBucket(sdk, testBucket) | ||
| // assert(!keys3.contains(testKeyFile)) | ||
| // } | ||
| // } | ||
| // } | ||
| // } | ||
| // | ||
| // "S3 Proxy for not existing bucket" should { | ||
| // val testBucket = "notexistingbucket" | ||
| // "throw SdkClientException exception" in withS3SdkToMockProxy { sdk => | ||
| // assertThrows[SdkClientException] { | ||
| // sdk.listObjectsV2(testBucket) | ||
| // } | ||
| // } | ||
| // } | ||
| //} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.