From d73630e7431fdc1434a40e6ce7f33388f25bb2f3 Mon Sep 17 00:00:00 2001 From: Aayush Atharva Date: Wed, 25 Oct 2023 10:32:34 +0530 Subject: [PATCH] Dependencies Upgrade (#1911) * Bump org.eclipse.jetty:jetty-servlets from 11.0.15 to 11.0.16 in /client (#1909) Bumps [org.eclipse.jetty:jetty-servlets](https://github.com/eclipse/jetty.project) from 11.0.15 to 11.0.16. - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-11.0.15...jetty-11.0.16) --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-servlets dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 67325d3609052f6615ce271188773a08750beaba) * Bump org.apache.tomcat.embed:tomcat-embed-core in /client (#1910) Bumps org.apache.tomcat.embed:tomcat-embed-core from 10.1.8 to 10.1.13. --- updated-dependencies: - dependency-name: org.apache.tomcat.embed:tomcat-embed-core dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 2d1b227be35321f11f9b2a081625f6fff15bebc7) * Dependencies Upgrade --------- Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../intercept/ProxyUnauthorized407Interceptor.java | 2 +- .../handler/intercept/Unauthorized401Interceptor.java | 2 +- pom.xml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/src/main/java/org/asynchttpclient/netty/handler/intercept/ProxyUnauthorized407Interceptor.java b/client/src/main/java/org/asynchttpclient/netty/handler/intercept/ProxyUnauthorized407Interceptor.java index d937ff8cf..b30f6bbd9 100644 --- a/client/src/main/java/org/asynchttpclient/netty/handler/intercept/ProxyUnauthorized407Interceptor.java +++ b/client/src/main/java/org/asynchttpclient/netty/handler/intercept/ProxyUnauthorized407Interceptor.java @@ -205,7 +205,7 @@ private static void ntlmProxyChallenge(String authenticateHeader, HttpHeaders re future.setInProxyAuth(false); } else { String serverChallenge = authenticateHeader.substring("NTLM ".length()).trim(); - String challengeHeader = NtlmEngine.INSTANCE.generateType3Msg(proxyRealm.getPrincipal(), proxyRealm.getPassword(), proxyRealm.getNtlmDomain(), + String challengeHeader = NtlmEngine.generateType3Msg(proxyRealm.getPrincipal(), proxyRealm.getPassword(), proxyRealm.getNtlmDomain(), proxyRealm.getNtlmHost(), serverChallenge); // FIXME we might want to filter current NTLM and add (leave other // Authorization headers untouched) diff --git a/client/src/main/java/org/asynchttpclient/netty/handler/intercept/Unauthorized401Interceptor.java b/client/src/main/java/org/asynchttpclient/netty/handler/intercept/Unauthorized401Interceptor.java index d622a4675..cb89f70b8 100644 --- a/client/src/main/java/org/asynchttpclient/netty/handler/intercept/Unauthorized401Interceptor.java +++ b/client/src/main/java/org/asynchttpclient/netty/handler/intercept/Unauthorized401Interceptor.java @@ -188,7 +188,7 @@ private static void ntlmChallenge(String authenticateHeader, } else { String serverChallenge = authenticateHeader.substring("NTLM ".length()).trim(); - String challengeHeader = NtlmEngine.INSTANCE.generateType3Msg(realm.getPrincipal(), realm.getPassword(), + String challengeHeader = NtlmEngine.generateType3Msg(realm.getPrincipal(), realm.getPassword(), realm.getNtlmDomain(), realm.getNtlmHost(), serverChallenge); // FIXME we might want to filter current NTLM and add (leave other // Authorization headers untouched) diff --git a/pom.xml b/pom.xml index 42c96fc06..0856473af 100644 --- a/pom.xml +++ b/pom.xml @@ -58,11 +58,11 @@ 11 UTF-8 - 4.1.94.Final - 0.0.20.Final - 2.0.5 + 4.1.100.Final + 0.0.23.Final + 2.0.9 2.0.1 - 1.4.5 + 1.4.11 24.0.1