Add option to override username and password requirements in profile.

Former-commit-id: 5ad373691a02426fb3e854a081aa194d8a2e0ccd
iterate-ch · Feb 26, 2015 · 49f5f32 · 49f5f32
1 parent 202a75e
commit 49f5f32
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 1 deletion.
diff --git a/profiles/S3 (Temporary Credentials).cyberduckprofile b/profiles/S3 (Temporary Credentials).cyberduckprofile
@@ -27,5 +27,9 @@
         <string>S3 (Amazon Simple Storage Service)</string>
         <key>Context</key>
         <string>http://169.254.169.254/latest/meta-data/iam/security-credentials/s3access</string>
+        <key>Username Configurable</key>
+        <false/>
+        <key>Password Configurable</key>
+        <false/>
     </dict>
 </plist>
diff --git a/source/ch/cyberduck/core/AbstractProtocol.java b/source/ch/cyberduck/core/AbstractProtocol.java
@@ -106,6 +106,16 @@ public boolean isAnonymousConfigurable() {
         return true;
     }
 
+    @Override
+    public boolean isUsernameConfigurable() {
+        return true;
+    }
+
+    @Override
+    public boolean isPasswordConfigurable() {
+        return true;
+    }
+
     @Override
     public boolean isUTCTimezone() {
         return true;

diff --git a/source/ch/cyberduck/core/LoginOptions.java b/source/ch/cyberduck/core/LoginOptions.java
@@ -86,6 +86,8 @@ public boolean isAnonymous() {
     public LoginOptions(final Protocol protocol) {
         publickey = protocol.getType() == Protocol.Type.ssh;
         anonymous = protocol.isAnonymousConfigurable();
+        user = protocol.isUsernameConfigurable();
+        password = protocol.isPasswordConfigurable();
     }
 
     @Override

diff --git a/source/ch/cyberduck/core/Profile.java b/source/ch/cyberduck/core/Profile.java
@@ -282,6 +282,22 @@ public boolean isAnonymousConfigurable() {
         return parent.isAnonymousConfigurable();
     }
 
+    @Override
+    public boolean isUsernameConfigurable() {
+        if(StringUtils.isBlank(this.value("Username Configurable"))) {
+            return parent.isUsernameConfigurable();
+        }
+        return this.bool("Username Configurable");
+    }
+
+    @Override
+    public boolean isPasswordConfigurable() {
+        if(StringUtils.isBlank(this.value("Password Configurable"))) {
+            return parent.isPasswordConfigurable();
+        }
+        return this.bool("Password Configurable");
+    }
+
     @Override
     public boolean isHostnameConfigurable() {
         if(StringUtils.isBlank(this.value("Hostname Configurable"))) {

diff --git a/source/ch/cyberduck/core/Protocol.java b/source/ch/cyberduck/core/Protocol.java
@@ -111,10 +111,20 @@ public boolean validate(final Credentials credentials, final LoginOptions option
     }
 
     /**
-     * @return True if anonymous logins are possible.
+     * @return True if anonymous login is possible.
      */
     boolean isAnonymousConfigurable();
 
+    /**
+     * @return True if username is required
+     */
+    boolean isUsernameConfigurable();
+
+    /**
+     * @return True if password is required
+     */
+    boolean isPasswordConfigurable();
+
     /**
      * @return False if the hostname to connect is static.
      */

diff --git a/test/ch/cyberduck/core/s3/S3SessionTest.java b/test/ch/cyberduck/core/s3/S3SessionTest.java
@@ -288,6 +288,7 @@ public void testBucketVirtualHostStyleEucalyptusCustomDeployment() throws Except
     public void testTemporaryAccessToken() throws Exception {
         final Profile profile = ProfileReaderFactory.get().read(
                 new Local("profiles/S3 (Temporary Credentials).cyberduckprofile"));
+        assertTrue(profile.validate(new Credentials(), new LoginOptions(profile)));
         final Host host = new Host(profile);
         final S3Session s = new S3Session(host);
         s.open(new DisabledHostKeyCallback(), new DisabledTranscriptListener());