view common/core/src/test/java/com/redhat/thermostat/common/ssl/SSLConfigurationTest.java @ 1094:51540fc0849c

Fix handling of keystores with no password The previous commit causes some tests in CustomX509TrustManagerTest to fail that involve keystores that are not password-protected. It appears these tests were silently ignoring password errors, which were corrected in the previous commit. The problem is that KeyStore.load expects a null password if the keystore is not password-protected, and we were supplying the empty string. This commit changes all instances where we pass the empty string to KeyStore.load. This also replaces empty.keystore used in tests. The keystore we have now actually has an entry, this new keystore is in fact empty. Reviewed-by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-May/006582.html
author Elliott Baron <ebaron@redhat.com>
date Fri, 17 May 2013 14:08:07 -0400
parents f82c6b24dcbd
children
line wrap: on
line source

/*
 * Copyright 2012, 2013 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
 * <http://www.gnu.org/licenses/>.
 *
 * 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.common.ssl;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import java.io.File;

import org.junit.Test;

import com.redhat.thermostat.common.ssl.SSLConfiguration;

public class SSLConfigurationTest {

    @Test
    public void canGetKeystoreFileFromProps() throws Exception {
        File clientProps = new File(this.getClass().getResource("/client.properties").getFile());
        SSLConfiguration.initClientProperties(clientProps);
        String keystorePath = "/path/to/thermostat.keystore";
        String keystorePwd = "some password";
        assertEquals(keystorePath, SSLConfiguration.getKeystoreFile().getAbsolutePath());
        assertEquals(keystorePwd, SSLConfiguration.getKeyStorePassword());
    }
    
    @Test
    public void notExistingPropertiesFileReturnsNull() throws Exception {
        File clientProps = new File("i/am/not/there/file.txt");
        SSLConfiguration.initClientProperties(clientProps);
        assertTrue(SSLConfiguration.getKeystoreFile() == null);
        assertEquals(null, SSLConfiguration.getKeyStorePassword());
    }
    
    @Test
    public void canGetSSLEnabledConfigs() {
        File clientProps = new File(this.getClass().getResource("/client.properties").getFile());
        SSLConfiguration.initClientProperties(clientProps);
        assertTrue(SSLConfiguration.enableForCmdChannel());
        assertTrue(SSLConfiguration.enableForBackingStorage());
        assertTrue(SSLConfiguration.disableHostnameVerification());
        clientProps = new File(this.getClass().getResource("/ssl.properties").getFile());
        SSLConfiguration.initClientProperties(clientProps);
        assertFalse(SSLConfiguration.enableForCmdChannel());
        assertFalse(SSLConfiguration.enableForBackingStorage());
        assertFalse(SSLConfiguration.disableHostnameVerification());
    }
}