Skip to content

Commit 6afba08

Browse files
hyperxprohyperxpro
committed
Release 2.12.4 with CVE Fix: 2024-53990
1 parent 7a370af commit 6afba08

File tree

17 files changed

+77
-60
lines changed

17 files changed

+77
-60
lines changed

‎bom/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.asynchttpclient</groupId>
77
<artifactId>async-http-client-project</artifactId>
8-
<version>2.12.3</version>
8+
<version>2.12.4</version>
99
</parent>
1010

1111
<artifactId>async-http-client-bom</artifactId>

‎client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<groupId>org.asynchttpclient</groupId>
44
<artifactId>async-http-client-project</artifactId>
5-
<version>2.12.3</version>
5+
<version>2.12.4</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88
<artifactId>async-http-client</artifactId>

‎client/src/main/java/org/asynchttpclient/DefaultAsyncHttpClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ public <T> ListenableFuture<T> executeRequest(Request request, AsyncHandler<T> h
214214
if (!cookies.isEmpty()) {
215215
RequestBuilder requestBuilder = request.toBuilder();
216216
for (Cookie cookie : cookies) {
217-
requestBuilder.addOrReplaceCookie(cookie);
217+
requestBuilder.addCookieIfUnset(cookie);
218218
}
219219
request = requestBuilder.build();
220220
}

‎client/src/main/java/org/asynchttpclient/RequestBuilderBase.java

+22-5
Original file line numberDiff line numberDiff line change
@@ -308,26 +308,43 @@ public T addCookie(Cookie cookie) {
308308

309309
/**
310310
* Add/replace a cookie based on its name
311+
*
311312
* @param cookie the new cookie
312313
* @return this
313314
*/
314315
public T addOrReplaceCookie(Cookie cookie) {
316+
return maybeAddOrReplaceCookie(cookie, true);
317+
}
318+
319+
/**
320+
* Add a cookie based on its name, if it does not exist yet. Cookies that
321+
* are already set will be ignored.
322+
*
323+
* @param cookie the new cookie
324+
* @return this
325+
*/
326+
public T addCookieIfUnset(Cookie cookie) {
327+
return maybeAddOrReplaceCookie(cookie, false);
328+
}
329+
330+
private T maybeAddOrReplaceCookie(Cookie cookie, boolean allowReplace) {
315331
String cookieKey = cookie.name();
316332
boolean replace = false;
317333
int index = 0;
318334
lazyInitCookies();
319-
for (Cookie c : this.cookies) {
335+
for (Cookie c : cookies) {
320336
if (c.name().equals(cookieKey)) {
321337
replace = true;
322338
break;
323339
}
324340

325341
index++;
326342
}
327-
if (replace)
328-
this.cookies.set(index, cookie);
329-
else
330-
this.cookies.add(cookie);
343+
if (!replace) {
344+
cookies.add(cookie);
345+
} else if (allowReplace) {
346+
cookies.set(index, cookie);
347+
}
331348
return asDerivedType();
332349
}
333350

‎client/src/main/java/org/asynchttpclient/netty/handler/intercept/Redirect30xInterceptor.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,9 @@ else if (isNonEmpty(request.getBodyParts())) {
135135
// Update request's cookies assuming that cookie store is already updated by Interceptors
136136
List<Cookie> cookies = cookieStore.get(newUri);
137137
if (!cookies.isEmpty())
138-
for (Cookie cookie : cookies)
139-
requestBuilder.addOrReplaceCookie(cookie);
138+
for (Cookie cookie : cookieStore.get(newUri)) {
139+
requestBuilder.addCookieIfUnset(cookie);
140+
}
140141
}
141142

142143
boolean sameBase = request.getUri().isSameBase(newUri);

‎example/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<groupId>org.asynchttpclient</groupId>
44
<artifactId>async-http-client-project</artifactId>
5-
<version>2.12.3</version>
5+
<version>2.12.4</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88
<artifactId>async-http-client-example</artifactId>

‎extras/guava/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<groupId>org.asynchttpclient</groupId>
44
<artifactId>async-http-client-extras-parent</artifactId>
5-
<version>2.12.3</version>
5+
<version>2.12.4</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88
<artifactId>async-http-client-extras-guava</artifactId>

‎extras/jdeferred/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<parent>
1919
<artifactId>async-http-client-extras-parent</artifactId>
2020
<groupId>org.asynchttpclient</groupId>
21-
<version>2.12.3</version>
21+
<version>2.12.4</version>
2222
</parent>
2323
<artifactId>async-http-client-extras-jdeferred</artifactId>
2424
<name>Asynchronous Http Client JDeferred Extras</name>

‎extras/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<groupId>org.asynchttpclient</groupId>
44
<artifactId>async-http-client-project</artifactId>
5-
<version>2.12.3</version>
5+
<version>2.12.4</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88
<artifactId>async-http-client-extras-parent</artifactId>

‎extras/registry/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<groupId>org.asynchttpclient</groupId>
44
<artifactId>async-http-client-extras-parent</artifactId>
5-
<version>2.12.3</version>
5+
<version>2.12.4</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88
<artifactId>async-http-client-extras-registry</artifactId>

‎extras/retrofit2/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>async-http-client-extras-parent</artifactId>
66
<groupId>org.asynchttpclient</groupId>
7-
<version>2.12.3</version>
7+
<version>2.12.4</version>
88
</parent>
99

1010
<artifactId>async-http-client-extras-retrofit2</artifactId>

‎extras/rxjava/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>async-http-client-extras-parent</artifactId>
55
<groupId>org.asynchttpclient</groupId>
6-
<version>2.12.3</version>
6+
<version>2.12.4</version>
77
</parent>
88
<artifactId>async-http-client-extras-rxjava</artifactId>
99
<name>Asynchronous Http Client RxJava Extras</name>

‎extras/rxjava2/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>async-http-client-extras-parent</artifactId>
55
<groupId>org.asynchttpclient</groupId>
6-
<version>2.12.3</version>
6+
<version>2.12.4</version>
77
</parent>
88
<artifactId>async-http-client-extras-rxjava2</artifactId>
99
<name>Asynchronous Http Client RxJava2 Extras</name>

‎extras/simple/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>async-http-client-extras-parent</artifactId>
55
<groupId>org.asynchttpclient</groupId>
6-
<version>2.12.3</version>
6+
<version>2.12.4</version>
77
</parent>
88
<artifactId>async-http-client-extras-simple</artifactId>
99
<name>Asynchronous Http Simple Client</name>

‎extras/typesafeconfig/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>async-http-client-extras-parent</artifactId>
66
<groupId>org.asynchttpclient</groupId>
7-
<version>2.12.3</version>
7+
<version>2.12.4</version>
88
</parent>
99

1010
<artifactId>async-http-client-extras-typesafe-config</artifactId>

‎netty-utils/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<groupId>org.asynchttpclient</groupId>
44
<artifactId>async-http-client-project</artifactId>
5-
<version>2.12.3</version>
5+
<version>2.12.4</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88
<artifactId>async-http-client-netty-utils</artifactId>

‎pom.xml

+38-39
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.asynchttpclient</groupId>
66
<artifactId>async-http-client-project</artifactId>
7-
<version>2.12.3</version>
7+
<version>2.12.4</version>
88
<packaging>pom</packaging>
99

1010
<name>Asynchronous Http Client Project</name>
@@ -24,17 +24,17 @@
2424

2525
<developers>
2626
<developer>
27-
<id>slandelle</id>
28-
<name>Stephane Landelle</name>
29-
<email>[email protected]</email>
27+
<id>hyperxpro</id>
28+
<name>Aayush Atharva</name>
29+
<email>[email protected]</email>
3030
</developer>
3131
</developers>
3232

3333
<scm>
3434
<connection>scm:git:[email protected]:AsyncHttpClient/async-http-client.git</connection>
3535
<developerConnection>scm:git:[email protected]:AsyncHttpClient/async-http-client.git</developerConnection>
3636
<url>https://github.com/AsyncHttpClient/async-http-client/tree/master</url>
37-
<tag>async-http-client-project-2.12.3</tag>
37+
<tag>async-http-client-project-2.12.4</tag>
3838
</scm>
3939

4040
<distributionManagement>
@@ -220,42 +220,41 @@
220220
</execution>
221221
</executions>
222222
</plugin>
223+
<plugin>
224+
<groupId>org.sonatype.plugins</groupId>
225+
<artifactId>nexus-staging-maven-plugin</artifactId>
226+
<version>1.7.0</version>
227+
<extensions>true</extensions>
228+
<configuration>
229+
<serverId>ossrh</serverId>
230+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
231+
<autoReleaseAfterClose>false</autoReleaseAfterClose>
232+
<skipRemoteStaging>false</skipRemoteStaging>
233+
</configuration>
234+
</plugin>
235+
<plugin>
236+
<groupId>org.apache.maven.plugins</groupId>
237+
<artifactId>maven-gpg-plugin</artifactId>
238+
<version>3.2.7</version>
239+
<executions>
240+
<execution>
241+
<id>sign-artifacts</id>
242+
<phase>verify</phase>
243+
<goals>
244+
<goal>sign</goal>
245+
</goals>
246+
<configuration>
247+
<!-- Prevent gpg from using pinentry programs -->
248+
<gpgArguments>
249+
<arg>--pinentry-mode</arg>
250+
<arg>loopback</arg>
251+
</gpgArguments>
252+
</configuration>
253+
</execution>
254+
</executions>
255+
</plugin>
223256
</plugins>
224257
</build>
225-
<profiles>
226-
<profile>
227-
<id>release-sign-artifacts</id>
228-
<activation>
229-
<property>
230-
<name>performRelease</name>
231-
<value>true</value>
232-
</property>
233-
</activation>
234-
<build>
235-
<plugins>
236-
<plugin>
237-
<artifactId>maven-gpg-plugin</artifactId>
238-
<version>1.6</version>
239-
<executions>
240-
<execution>
241-
<id>sign-artifacts</id>
242-
<phase>verify</phase>
243-
<goals>
244-
<goal>sign</goal>
245-
</goals>
246-
</execution>
247-
</executions>
248-
</plugin>
249-
</plugins>
250-
</build>
251-
</profile>
252-
<profile>
253-
<id>test-output</id>
254-
<properties>
255-
<surefire.redirectTestOutputToFile>false</surefire.redirectTestOutputToFile>
256-
</properties>
257-
</profile>
258-
</profiles>
259258

260259
<modules>
261260
<module>bom</module>

0 commit comments

Comments
 (0)