# HG changeset patch # User Severin Gehwolf # Date 1442942032 -7200 # Node ID c99480ceed022a3b924c27739d40e4fc5278effb # Parent 3dc082384025e037fb6989a2b88980b7e9385906 Fix interactive storage credentials. Reviewed-by: neugens, ebaron Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2015-September/016435.html PR2645 diff -r 3dc082384025 -r c99480ceed02 launcher/src/main/java/com/redhat/thermostat/launcher/InteractiveStorageCredentials.java --- a/launcher/src/main/java/com/redhat/thermostat/launcher/InteractiveStorageCredentials.java Wed Sep 23 11:53:49 2015 -0400 +++ b/launcher/src/main/java/com/redhat/thermostat/launcher/InteractiveStorageCredentials.java Tue Sep 22 19:13:52 2015 +0200 @@ -75,7 +75,7 @@ public String getUsername() { String username = null; if (url.equals(prefs.getConnectionUrl())) { - prefs.getUserName(); + username = prefs.getUserName(); } if (username == null) { try { @@ -84,14 +84,19 @@ throw new InteractiveException(t.localize(LocaleResources.LAUNCHER_USER_AUTH_PROMPT_ERROR).getContents(), e); } } - return username.length() == 0 ? null : username; + // getter.getUsername() might return null on short input + if (username == null) { + return null; + } else { + return username.length() == 0 ? null : username; + } } @Override public char[] getPassword() { char[] password = null; if (url.equals(prefs.getConnectionUrl())) { - keyring.getPassword(url, prefs.getUserName()); + password = keyring.getPassword(url, prefs.getUserName()); } if (password == null) { try { @@ -100,9 +105,14 @@ throw new InteractiveException(t.localize(LocaleResources.LAUNCHER_USER_AUTH_PROMPT_ERROR).getContents(), e); } } - return password.length == 0 ? null : password; + // getter.getPassword() might return null on short input + if (password == null) { + return null; + } else { + return password.length == 0 ? null : password; + } } - + class InteractiveException extends RuntimeException { private static final long serialVersionUID = -7921653973987512258L; diff -r 3dc082384025 -r c99480ceed02 launcher/src/test/java/com/redhat/thermostat/launcher/InteractiveStorageCredentialsTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/launcher/src/test/java/com/redhat/thermostat/launcher/InteractiveStorageCredentialsTest.java Tue Sep 22 19:13:52 2015 +0200 @@ -0,0 +1,127 @@ +/* + * Copyright 2012-2015 Red Hat, Inc. + * + * This file is part of Thermostat. + * + * Thermostat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2, or (at your + * option) any later version. + * + * Thermostat is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Thermostat; see the file COPYING. If not see + * . + * + * Linking this code with other modules is making a combined work + * based on this code. Thus, the terms and conditions of the GNU + * General Public License cover the whole combination. + * + * As a special exception, the copyright holders of this code give + * you permission to link this code with independent modules to + * produce an executable, regardless of the license terms of these + * independent modules, and to copy and distribute the resulting + * executable under terms of your choice, provided that you also + * meet, for each linked independent module, the terms and conditions + * of the license of that module. An independent module is a module + * which is not derived from or based on this code. If you modify + * this code, you may extend this exception to your version of the + * library, but you are not obligated to do so. If you do not wish + * to do so, delete this exception statement from your version. + */ + +package com.redhat.thermostat.launcher; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; + +import org.junit.Before; +import org.junit.Test; + +import com.redhat.thermostat.common.cli.Console; +import com.redhat.thermostat.common.config.ClientPreferences; +import com.redhat.thermostat.utils.keyring.Keyring; + +public class InteractiveStorageCredentialsTest { + + private static final String URL = "http://example.com/thermostat/storage"; + private static final String DIFFERENT_URL = "http://example.com/thermostat/storage"; + + private Console console; + private ByteArrayOutputStream baout; + + @Before + public void setup() { + console = mock(Console.class); + baout = new ByteArrayOutputStream(); + when(console.getOutput()).thenReturn(new PrintStream(baout)); + } + + @Test + public void canGetUsernameFromPrefs() { + String input = ""; // should never be used + when(console.getInput()).thenReturn(new ByteArrayInputStream(input.getBytes())); + String username = "foouser"; + ClientPreferences prefs = mock(ClientPreferences.class); + when(prefs.getUserName()).thenReturn(username); + when(prefs.getConnectionUrl()).thenReturn(URL); + Keyring keyring = mock(Keyring.class); + InteractiveStorageCredentials creds = new InteractiveStorageCredentials(prefs, keyring, URL, console); + String actual = creds.getUsername(); + assertEquals(username, actual); + } + + @Test + public void canGetPasswordFromKeyring() { + String input = ""; // should never be used + when(console.getInput()).thenReturn(new ByteArrayInputStream(input.getBytes())); + String password = "testme"; + String username = "foouser"; + ClientPreferences prefs = mock(ClientPreferences.class); + when(prefs.getUserName()).thenReturn(username); + when(prefs.getConnectionUrl()).thenReturn(URL); + Keyring keyring = mock(Keyring.class); + when(keyring.getPassword(URL, username)).thenReturn(password.toCharArray()); + InteractiveStorageCredentials creds = new InteractiveStorageCredentials(prefs, keyring, URL, console); + char[] actual = creds.getPassword(); + assertNotNull("expected password from keyring", actual); + assertEquals(password, new String(actual)); + } + + @Test + public void promptsForUsernameIfNotPresentInPreferences() { + String username = "someuser"; + String input = String.format("%s\n", username); + when(console.getInput()).thenReturn(new ByteArrayInputStream(input.getBytes())); + ClientPreferences prefs = mock(ClientPreferences.class); + when(prefs.getConnectionUrl()).thenReturn(DIFFERENT_URL); // something *not* URL + Keyring keyring = mock(Keyring.class); + InteractiveStorageCredentials creds = new InteractiveStorageCredentials(prefs, keyring, URL, console); + String actual = creds.getUsername(); + assertEquals(username, actual); + } + + @Test + public void promptsForPasswordIfNotPresentInKeyring() { + String password = "somepassword"; + String input = String.format("%s\n", password); + when(console.getInput()).thenReturn(new ByteArrayInputStream(input.getBytes())); + ClientPreferences prefs = mock(ClientPreferences.class); + when(prefs.getConnectionUrl()).thenReturn(DIFFERENT_URL); // something *not* URL + Keyring keyring = mock(Keyring.class); + InteractiveStorageCredentials creds = new InteractiveStorageCredentials(prefs, keyring, URL, console); + char[] actual = creds.getPassword(); + assertNotNull("expected password to be read from prompt", actual); + assertEquals(password, new String(actual)); + } +}