Merge branch '3.1.x'

Author: ryanjbaxter

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/PassphraseCredentialsProvider.java

@@ -31,17 +31,17 @@ public class PassphraseCredentialsProvider extends CredentialsProvider {
 	/**
 	 * Prompt to skip iteration for.
 	 */
-	public static final String PROMPT = "Passphrase for";
+	public static final String PROMPT = "Passphrase";
 
-	private final String passphrase;
+	private final char[] passphrase;
 
 	/**
 	 * Initialize the provider with a the ssh passphrase.
 	 * @param passphrase passphrase to populate the credential items with
 	 */
 	public PassphraseCredentialsProvider(String passphrase) {
 		super();
-		this.passphrase = passphrase;
+		this.passphrase = passphrase.toCharArray();
 	}
 
 	/**
@@ -58,12 +58,13 @@ public boolean isInteractive() {
 	@Override
 	public boolean supports(CredentialItem... items) {
 		for (final CredentialItem item : items) {
-			if (item instanceof CredentialItem.StringType && item.getPromptText().startsWith(PROMPT)) {
+			if (item instanceof CredentialItem.InformationalMessage) {
 				continue;
 			}
-			else {
-				return false;
+			if (item instanceof CredentialItem.Password && item.getPromptText().equals(PROMPT)) {
+				continue;
 			}
+			return false;
 		}
 		return true;
 	}
@@ -80,8 +81,11 @@ public boolean supports(CredentialItem... items) {
 	@Override
 	public boolean get(URIish uri, CredentialItem... items) throws UnsupportedCredentialItem {
 		for (final CredentialItem item : items) {
-			if (item instanceof CredentialItem.StringType && item.getPromptText().startsWith(PROMPT)) {
-				((CredentialItem.StringType) item).setValue(this.passphrase);
+			if (item instanceof CredentialItem.InformationalMessage) {
+				continue;
+			}
+			if (item instanceof CredentialItem.Password && item.getPromptText().equals(PROMPT)) {
+				((CredentialItem.Password) item).setValue(this.passphrase);
 				continue;
 			}
 			throw new UnsupportedCredentialItem(uri, item.getClass().getName() + ":" + item.getPromptText());

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java

@@ -922,12 +922,11 @@ public void passphraseShouldSetCredentials() throws Exception {
 		CredentialsProvider provider = mockCloneCommand.getCredentialsProvider();
 		assertThat(provider.isInteractive()).isFalse();
 
-		CredentialItem.StringType stringCredential = new CredentialItem.StringType(PassphraseCredentialsProvider.PROMPT,
-				true);
+		CredentialItem.Password credential = new CredentialItem.Password(PassphraseCredentialsProvider.PROMPT);
 
-		assertThat(provider.supports(stringCredential)).isTrue();
-		provider.get(new URIish(), stringCredential);
-		assertThat(passphrase).isEqualTo(stringCredential.getValue());
+		assertThat(provider.supports(credential)).isTrue();
+		provider.get(new URIish(), credential);
+		assertThat(passphrase.toCharArray()).isEqualTo(credential.getValue());
 	}
 
 	@Test
@@ -951,12 +950,13 @@ public void gitCredentialsProviderFactoryCreatesPassphraseProvider() throws Exce
 		CredentialsProvider provider = mockCloneCommand.getCredentialsProvider();
 		assertThat(provider.isInteractive()).isFalse();
 
-		CredentialItem.StringType stringCredential = new CredentialItem.StringType(PassphraseCredentialsProvider.PROMPT,
-				true);
+		CredentialItem.InformationalMessage informational = new CredentialItem.InformationalMessage(
+				"Passphrase required for ssh key");
+		CredentialItem.Password credential = new CredentialItem.Password(PassphraseCredentialsProvider.PROMPT);
 
-		assertThat(provider.supports(stringCredential)).isTrue();
-		provider.get(new URIish(), stringCredential);
-		assertThat(passphrase).isEqualTo(stringCredential.getValue());
+		assertThat(provider.supports(credential)).isTrue();
+		provider.get(new URIish(), informational, credential);
+		assertThat(passphrase.toCharArray()).isEqualTo(credential.getValue());
 
 	}