Implement username/password authentication

comeara · Jul 12, 2016 · 577941a · 577941a
1 parent cd5517d
commit 577941a
Show file tree

Hide file tree

Showing 6 changed files with 840 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -147,21 +147,24 @@ application.conf might look like the following:
         acceptance_test {
             cassandra-seed-address: "127.0.0.1"
             cassandra-keyspace-name: "pillar_acceptance_test"
-            cassandra-port: "9042"
             cassandra-ssl: "true"
+            cassandra-username: "faker"
+            cassandra-password: "soopersecret"
         }
     }
 
 [typesafeconfig]:https://github.com/typesafehub/config
 
 Alternatively, Pillar accepts environment variable overrides according to the following table.
 
-| Key                                            | Environment Variable | Default |
-|------------------------------------------------|----------------------|---------|
-| pillar.\<store>.\<env>.cassandra-seed-address  | PILLAR_SEED_ADDRESS  |         |
-| pillar.\<store>.\<env>.cassandra-keyspace-name |                      |         |
-| pillar.\<store>.\<env>.cassandra-port          | PILLAR_PORT          | 9042    |
-| pillar.\<store>.\<env>.cassandra-ssl           | PILLAR_SSL           | false   |
+| Key                                            | Environment Variable | Default   |
+|------------------------------------------------|----------------------|-----------|
+| pillar.\<store>.\<env>.cassandra-seed-address  | PILLAR_SEED_ADDRESS  |           |
+| pillar.\<store>.\<env>.cassandra-keyspace-name |                      |           |
+| pillar.\<store>.\<env>.cassandra-port          | PILLAR_PORT          | 9042      |
+| pillar.\<store>.\<env>.cassandra-ssl           | PILLAR_SSL           | false     |
+| pillar.\<store>.\<env>.cassandra-username      | PILLAR_USERNAME      | cassandra |
+| pillar.\<store>.\<env>.cassandra-password      | PILLAR_PASSWORD      | cassandra |
 
 Reference the acceptance spec suite for details.
 

diff --git a/src/main/scala/com/chrisomeara/pillar/cli/App.scala b/src/main/scala/com/chrisomeara/pillar/cli/App.scala
@@ -40,7 +40,9 @@ class App(reporter: Reporter) {
       case Some(s) => s
       case _ => getFromConfiguration(configuration, dataStoreName, environment, "cassandra-port", Some(9042.toString))
     })
-    val builder = Cluster.builder().addContactPoint(seedAddress).withPort(port)
+    val username = sys.env.getOrElse("PILLAR_USERNAME", getFromConfiguration(configuration, dataStoreName, environment, "cassandra-username", Some("cassandra")))
+    val password = sys.env.getOrElse("PILLAR_PASSWORD", getFromConfiguration(configuration, dataStoreName, environment, "cassandra-password", Some("cassandra")))
+    val builder = Cluster.builder().addContactPoint(seedAddress).withPort(port).withCredentials(username, password)
     if(sys.env.get("PILLAR_SSL") match {
       case Some(s) => s.toBoolean
       case None => getFromConfiguration(configuration, dataStoreName, environment, "cassandra-ssl", Some("false")).toBoolean

diff --git a/src/test/resources/docker/cassandra-with-auth-2.1/Dockerfile b/src/test/resources/docker/cassandra-with-auth-2.1/Dockerfile
@@ -0,0 +1,3 @@
+FROM cassandra:2.1
+
+ADD contents /