Merge pull request #131 from swisspost/develop

merge to master to trigger release
swisspost · Aug 3, 2023 · 683880e · 683880e
2 parents 2b859a9 + bc309c8
commit 683880e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.swisspush</groupId>
     <artifactId>rest-storage</artifactId>
-    <version>3.0.14-SNAPSHOT</version>
+    <version>3.0.15-SNAPSHOT</version>
     <name>rest-storage</name>
     <description>
         Persistence for REST resources in the filesystem or a redis database

diff --git a/src/main/java/org/swisspush/reststorage/DefaultRedisProvider.java b/src/main/java/org/swisspush/reststorage/DefaultRedisProvider.java
@@ -62,8 +62,9 @@ private Future<RedisAPI> setupRedisClient(){
 
     private Future<RedisAPI> connectToRedis() {
         Promise<RedisAPI> promise = Promise.promise();
+        String protocol =  configuration.isRedisEnableTls() ? "rediss://" : "redis://";
         Redis.createClient(vertx, new RedisOptions()
-                .setConnectionString("redis://" + configuration.getRedisHost() + ":" + configuration.getRedisPort())
+                .setConnectionString(protocol + configuration.getRedisHost() + ":" + configuration.getRedisPort())
                 .setPassword((configuration.getRedisAuth() == null ? "" : configuration.getRedisAuth()))
                 .setMaxPoolSize(configuration.getMaxRedisConnectionPoolSize())
                 .setMaxPoolWaiting(configuration.getMaxQueueWaiting())

diff --git a/src/main/java/org/swisspush/reststorage/util/ModuleConfiguration.java b/src/main/java/org/swisspush/reststorage/util/ModuleConfiguration.java
@@ -31,6 +31,7 @@ public enum StorageType {
     private Map<String, String> editorConfig = null;
     private String redisHost = "localhost";
     private int redisPort = 6379;
+    private boolean redisEnableTls;
     private String redisAuth = null;
     private String expirablePrefix = "rest-storage:expirable";
     private String resourcesPrefix = "rest-storage:resources";
@@ -112,6 +113,12 @@ public ModuleConfiguration redisPort(int redisPort) {
         this.redisPort = redisPort;
         return this;
     }
+
+    public ModuleConfiguration redisEnableTls(boolean redisEnableTls) {
+        this.redisEnableTls = redisEnableTls;
+        return this;
+    }
+
     public ModuleConfiguration redisAuth(String redisAuth) {
         this.redisAuth = redisAuth;
         return this;
@@ -235,6 +242,10 @@ public int getRedisPort() {
         return redisPort;
     }
 
+    public boolean isRedisEnableTls() {
+        return redisEnableTls;
+    }
+
     public String getRedisAuth() {
         return redisAuth;
     }

diff --git a/src/test/java/org/swisspush/reststorage/util/ModuleConfigurationTest.java b/src/test/java/org/swisspush/reststorage/util/ModuleConfigurationTest.java
@@ -39,6 +39,7 @@ public void testDefaultConfiguration(TestContext testContext) {
         testContext.assertNull(config.getEditorConfig());
         testContext.assertEquals(config.getRedisHost(), "localhost");
         testContext.assertEquals(config.getRedisPort(), 6379);
+        testContext.assertFalse(config.isRedisEnableTls());
         testContext.assertEquals(config.getExpirablePrefix(), "rest-storage:expirable");
         testContext.assertEquals(config.getResourcesPrefix(), "rest-storage:resources");
         testContext.assertEquals(config.getCollectionsPrefix(), "rest-storage:collections");
@@ -58,6 +59,7 @@ public void testOverrideConfiguration(TestContext testContext) {
         ModuleConfiguration config = new ModuleConfiguration()
                 .redisHost("anotherhost")
                 .redisPort(1234)
+                .redisEnableTls(true)
                 .editorConfig(new HashMap<>() {{
                     put("myKey", "myValue");
                 }})
@@ -92,6 +94,7 @@ public void testOverrideConfiguration(TestContext testContext) {
         // overridden values
         testContext.assertEquals(config.getRedisHost(), "anotherhost");
         testContext.assertEquals(config.getRedisPort(), 1234);
+        testContext.assertTrue(config.isRedisEnableTls());
         testContext.assertFalse(config.isHttpRequestHandlerEnabled());
         testContext.assertNotNull(config.getEditorConfig());
         testContext.assertTrue(config.getEditorConfig().containsKey("myKey"));
@@ -114,8 +117,9 @@ public void testGetDefaultAsJsonObject(TestContext testContext){
         testContext.assertEquals(json.getString("root"), ".");
         testContext.assertEquals(json.getString("storageType"), StorageType.filesystem.name());
         testContext.assertEquals(json.getInteger("port"), 8989);
-        testContext.assertTrue(json.getBoolean("httpRequestHandlerEnabled"));
         testContext.assertFalse(json.getBoolean("httpRequestHandlerAuthenticationEnabled"));
+        testContext.assertTrue(json.getBoolean("httpRequestHandlerEnabled"));
+        testContext.assertFalse(json.getBoolean("redisEnableTls"));
         testContext.assertNull(json.getJsonObject("httpRequestHandlerUsername"));
         testContext.assertNull(json.getJsonObject("httpRequestHandlerPassword"));
         testContext.assertEquals(json.getString("prefix"), "");
@@ -143,6 +147,7 @@ public void testGetOverriddenAsJsonObject(TestContext testContext){
         ModuleConfiguration config = new ModuleConfiguration()
                 .redisHost("anotherhost")
                 .redisPort(1234)
+                .redisEnableTls(true)
                 .editorConfig(new HashMap<>() {{
                     put("myKey", "myValue");
                 }})
@@ -176,6 +181,7 @@ public void testGetOverriddenAsJsonObject(TestContext testContext){
         // overridden values
         testContext.assertEquals(json.getString("redisHost"), "anotherhost");
         testContext.assertEquals(json.getInteger("redisPort"), 1234);
+        testContext.assertTrue(json.getBoolean("redisEnableTls"));
         testContext.assertTrue(json.getBoolean("confirmCollectionDelete"));
         testContext.assertTrue(json.getBoolean("rejectStorageWriteOnLowMemory"));
         testContext.assertEquals(config.getFreeMemoryCheckIntervalMs(), 5000L);
@@ -203,6 +209,7 @@ public void testGetDefaultFromJsonObject(TestContext testContext){
         testContext.assertNull(config.getEditorConfig());
         testContext.assertEquals(config.getRedisHost(), "localhost");
         testContext.assertEquals(config.getRedisPort(), 6379);
+        testContext.assertFalse(json.getBoolean("redisEnableTls"));
         testContext.assertEquals(config.getMaxRedisWaitingHandlers(), 2048);
         testContext.assertEquals(config.getExpirablePrefix(), "rest-storage:expirable");
         testContext.assertEquals(config.getResourcesPrefix(), "rest-storage:resources");
@@ -227,6 +234,7 @@ public void testGetOverriddenFromJsonObject(TestContext testContext){
         json.put("root", "newroot");
         json.put("storageType", "redis");
         json.put("port", 1234);
+        json.put("redisEnableTls", true);
         json.put("httpRequestHandlerEnabled", false);
         json.put("httpRequestHandlerAuthenticationEnabled", true);
         json.put("httpRequestHandlerUsername", "foo");
@@ -252,6 +260,7 @@ public void testGetOverriddenFromJsonObject(TestContext testContext){
         testContext.assertEquals(config.getRoot(), "newroot");
         testContext.assertEquals(config.getStorageType(), StorageType.redis);
         testContext.assertEquals(config.getPort(), 1234);
+        testContext.assertTrue(config.isRedisEnableTls());
         testContext.assertFalse(config.isHttpRequestHandlerEnabled());
         testContext.assertTrue(config.isHttpRequestHandlerAuthenticationEnabled());
         testContext.assertEquals(config.getHttpRequestHandlerUsername(), "foo");