Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4,x] Fixed method that compares SSLParameters for equality #8570

Merged
merged 1 commit into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions common/tls/src/main/java/io/helidon/common/tls/Tls.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
* Copyright (c) 2022, 2024 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -286,8 +286,8 @@ private static int hashCode(SSLParameters first) {
return result;
}

private static boolean equals(SSLParameters first, SSLParameters second) {
return first.getAlgorithmConstraints().equals(second.getAlgorithmConstraints())
static boolean equals(SSLParameters first, SSLParameters second) {
return Objects.equals(first.getAlgorithmConstraints(), second.getAlgorithmConstraints())
&& Arrays.equals(first.getApplicationProtocols(), second.getApplicationProtocols())
&& Arrays.equals(first.getCipherSuites(), second.getCipherSuites())
&& (first.getEnableRetransmissions() == second.getEnableRetransmissions())
Expand All @@ -297,8 +297,8 @@ private static boolean equals(SSLParameters first, SSLParameters second) {
&& Arrays.equals(first.getProtocols(), second.getProtocols())
&& (first.getUseCipherSuitesOrder() == second.getUseCipherSuitesOrder())
&& (first.getWantClientAuth() == second.getWantClientAuth())
&& first.getServerNames().equals(second.getServerNames())
&& first.getSNIMatchers().equals(second.getSNIMatchers());
&& Objects.equals(first.getServerNames(), second.getServerNames())
&& Objects.equals(first.getSNIMatchers(), second.getSNIMatchers());
}

private void checkEnabled() {
Expand Down
71 changes: 71 additions & 0 deletions common/tls/src/test/java/io/helidon/common/tls/TlsTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/*
* Copyright (c) 2024 Oracle and/or its affiliates.
*
* 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
*
* http://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 io.helidon.common.tls;

import java.security.AlgorithmConstraints;
import java.security.AlgorithmParameters;
import java.security.CryptoPrimitive;
import java.security.Key;
import java.util.List;
import java.util.Set;

import javax.net.ssl.SSLParameters;

import org.junit.jupiter.api.Test;

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;

public class TlsTest {
@Test
public void testTlsEquals() {
SSLParameters first = new SSLParameters();
SSLParameters second = new SSLParameters();

assertThat(Tls.equals(first, second), is(true));

AlgorithmConstraints constraints = new AlgorithmConstraints() {
@Override
public boolean permits(Set<CryptoPrimitive> primitives, String algorithm, AlgorithmParameters parameters) {
return false;
}

@Override
public boolean permits(Set<CryptoPrimitive> primitives, Key key) {
return false;
}

@Override
public boolean permits(Set<CryptoPrimitive> primitives, String algorithm, Key key, AlgorithmParameters parameters) {
return false;
}
};

first.setAlgorithmConstraints(constraints);
second.setAlgorithmConstraints(constraints);

assertThat(Tls.equals(first, second), is(true));

first.setServerNames(List.of());
second.setServerNames(List.of());

assertThat(Tls.equals(first, second), is(true));

first.setSNIMatchers(List.of());
second.setSNIMatchers(List.of());
}
}