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

Fix SecurityNetty4HttpServerTransportTests #96178

Merged
merged 3 commits into from
May 17, 2023
Merged

Fix SecurityNetty4HttpServerTransportTests #96178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
078834f
Skip test for turkish-like locale
albertzaharovits May 16, 2023
d590039
Spotless
albertzaharovits May 16, 2023
9adeee0
Spotless
albertzaharovits May 16, 2023
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
5 changes: 5 additions & 0 deletions test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2002,4 +2002,9 @@ public static void safeSleep(long millis) {
throw new AssertionError("unexpected", e);
}
}

protected static boolean isTurkishLocale() {
return Locale.getDefault().getLanguage().equals(new Locale("tr").getLanguage())
|| Locale.getDefault().getLanguage().equals(new Locale("az").getLanguage());
}
}
5 changes: 0 additions & 5 deletions ...dentity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/test/IdpSamlTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,6 @@ public static void localeChecks() throws Exception {
}
}

private static boolean isTurkishLocale() {
return Locale.getDefault().getLanguage().equals(new Locale("tr").getLanguage())
|| Locale.getDefault().getLanguage().equals(new Locale("az").getLanguage());
}

@AfterClass
public static void restoreLocale() {
if (restoreLocale != null) {
Expand Down
5 changes: 0 additions & 5 deletions ...ugin/security/src/test/java/org/elasticsearch/xpack/security/authc/saml/SamlTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,6 @@ public static void setupSaml() throws Exception {
SamlUtils.initialize(logger);
}

private static boolean isTurkishLocale() {
return Locale.getDefault().getLanguage().equals(new Locale("tr").getLanguage())
|| Locale.getDefault().getLanguage().equals(new Locale("az").getLanguage());
}

@AfterClass
public static void restoreLocale() {
if (restoreLocale != null) {
Expand Down
37 changes: 21 additions & 16 deletions ...elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransportTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,10 @@ public void dispatchBadRequest(final RestChannel channel, final ThreadContext th
}

public void testMalformedRequestDispatchedNoAuthn() throws Exception {
assumeTrue(
"This test doesn't work correctly under turkish-like locale, because it uses String#toUpper() for asserted error messages",
isTurkishLocale() == false
);
final AtomicReference<Throwable> dispatchThrowableReference = new AtomicReference<>();
final AtomicInteger authnInvocationCount = new AtomicInteger();
final AtomicInteger badDispatchInvocationCount = new AtomicInteger();
Expand Down Expand Up @@ -574,8 +578,8 @@ public void dispatchBadRequest(final RestChannel channel, final ThreadContext th
EmbeddedChannel ch = new EmbeddedChannel(handler);
ByteBuf buf = ch.alloc().buffer();
ByteBufUtil.copy(AsciiString.of("This is not a valid HTTP line"), buf);
ByteBufUtil.writeShortBE(buf, HttpConstants.LF);
ByteBufUtil.writeShortBE(buf, HttpConstants.LF);
buf.writeByte(HttpConstants.LF);
buf.writeByte(HttpConstants.LF);
var writeFuture = testThreadPool.generic().submit(() -> {
ch.writeInbound(buf);
ch.flushInbound();
Expand All @@ -590,8 +594,8 @@ public void dispatchBadRequest(final RestChannel channel, final ThreadContext th
EmbeddedChannel ch = new EmbeddedChannel(handler);
ByteBuf buf = ch.alloc().buffer();
ByteBufUtil.copy(AsciiString.of("GET /this/is/a/valid/but/too/long/initial/line HTTP/1.1"), buf);
ByteBufUtil.writeShortBE(buf, HttpConstants.LF);
ByteBufUtil.writeShortBE(buf, HttpConstants.LF);
buf.writeByte(HttpConstants.LF);
buf.writeByte(HttpConstants.LF);
var writeFuture = testThreadPool.generic().submit(() -> {
ch.writeInbound(buf);
ch.flushInbound();
Expand All @@ -606,10 +610,10 @@ public void dispatchBadRequest(final RestChannel channel, final ThreadContext th
EmbeddedChannel ch = new EmbeddedChannel(handler);
ByteBuf buf = ch.alloc().buffer();
ByteBufUtil.copy(AsciiString.of("GET /url HTTP/1.1"), buf);
ByteBufUtil.writeShortBE(buf, HttpConstants.LF);
buf.writeByte(HttpConstants.LF);
ByteBufUtil.copy(AsciiString.of("Host"), buf);
ByteBufUtil.writeShortBE(buf, HttpConstants.LF);
ByteBufUtil.writeShortBE(buf, HttpConstants.LF);
buf.writeByte(HttpConstants.LF);
buf.writeByte(HttpConstants.LF);
var writeFuture = testThreadPool.generic().submit(() -> {
ch.writeInbound(buf);
ch.flushInbound();
Expand All @@ -624,10 +628,10 @@ public void dispatchBadRequest(final RestChannel channel, final ThreadContext th
EmbeddedChannel ch = new EmbeddedChannel(handler);
ByteBuf buf = ch.alloc().buffer();
ByteBufUtil.copy(AsciiString.of("GET /url HTTP/1.1"), buf);
ByteBufUtil.writeShortBE(buf, HttpConstants.LF);
buf.writeByte(HttpConstants.LF);
ByteBufUtil.copy(AsciiString.of("Host: this.looks.like.a.good.url.but.is.longer.than.permitted"), buf);
ByteBufUtil.writeShortBE(buf, HttpConstants.LF);
ByteBufUtil.writeShortBE(buf, HttpConstants.LF);
buf.writeByte(HttpConstants.LF);
buf.writeByte(HttpConstants.LF);
var writeFuture = testThreadPool.generic().submit(() -> {
ch.writeInbound(buf);
ch.flushInbound();
Expand All @@ -642,10 +646,11 @@ public void dispatchBadRequest(final RestChannel channel, final ThreadContext th
EmbeddedChannel ch = new EmbeddedChannel(handler);
ByteBuf buf = ch.alloc().buffer();
ByteBufUtil.copy(AsciiString.of("GET /url HTTP/1.1"), buf);
ByteBufUtil.writeShortBE(buf, HttpConstants.LF);
ByteBufUtil.copy(AsciiString.of("Host: invalid host value"), buf);
ByteBufUtil.writeShortBE(buf, HttpConstants.LF);
ByteBufUtil.writeShortBE(buf, HttpConstants.LF);
buf.writeByte(HttpConstants.LF);
ByteBufUtil.copy(AsciiString.of("Host: invalid header value"), buf);
buf.writeByte(0x01);
buf.writeByte(HttpConstants.LF);
buf.writeByte(HttpConstants.LF);
var writeFuture = testThreadPool.generic().submit(() -> {
ch.writeInbound(buf);
ch.flushInbound();
Expand All @@ -660,9 +665,9 @@ public void dispatchBadRequest(final RestChannel channel, final ThreadContext th
EmbeddedChannel ch = new EmbeddedChannel(handler);
ByteBuf buf = ch.alloc().buffer();
ByteBufUtil.copy(AsciiString.of("GET /url HTTP/1.1"), buf);
ByteBufUtil.writeShortBE(buf, HttpConstants.LF);
buf.writeByte(HttpConstants.LF);
ByteBufUtil.copy(AsciiString.of("Host: localhost"), buf);
ByteBufUtil.writeShortBE(buf, HttpConstants.LF);
buf.writeByte(HttpConstants.LF);
testThreadPool.generic().submit(() -> {
ch.writeInbound(buf);
ch.flushInbound();
Expand Down