Merge branch 'release/3.3.0'

CHANGELOG.md

@@ -0,0 +1,13 @@
+# Changelog
+
+## [3.2.0](https://github.com/aklivity/k3po/tree/3.2.0) (2024-06-10)
+
+[Full Changelog](https://github.com/aklivity/k3po/compare/284507aec12987508378f7fb470ccc88754e17f1...3.2.0)
+
+**Merged pull requests:**
+
+- Initial tidy [\#4](https://github.com/aklivity/k3po/pull/4) ([jfallows](https://github.com/jfallows))
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

pom.xml

@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.aklivity.k3po</groupId>
   <artifactId>k3po</artifactId>
-  <version>3.2.0</version>
+  <version>3.3.0</version>
   <packaging>pom</packaging>
   <name>k3po</name>
   <url>https://github.com/aklivity/k3po</url>
@@ -115,12 +115,12 @@
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
-        <version>2.9.10.6</version>
+        <version>2.12.7.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-compat</artifactId>
-        <version>3.5.0</version>
+        <version>3.8.1</version>
         <scope>provided</scope>
       </dependency>
       <dependency>

runtime/control-junit/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.aklivity.k3po</groupId>
     <artifactId>runtime</artifactId>
-    <version>3.2.0</version>
+    <version>3.3.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

runtime/control/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.aklivity.k3po</groupId>
     <artifactId>runtime</artifactId>
-    <version>3.2.0</version>
+    <version>3.3.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

runtime/driver/pom.xml

@@ -7,7 +7,7 @@
  <parent>
    <groupId>io.aklivity.k3po</groupId>
    <artifactId>runtime</artifactId>
-   <version>3.2.0</version>
+   <version>3.3.0</version>
    <relativePath>../pom.xml</relativePath>
  </parent>
 

runtime/driver/src/main/java/io/aklivity/k3po/runtime/driver/internal/ext/tls/TlsTypeSystem.java

@@ -36,6 +36,7 @@ public final class TlsTypeSystem implements TypeSystemSpi
     public static final TypeInfo<String> OPTION_APPLICATION_PROTOCOLS = new TypeInfo<>("applicationProtocols", String.class);
     public static final TypeInfo<Boolean> OPTION_NEED_CLIENT_AUTH = new TypeInfo<>("needClientAuth", Boolean.class);
     public static final TypeInfo<Boolean> OPTION_WANT_CLIENT_AUTH = new TypeInfo<>("wantClientAuth", Boolean.class);
+    public static final TypeInfo<String> OPTION_CIPHER_SUITES = new TypeInfo<>("cipherSuites", String.class);
 
     private final Set<TypeInfo<?>> acceptOptions;
     private final Set<TypeInfo<?>> connectOptions;
@@ -57,6 +58,7 @@ public TlsTypeSystem()
         acceptOptions.add(OPTION_APPLICATION_PROTOCOLS);
         acceptOptions.add(OPTION_NEED_CLIENT_AUTH);
         acceptOptions.add(OPTION_WANT_CLIENT_AUTH);
+        acceptOptions.add(OPTION_CIPHER_SUITES);
         this.acceptOptions = unmodifiableSet(acceptOptions);
 
         Set<TypeInfo<?>> connectOptions = new LinkedHashSet<>();
@@ -66,6 +68,7 @@ public TlsTypeSystem()
         connectOptions.add(OPTION_TRUST_STORE_FILE);
         connectOptions.add(OPTION_TRUST_STORE_PASSWORD);
         connectOptions.add(OPTION_APPLICATION_PROTOCOLS);
+        connectOptions.add(OPTION_CIPHER_SUITES);
         this.connectOptions = unmodifiableSet(connectOptions);
 
         this.readOptions = emptySet();

runtime/driver/src/main/java/io/aklivity/k3po/runtime/driver/internal/ext/tls/bootstrap/DefaultTlsChannelConfig.java

@@ -29,6 +29,7 @@ public class DefaultTlsChannelConfig extends DefaultChannelConfig implements Tls
     private File trustStoreFile;
     private char[] trustStorePassword;
     private String[] applicationProtocols;
+    private String[] cipherSuites;
 
     @Override
     public void setParameters(SSLParameters parameters) {
@@ -105,6 +106,19 @@ public void setApplicationProtocols(
         this.applicationProtocols = applicationProtocol;
     }
 
+    @Override
+    public String[] getCipherSuites()
+    {
+        return cipherSuites;
+    }
+
+    @Override
+    public void setCipherSuites(
+        String[] cipherSuites)
+    {
+        this.cipherSuites = cipherSuites;
+    }
+
     @Override
     protected boolean setOption0(
         String key,
@@ -130,6 +144,10 @@ else if ("applicationProtocols".equals(key))
         {
             applicationProtocols = ((String) value).split(",");
         }
+        else if ("cipherSuites".equals(key))
+        {
+            cipherSuites = ((String) value).split(",");
+        }
         else
         {
             return false;

runtime/driver/src/main/java/io/aklivity/k3po/runtime/driver/internal/ext/tls/bootstrap/DefaultTlsServerChannelConfig.java

@@ -31,6 +31,7 @@ public class DefaultTlsServerChannelConfig extends DefaultServerChannelConfig im
     private String[] applicationProtocols;
     private boolean needClientAuth;
     private boolean wantClientAuth;
+    private String[] cipherSuites;
 
     @Override
     public void setParameters(SSLParameters parameters) {
@@ -107,6 +108,19 @@ public void setApplicationProtocols(
         this.applicationProtocols = applicationProtocol;
     }
 
+    @Override
+    public String[] getCipherSuites()
+    {
+        return cipherSuites;
+    }
+
+    @Override
+    public void setCipherSuites(
+            String[] cipherSuites)
+    {
+        this.cipherSuites = cipherSuites;
+    }
+
     @Override
     protected boolean setOption0(
         String key,
@@ -134,6 +148,9 @@ protected boolean setOption0(
             case "wantClientAuth":
                 wantClientAuth = Boolean.valueOf((String) value);
                 break;
+            case "cipherSuites":
+                cipherSuites = ((String) value).split(",");
+                break;
             default:
                 return false;
         }

runtime/driver/src/main/java/io/aklivity/k3po/runtime/driver/internal/ext/tls/bootstrap/TlsChannelConfig.java

@@ -46,4 +46,8 @@ public interface TlsChannelConfig extends ChannelConfig {
     void setApplicationProtocols(String[] applicationProtocol);
 
     String[] getApplicationProtocols();
+
+    void setCipherSuites(String[] cipherSuites);
+
+    String[] getCipherSuites();
 }

runtime/driver/src/main/java/io/aklivity/k3po/runtime/driver/internal/ext/tls/bootstrap/TlsClientChannelSink.java

@@ -132,6 +132,7 @@ protected void connectRequested(ChannelPipeline pipeline, ChannelStateEvent evt)
         char[] keyStorePassword = tlsConnectConfig.getKeyStorePassword();
         char[] trustStorePassword = tlsConnectConfig.getTrustStorePassword();
         String[] applicationProtocols = tlsConnectConfig.getApplicationProtocols();
+        String[] cipherSuites = tlsConnectConfig.getCipherSuites();
 
         ChannelPipelineFactory pipelineFactory = new ChannelPipelineFactory() {
             @Override
@@ -174,6 +175,9 @@ public ChannelPipeline getPipeline() throws Exception {
                 if (applicationProtocols != null && applicationProtocols.length > 0) {
                     setApplicationProtocols(tlsParameters, applicationProtocols);
                 }
+                if (cipherSuites != null && cipherSuites.length > 0) {
+                    tlsParameters.setCipherSuites(cipherSuites);
+                }
                 tlsEngine.setSSLParameters(tlsParameters);
 
                 SslHandler sslHandler = new SslHandler(tlsEngine);

runtime/driver/src/main/java/io/aklivity/k3po/runtime/driver/internal/ext/tls/bootstrap/TlsServerChannelSink.java

@@ -101,6 +101,7 @@ protected void bindRequested(ChannelPipeline pipeline, ChannelStateEvent evt) th
             String[] applicationProtocols = tlsConnectConfig.getApplicationProtocols();
             boolean wantClientAuth = tlsConnectConfig.getWantClientAuth();
             boolean needClientAuth = tlsConnectConfig.getNeedClientAuth();
+            String[] cipherSuites = tlsConnectConfig.getCipherSuites();
 
             ChannelPipelineFactory pipelineFactory = new ChannelPipelineFactory() {
                 @Override
@@ -148,6 +149,9 @@ public ChannelPipeline getPipeline() throws Exception {
                     if (applicationProtocols != null && applicationProtocols.length > 0) {
                         setApplicationProtocols(tlsParameters, applicationProtocols);
                     }
+                    if (cipherSuites != null && cipherSuites.length > 0) {
+                        tlsParameters.setCipherSuites(cipherSuites);
+                    }
                     tlsEngine.setSSLParameters(tlsParameters);
 
                     SslHandler sslHandler = new SslHandler(tlsEngine);

runtime/k3po-maven-plugin/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.aklivity.k3po</groupId>
     <artifactId>runtime</artifactId>
-    <version>3.2.0</version>
+    <version>3.3.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

runtime/lang/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.aklivity.k3po</groupId>
     <artifactId>runtime</artifactId>
-    <version>3.2.0</version>
+    <version>3.3.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

runtime/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.k3po</groupId>
     <artifactId>k3po</artifactId>
-    <version>3.2.0</version>
+    <version>3.3.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

specs/control.spec/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.aklivity.k3po</groupId>
     <artifactId>specs</artifactId>
-    <version>3.2.0</version>
+    <version>3.3.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

specs/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.k3po</groupId>
     <artifactId>k3po</artifactId>
-    <version>3.2.0</version>
+    <version>3.3.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>