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.

Sign up for GitHub

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

Jump to bottom

Disable ipv6 test for #6624 #6625

Merged
merged 1 commit into from Aug 17, 2021
Merged

Disable ipv6 test for #6624 #6625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTLSTest.java
View file
Open in desktop
Expand Up @@ -63,7 +63,6 @@
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.toolchain.test.Net;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.ExecutorThreadPool;
Expand Down Expand Up @@ -1014,6 +1013,7 @@ public void testForcedNonDomainSNI() throws Exception
.send();
assertEquals(HttpStatus.OK_200, response2.getStatus());

/* TODO Fix. See #6624
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about marking the test method with @DisabledOnJre({JRE.JAVA_17})
easier to search for common annotation @Disabled*

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because the test is parameterized and tests other stuff. So the test is not disabled, just the IPv6 part of it is.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is its hard to keep track of TODOs because we have so many of them in the code. So it might just get lost and never be fixed, maybe if you at least commented in the issue as a reminder so it is not forgotten.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do. This PR does not close the issue, so the issue will remain open.

if (Net.isIpv6InterfaceAvailable())
{
// Send a request with SNI "[::1]", we should get the certificate at alias=ip.
Expand All @@ -1023,6 +1023,7 @@ public void testForcedNonDomainSNI() throws Exception

assertEquals(HttpStatus.OK_200, response3.getStatus());
}
*/
}

@Test
Expand Down
1 change: 1 addition & 0 deletions jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java
View file
Open in desktop
Expand Up @@ -2282,6 +2282,7 @@ private static List<SNIServerName> getSniServerNames(SSLEngine sslEngine, List<S
String host = sslEngine.getPeerHost();
if (host != null)
{
// TODO Must handle : somehow as java17 SNIHostName never handles: See #6624
// Must use the byte[] constructor, because the character ':' is forbidden when
// using the String constructor (but typically present in IPv6 addresses).
return Collections.singletonList(new SNIHostName(host.getBytes(StandardCharsets.US_ASCII)));
Expand Down