Madhura Bhave
5 years ago
commit
8d9b1d2988
@ -0,0 +1,49 @@
|
||||
/*
|
||||
* Copyright 2012-2020 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.web.server;
|
||||
|
||||
import java.security.KeyStore;
|
||||
import java.security.KeyStoreException;
|
||||
|
||||
import org.springframework.util.Assert;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
/**
|
||||
* Provides utilities around SSL.
|
||||
*
|
||||
* @author Chris Bono
|
||||
* @since 2.1.13
|
||||
*/
|
||||
public final class SslConfigurationValidator {
|
||||
|
||||
private SslConfigurationValidator() {
|
||||
}
|
||||
|
||||
public static void validateKeyAlias(KeyStore keyStore, String keyAlias) {
|
||||
if (!StringUtils.isEmpty(keyAlias)) {
|
||||
try {
|
||||
Assert.state(keyStore.containsAlias(keyAlias),
|
||||
() -> String.format("Keystore does not contain specified alias '%s'", keyAlias));
|
||||
}
|
||||
catch (KeyStoreException ex) {
|
||||
throw new IllegalStateException(
|
||||
String.format("Could not determine if keystore contains alias '%s'", keyAlias), ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,79 @@
|
||||
/*
|
||||
* Copyright 2012-2019 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.web.server;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.security.KeyStore;
|
||||
import java.security.KeyStoreException;
|
||||
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
|
||||
/**
|
||||
* Tests for {@link SslConfigurationValidator}.
|
||||
*
|
||||
* @author Chris Bono
|
||||
*/
|
||||
|
||||
public class SslConfigurationValidatorTest {
|
||||
|
||||
private static final String VALID_ALIAS = "test-alias";
|
||||
|
||||
private static final String INVALID_ALIAS = "test-alias-5150";
|
||||
|
||||
private KeyStore keyStore;
|
||||
|
||||
@BeforeEach
|
||||
void loadKeystore() throws Exception {
|
||||
this.keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
|
||||
this.keyStore.load(new FileInputStream(new File("src/test/resources/test.jks")), "secret".toCharArray());
|
||||
}
|
||||
|
||||
@Test
|
||||
void validateKeyAliasWhenAliasFoundShouldNotFail() {
|
||||
SslConfigurationValidator.validateKeyAlias(this.keyStore, VALID_ALIAS);
|
||||
}
|
||||
|
||||
@Test
|
||||
void validateKeyAliasWhenNullAliasShouldNotFail() {
|
||||
SslConfigurationValidator.validateKeyAlias(this.keyStore, null);
|
||||
}
|
||||
|
||||
@Test
|
||||
void validateKeyAliasWhenEmptyAliasShouldNotFail() {
|
||||
SslConfigurationValidator.validateKeyAlias(this.keyStore, "");
|
||||
}
|
||||
|
||||
@Test
|
||||
void validateKeyAliasWhenAliasNotFoundShouldThrowException() {
|
||||
assertThatThrownBy(() -> SslConfigurationValidator.validateKeyAlias(this.keyStore, INVALID_ALIAS))
|
||||
.isInstanceOf(IllegalStateException.class)
|
||||
.hasMessage("Keystore does not contain specified alias '" + INVALID_ALIAS + "'");
|
||||
}
|
||||
|
||||
@Test
|
||||
void validateKeyAliasWhenKeyStoreThrowsExceptionOnContains() throws KeyStoreException {
|
||||
KeyStore uninitializedKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
|
||||
assertThatThrownBy(() -> SslConfigurationValidator.validateKeyAlias(uninitializedKeyStore, "alias"))
|
||||
.isInstanceOf(IllegalStateException.class)
|
||||
.hasMessage("Could not determine if keystore contains alias 'alias'");
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue