svn commit: r1304739 - in /whirr/branches/branch-0.7: CHANGES.txt core/src/main/java/org/apache/whirr/compute/BootstrapTemplate.java

[asavu]

Author: asavu
Date: Sat Mar 24 09:43:27 2012
New Revision: 1304739

URL: http://svn.apache.org/viewvc?rev=1304739&view=rev
Log:
WHIRR-563. Disable password based authentication (Rodrigo Duarte Sousa via 
Andrei Savu)

Modified:
    whirr/branches/branch-0.7/CHANGES.txt
    
whirr/branches/branch-0.7/core/src/main/java/org/apache/whirr/compute/BootstrapTemplate.java

Modified: whirr/branches/branch-0.7/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/whirr/branches/branch-0.7/CHANGES.txt?rev=1304739&r1=1304738&r2=1304739&view=diff
==============================================================================
--- whirr/branches/branch-0.7/CHANGES.txt (original)
+++ whirr/branches/branch-0.7/CHANGES.txt Sat Mar 24 09:43:27 2012
@@ -23,12 +23,16 @@ Release 0.7.2
 
     WHIRR-553. Upgrade Cassandra to 1.0.8 (Andrei Savu)
   
-    WHIRR-335. Update Hama service to Hama 0.4-incubating (Edward J. Yoon via 
Frank Scholten)
+    WHIRR-335. Update Hama service to Hama 0.4-incubating 
+    (Edward J. Yoon via Frank Scholten)
 
     WHIRR-464. Do not fail if whirr.cluster-user already exists on the 
     remote machine (Rodrigo Duarte Sousa via Andrei Savu)
 
     WHIRR-374. Enforce Maven 3 (Tom White via Andrei Savu)
+
+    WHIRR-563. Disable password based authentication 
+    (Rodrigo Duarte Sousa via Andrei Savu)
  
   BUG FIXES
 

Modified: 
whirr/branches/branch-0.7/core/src/main/java/org/apache/whirr/compute/BootstrapTemplate.java
URL: 
http://svn.apache.org/viewvc/whirr/branches/branch-0.7/core/src/main/java/org/apache/whirr/compute/BootstrapTemplate.java?rev=1304739&r1=1304738&r2=1304739&view=diff
==============================================================================
--- 
whirr/branches/branch-0.7/core/src/main/java/org/apache/whirr/compute/BootstrapTemplate.java
 (original)
+++ 
whirr/branches/branch-0.7/core/src/main/java/org/apache/whirr/compute/BootstrapTemplate.java
 Sat Mar 24 09:43:27 2012
@@ -44,6 +44,7 @@ import static org.jclouds.scriptbuilder.
 import static 
org.jclouds.scriptbuilder.domain.Statements.createOrOverwriteFile;
 import static org.jclouds.scriptbuilder.domain.Statements.interpret;
 import static org.jclouds.scriptbuilder.domain.Statements.newStatementList;
+import static 
org.jclouds.scriptbuilder.statements.ssh.SshStatements.sshdConfig;
 
 public class BootstrapTemplate {
 
@@ -89,6 +90,7 @@ public class BootstrapTemplate {
       ImmutableList.<Statement> of(
         ensureUserExistsWithPublicAndPrivateKey(user, publicKey, privateKey),
         makeSudoersOnlyPermitting(user),
+        disablePasswordBasedAuth(),
         statement)
     );
   }
@@ -111,7 +113,7 @@ public class BootstrapTemplate {
 
   // must be used inside InitBuilder, as this sets the shell variables used in 
this statement
   private static Statement ensureUserExistsWithPublicAndPrivateKey(String 
username,
-     String publicKey, String privateKey) {
+    String publicKey, String privateKey) {
     // note directory must be created first
     return newStatementList(
       interpret(
@@ -151,4 +153,7 @@ public class BootstrapTemplate {
     );
   }
 
+  private static Statement disablePasswordBasedAuth() {
+    return sshdConfig(ImmutableMap.of("PasswordAuthentication","no"));
+  }
 }