From 5197d914fd597db157cae450207cbf026db936de Mon Sep 17 00:00:00 2001 From: Anton Abyshev Date: Tue, 11 Apr 2023 14:57:24 +0400 Subject: [PATCH 1/8] OPL-7494 update version, logging and distribution management --- .../intercept/ProxyUnauthorized407Interceptor.java | 1 + pom.xml | 14 ++++++++------ 2 files changed, 9 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 b30f6bbd9..07d2de710 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 @@ -144,6 +144,7 @@ public boolean exitAfterHandling407(Channel channel, NettyResponseFuture futu try { kerberosProxyChallenge(proxyRealm, proxyServer, requestHeaders); } catch (SpnegoEngineException e) { + LOGGER.error("Kerberos/Spnego proxy auth failed", e); String ntlmHeader2 = getHeaderWithPrefix(proxyAuthHeaders, "NTLM"); if (ntlmHeader2 != null) { LOGGER.warn("Kerberos/Spnego proxy auth failed, proceeding with NTLM"); diff --git a/pom.xml b/pom.xml index 9dfe832a7..8b236143a 100644 --- a/pom.xml +++ b/pom.xml @@ -71,14 +71,16 @@ - - sonatype-nexus-staging - https://oss.sonatype.org/content/repositories/snapshots - - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + apica-artifacts + a0pbpgwdghsu9-artifactory-primary-0-releases + https://apica.jfrog.io/artifactory/backend-services-releases + + snapshots + a0pbpgwdghsu9-artifactory-primary-0-snapshots + https://apica.jfrog.io/artifactory/backend-services-snapshots + From 92016d69e914eb015b5cc7b38687b1aefa314007 Mon Sep 17 00:00:00 2001 From: Anton Abyshev Date: Tue, 11 Apr 2023 15:03:21 +0400 Subject: [PATCH 2/8] OPL-7494 add repository --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 8b236143a..6a6c32220 100644 --- a/pom.xml +++ b/pom.xml @@ -83,6 +83,13 @@ + + + backend-services-releases + https://apica.jfrog.io/artifactory/backend-services-releases/ + + + github https://github.com/AsyncHttpClient/async-http-client/issues From e3ad5fab3bb98369fc008b1f936ce2f8d9258675 Mon Sep 17 00:00:00 2001 From: Anton Abyshev Date: Tue, 11 Apr 2023 15:25:57 +0400 Subject: [PATCH 3/8] OPL-7494 disable test --- .../java/org/asynchttpclient/DefaultAsyncHttpClientTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/src/test/java/org/asynchttpclient/DefaultAsyncHttpClientTest.java b/client/src/test/java/org/asynchttpclient/DefaultAsyncHttpClientTest.java index fc7a1c2db..c39888494 100644 --- a/client/src/test/java/org/asynchttpclient/DefaultAsyncHttpClientTest.java +++ b/client/src/test/java/org/asynchttpclient/DefaultAsyncHttpClientTest.java @@ -23,6 +23,7 @@ import org.asynchttpclient.cookie.CookieEvictionTask; import org.asynchttpclient.cookie.CookieStore; import org.asynchttpclient.cookie.ThreadSafeCookieStore; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.condition.EnabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -57,6 +58,7 @@ public void testNativeTransportWithEpollOnly() throws Exception { @RepeatedIfExceptionsTest(repeats = 5) @EnabledOnOs(OS.LINUX) + @Disabled // doesn't work on TeamCity Agent public void testNativeTransportWithoutEpollOnly() throws Exception { AsyncHttpClientConfig config = config().setUseNativeTransport(true).setUseOnlyEpollNativeTransport(false).build(); try (DefaultAsyncHttpClient client = (DefaultAsyncHttpClient) asyncHttpClient(config)) { From e9a6d76932ae2eed82902796149ba6a48d9b6f36 Mon Sep 17 00:00:00 2001 From: Anton Abyshev Date: Tue, 11 Apr 2023 15:33:45 +0400 Subject: [PATCH 4/8] OPL-7494 disable gpg and staging plugins --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 6a6c32220..3d0f5a0f8 100644 --- a/pom.xml +++ b/pom.xml @@ -401,7 +401,7 @@ - + + <!– Prevent gpg from using pinentry programs –> - --pinentry-mode + --pinentry-mode loopback - + --> From 7ea6aa643b5dfcc76663000bc1efb04e26f4f304 Mon Sep 17 00:00:00 2001 From: Anton Abyshev Date: Fri, 28 Apr 2023 11:04:28 +0400 Subject: [PATCH 5/8] OPL-7818 update GSSName --- .../org/asynchttpclient/spnego/SpnegoEngine.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/client/src/main/java/org/asynchttpclient/spnego/SpnegoEngine.java b/client/src/main/java/org/asynchttpclient/spnego/SpnegoEngine.java index d67d923bb..31226cafc 100644 --- a/client/src/main/java/org/asynchttpclient/spnego/SpnegoEngine.java +++ b/client/src/main/java/org/asynchttpclient/spnego/SpnegoEngine.java @@ -156,10 +156,11 @@ public String generateToken(String host) throws SpnegoEngineException { // Try SPNEGO by default, fall back to Kerberos later if error negotiationOid = new Oid(SPNEGO_OID); + boolean tryKerberos = false; String spn = getCompleteServicePrincipalName(host); try { GSSManager manager = GSSManager.getInstance(); - GSSName serverName = manager.createName(spn, GSSName.NT_HOSTBASED_SERVICE); + GSSName serverName = getCompleteGSSName(host, manager); GSSCredential myCred = null; if (username != null || loginContextName != null || customLoginConfig != null && !customLoginConfig.isEmpty()) { String contextName = loginContextName; @@ -195,7 +196,7 @@ public String generateToken(String host) throws SpnegoEngineException { log.debug("Using Kerberos MECH {}", KERBEROS_OID); negotiationOid = new Oid(KERBEROS_OID); GSSManager manager = GSSManager.getInstance(); - GSSName serverName = manager.createName(spn, GSSName.NT_HOSTBASED_SERVICE); + GSSName serverName = getCompleteGSSName(host, manager); gssContext = manager.createContext(serverName.canonicalize(negotiationOid), negotiationOid, null, GSSContext.DEFAULT_LIFETIME); gssContext.requestMutualAuth(true); @@ -244,6 +245,16 @@ public String generateToken(String host) throws SpnegoEngineException { } } + GSSName getCompleteGSSName(String host, GSSManager manager) throws GSSException { + if (servicePrincipalName != null && servicePrincipalName.contains("@")) { + log.debug("Service Principal Name is {}", servicePrincipalName); + return manager.createName(servicePrincipalName, GSSName.NT_USER_NAME); + } + + String spn = getCompleteServicePrincipalName(host); + return manager.createName(spn, GSSName.NT_HOSTBASED_SERVICE); + } + String getCompleteServicePrincipalName(String host) { String name; if (servicePrincipalName == null) { From 5df0a9cb87a09e10ebddb201bcc9ffb9efa3a3b4 Mon Sep 17 00:00:00 2001 From: Anton Abyshev Date: Thu, 13 Feb 2025 10:56:35 +0400 Subject: [PATCH 6/8] OPL-11613 update to the latest version --- client/pom.xml | 2 +- .../src/main/java/org/asynchttpclient/spnego/SpnegoEngine.java | 2 -- pom.xml | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index b2e551d5a..16d3b8555 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -19,7 +19,7 @@ org.asynchttpclient async-http-client-project - 3.0.1 + 3.0.1.Apica 4.0.0 diff --git a/client/src/main/java/org/asynchttpclient/spnego/SpnegoEngine.java b/client/src/main/java/org/asynchttpclient/spnego/SpnegoEngine.java index 31226cafc..8435109e1 100644 --- a/client/src/main/java/org/asynchttpclient/spnego/SpnegoEngine.java +++ b/client/src/main/java/org/asynchttpclient/spnego/SpnegoEngine.java @@ -156,8 +156,6 @@ public String generateToken(String host) throws SpnegoEngineException { // Try SPNEGO by default, fall back to Kerberos later if error negotiationOid = new Oid(SPNEGO_OID); - boolean tryKerberos = false; - String spn = getCompleteServicePrincipalName(host); try { GSSManager manager = GSSManager.getInstance(); GSSName serverName = getCompleteGSSName(host, manager); diff --git a/pom.xml b/pom.xml index 3d0f5a0f8..4f6d23557 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.asynchttpclient async-http-client-project - 3.0.1 + 3.0.1.Apica pom AHC/Project From 09177ebdc5182ecd3642c150a85c79c8124ac67c Mon Sep 17 00:00:00 2001 From: Anton Abyshev Date: Thu, 13 Feb 2025 11:19:30 +0400 Subject: [PATCH 7/8] OPL-11613 disable javadoc plugin --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4f6d23557..754e54dfa 100644 --- a/pom.xml +++ b/pom.xml @@ -387,6 +387,7 @@ + + + -->