Skip to content

Commit 747c6ce

Browse files
SCANJLIB-269 Bump jetty from 9.4.55.v20240627 to 10.0.25 (#247)
1 parent 863d3a9 commit 747c6ce

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

its/it-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<description>Integration tests</description>
1212

1313
<properties>
14-
<jetty.version>9.4.55.v20240627</jetty.version>
14+
<jetty.version>10.0.25</jetty.version>
1515
<logback.version>1.3.15</logback.version>
1616
<sonar.skip>true</sonar.skip>
1717
<skipTests>true</skipTests>

its/it-tests/src/test/java/com/sonar/scanner/lib/it/tools/ProxyAuthenticator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939

4040
import java.io.IOException;
4141
import java.nio.charset.StandardCharsets;
42+
import java.util.Base64;
4243
import javax.servlet.ServletRequest;
4344
import javax.servlet.ServletResponse;
4445
import javax.servlet.http.HttpServletRequest;
@@ -52,7 +53,6 @@
5253
import org.eclipse.jetty.server.Authentication;
5354
import org.eclipse.jetty.server.Authentication.User;
5455
import org.eclipse.jetty.server.UserIdentity;
55-
import org.eclipse.jetty.util.B64Code;
5656
import org.eclipse.jetty.util.security.Constraint;
5757

5858
/**
@@ -92,7 +92,7 @@ public Authentication validateRequest(ServletRequest req, ServletResponse res, b
9292
String method = credentials.substring(0, space);
9393
if ("basic".equalsIgnoreCase(method)) {
9494
credentials = credentials.substring(space + 1);
95-
credentials = B64Code.decode(credentials, StandardCharsets.ISO_8859_1);
95+
credentials = new String(Base64.getDecoder().decode(credentials), StandardCharsets.ISO_8859_1);
9696
int i = credentials.indexOf(':');
9797
if (i > 0) {
9898
String username = credentials.substring(0, i);

0 commit comments

Comments
 (0)