Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
4.17.0 (Aug 22, 2025)
- Added a maximum size payload when posting unique keys telemetry in batches
- Added ProxyConfiguration parameter to support proxies, including Harness Forward Proxy, allowing also for more secured authentication options: MTLS, Bearer token and user/password authentication. Read more in our docs.

4.16.1 (Jul 21, 2025)
- Fixed vulnerabilities:
- Upgraded org.apache.commons-commons-lang3 to 3.18.0
Expand Down
4 changes: 2 additions & 2 deletions client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<parent>
<groupId>io.split.client</groupId>
<artifactId>java-client-parent</artifactId>
<version>4.17.0-rc3</version>
<version>4.17.0</version>
</parent>
<version>4.17.0-rc3</version>
<version>4.17.0</version>
<artifactId>java-client</artifactId>
<packaging>jar</packaging>
<name>Java Client</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@
import java.net.InetAddress;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.file.Paths;
import java.security.KeyStore;
import java.util.concurrent.ExecutorService;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -606,7 +605,7 @@ private static SSLContext buildSSLContext(SplitClientConfig config) throws IOExc
InputStream keystoreStream = null;
try {
KeyStore keyStore = KeyStore.getInstance("PKCS12");
keystoreStream = java.nio.file.Files.newInputStream(Paths.get(config.proxyConfiguration().getP12File()));
keystoreStream = config.proxyConfiguration().getP12File();
keyStore.load(keystoreStream, config.proxyConfiguration().getPassKey().toCharArray());
sslContext = SSLContexts.custom()
.loadKeyMaterial(keyStore, config.proxyConfiguration().getPassKey().toCharArray())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,27 @@

import org.apache.hc.core5.http.HttpHost;

import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;

public class ProxyConfiguration {
private final HttpHost _proxyHost;
private ProxyCredentialsProvider _provider;
private final String _p12File;
private final InputStream _p12File;
private final String _passKey;

private ProxyConfiguration(HttpHost proxyHost,
ProxyCredentialsProvider proxyCredentialsProvider,
String p12File, String passKey) {
InputStream p12File, String passKey) {
_proxyHost = proxyHost;
_p12File = p12File;
_passKey = passKey;
_provider = proxyCredentialsProvider;
}

public HttpHost getHost() { return _proxyHost; }
public String getP12File() { return _p12File; }
public InputStream getP12File() { return _p12File; }
public String getPassKey() { return _passKey; }
public ProxyCredentialsProvider getProxyCredentialsProvider() { return _provider; }

Expand All @@ -32,7 +33,7 @@ public static ProxyConfiguration.Builder builder() {
public static class Builder {
private ProxyCredentialsProvider _provider;
private HttpHost _proxyHost;
private String _p12File;
private InputStream _p12File;
private String _passKey;

public ProxyConfiguration.Builder credentialsProvider(ProxyCredentialsProvider provider) {
Expand All @@ -49,7 +50,7 @@ public ProxyConfiguration.Builder url(URL url) throws MalformedURLException {
return this;
}

public ProxyConfiguration.Builder mtls(String p12File, String passKey) {
public ProxyConfiguration.Builder mtls(InputStream p12File, String passKey) {
_passKey = passKey;
_p12File = p12File;
return this;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
import org.junit.Test;
import org.mockito.Mockito;

import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.List;
Expand Down Expand Up @@ -260,7 +262,7 @@ public Map<String, List<String>> getHeaderOverrides(RequestContext context) {
}

@Test
public void checkProxyParams() throws MalformedURLException {
public void checkProxyParams() throws MalformedURLException, FileNotFoundException {
SplitClientConfig config = SplitClientConfig.builder()
.proxyConfiguration(new ProxyConfiguration.Builder()
.url(new URL("https://proxy-host:8888"))
Expand Down Expand Up @@ -304,14 +306,14 @@ public String getToken() {
.build())
.build();
Assert.assertEquals(bearerCredentialsProvider, config.proxyConfiguration().getProxyCredentialsProvider());

FileInputStream p12File = new FileInputStream("src/test/resources/keyStore.p12");
config = SplitClientConfig.builder()
.proxyConfiguration(new ProxyConfiguration.Builder()
.url(new URL("https://proxy-host:888"))
.mtls("path/to/file", "pass-key")
.mtls(p12File, "pass-key")
.build())
.build();
Assert.assertEquals("path/to/file", config.proxyConfiguration().getP12File());
Assert.assertEquals(p12File, config.proxyConfiguration().getP12File());
Assert.assertEquals("pass-key", config.proxyConfiguration().getPassKey());
}

Expand Down Expand Up @@ -352,11 +354,11 @@ public void mustUseP12FileWithProxyMtls() throws MalformedURLException {
}

@Test(expected = IllegalArgumentException.class)
public void mustUseP12PassKeyWithProxyMtls() throws MalformedURLException {
public void mustUseP12PassKeyWithProxyMtls() throws MalformedURLException, FileNotFoundException {
SplitClientConfig.builder()
.proxyConfiguration(new ProxyConfiguration.Builder()
.url(new URL("https://proxy-host:888"))
.mtls("path/to/file", null)
.mtls(new FileInputStream("src/test/resources/keyStore.p12"), null)
.build())
.build();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public void testFactoryInstantiationWithProxyMtls() throws Exception {
.setBlockUntilReadyTimeout(1000)
.proxyConfiguration(ProxyConfiguration.builder()
.url(new URL("http://proxy-name:6060"))
.mtls("src/test/resources/keyStore.p12", "split")
.mtls(new FileInputStream("src/test/resources/keyStore.p12"), "split")
.build())
.build();
SplitFactoryImpl splitFactory3 = new SplitFactoryImpl(API_KEY, splitClientConfig);
Expand Down
4 changes: 2 additions & 2 deletions okhttp-modules/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<parent>
<artifactId>java-client-parent</artifactId>
<groupId>io.split.client</groupId>
<version>4.17.0-rc3</version>
<version>4.17.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>4.17.0-rc3</version>
<version>4.17.0</version>
<artifactId>okhttp-modules</artifactId>
<packaging>jar</packaging>
<name>http-modules</name>
Expand Down
2 changes: 1 addition & 1 deletion pluggable-storage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>java-client-parent</artifactId>
<groupId>io.split.client</groupId>
<version>4.17.0-rc3</version>
<version>4.17.0</version>
</parent>

<version>2.1.0</version>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.split.client</groupId>
<artifactId>java-client-parent</artifactId>
<version>4.17.0-rc3</version>
<version>4.17.0</version>
<dependencyManagement>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion redis-wrapper/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>java-client-parent</artifactId>
<groupId>io.split.client</groupId>
<version>4.17.0-rc3</version>
<version>4.17.0</version>
</parent>
<artifactId>redis-wrapper</artifactId>
<version>3.1.1</version>
Expand Down
4 changes: 2 additions & 2 deletions testing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>io.split.client</groupId>
<artifactId>java-client-parent</artifactId>
<version>4.17.0-rc3</version>
<version>4.17.0</version>
</parent>
<artifactId>java-client-testing</artifactId>
<packaging>jar</packaging>
<version>4.17.0-rc3</version>
<version>4.17.0</version>
<name>Java Client For Testing</name>
<description>Testing suite for Java SDK for Split</description>
<dependencies>
Expand Down