Skip to content

Move to apache-v5 in google http client #1242

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

Merged
loosebazooka merged 1 commit into from
Jul 9, 2026
+24 −9
Merged

Move to apache-v5 in google http client #1242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions sigstore-java/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies {
annotationProcessor("org.immutables:value:2.12.2")

implementation(platform("com.google.http-client:google-http-client-bom:2.1.1"))
implementation("com.google.http-client:google-http-client-apache-v2")
implementation("com.google.http-client:google-http-client-apache-v5")
implementation("com.google.http-client:google-http-client-gson")

implementation("io.github.erdtman:java-json-canonicalization:1.1")
Expand All @@ -34,7 +34,6 @@ dependencies {
runtimeOnly("io.grpc:grpc-netty-shaded")
compileOnly("org.apache.tomcat:annotations-api:6.0.53") // java 9+ only

implementation("commons-codec:commons-codec:1.18.0")
implementation("com.google.code.gson:gson:2.14.0")
implementation("org.bouncycastle:bcutil-jdk18on:1.84")
implementation("org.bouncycastle:bcpkix-jdk18on:1.84")
Expand Down
30 changes: 23 additions & 7 deletions sigstore-java/src/main/java/dev/sigstore/http/HttpClients.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,17 @@
import com.google.api.client.http.HttpBackOffIOExceptionHandler;
import com.google.api.client.http.HttpRequestFactory;
import com.google.api.client.http.HttpTransport;
import com.google.api.client.http.apache.v2.ApacheHttpTransport;
import com.google.api.client.http.apache.v5.Apache5HttpTransport;
import com.google.api.client.util.ExponentialBackOff;
import com.google.api.client.util.ObjectParser;
import dev.sigstore.forbidden.SuppressForbidden;
import javax.annotation.Nullable;
import org.apache.http.HttpHeaders;
import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.hc.client5.http.config.ConnectionConfig;
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.util.TimeValue;

/** HttpClients generates Google Http Client objects from configuration. */
public class HttpClients {
Expand All @@ -36,11 +39,24 @@ public class HttpClients {
* you need to also configure the response parser}.
*/
public static HttpTransport newHttpTransport(HttpParams httpParams) {
HttpClientBuilder hcb = ApacheHttpTransport.newDefaultHttpClientBuilder();
if (httpParams.getAllowInsecureConnections()) {
hcb.setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE);
var connManager =
PoolingHttpClientConnectionManagerBuilder.create()
.setSSLSocketFactory(
SSLConnectionSocketFactoryBuilder.create()
.setHostnameVerifier(NoopHostnameVerifier.INSTANCE)

@vlsi vlsi Jul 7, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just noticed. Did we really intend a security issue here? Should we verify hostname for the SSL?

@loosebazooka loosebazooka Jul 7, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is only for the insecure option. like if you want to hit a local server with no tls or something.

.build())
.setMaxConnTotal(200)
.setMaxConnPerRoute(20)
.setDefaultConnectionConfig(
ConnectionConfig.custom().setTimeToLive(TimeValue.NEG_ONE_MILLISECOND).build())
.build();
return new Apache5HttpTransport(
Apache5HttpTransport.newDefaultHttpClientBuilder()
.setConnectionManager(connManager)
.build());
}
return new ApacheHttpTransport(hcb.build());
return new Apache5HttpTransport(Apache5HttpTransport.newDefaultHttpClientBuilder().build());
}

/** Create a new get requests with the httpParams applied and retries. */
Expand Down
Loading