#26481 include in 23.10.24

dotCMS · Dec 5, 2023 · 9ddf536 · 9ddf536
1 parent b65dbfa
commit 9ddf536
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 6 deletions.
diff --git a/dotCMS/hotfix_tracking.md b/dotCMS/hotfix_tracking.md
@@ -0,0 +1,7 @@
+## DOTCMS BACKPORT LIST
+
+This maintenance release includes the following code fixes:
+
+**Release-23.10.24 LTS**
+
+1. https://github.com/dotCMS/core/issues/26481 : Pubsub Connection should prefer SSL #26481
diff --git a/dotCMS/src/main/java/com/dotcms/dotpubsub/PgNgDataSourceUrl.java b/dotCMS/src/main/java/com/dotcms/dotpubsub/PgNgDataSourceUrl.java
@@ -14,7 +14,7 @@
  *
  */
 class PgNgDataSourceUrl {
-
+    static final String SSL_MODE = System.getenv("DOT_PUBSUB_SSL_MODE") != null ? System.getenv("DOT_PUBSUB_SSL_MODE") : "prefer";
     private final String finalUrl;
 
     /**
@@ -66,7 +66,17 @@ private String createUrl(final String username, final String password, final Str
         sw.append("/");
         sw.append(data[data.length - 1]);
 
-        return sw.toString();
+        if(url.contains("ssl.mode=")){
+            return sw.toString();
+        }
+        if(url.contains("?")){
+            sw.append( "&");
+        }else{
+            sw.append( "?");
+        }
+
+        sw.append("ssl.mode=" + SSL_MODE);
+        return  sw.toString();
 
     }
 

diff --git a/dotCMS/src/test/java/com/dotcms/dotpubsub/PgNgDataSourceUrlTest.java b/dotCMS/src/test/java/com/dotcms/dotpubsub/PgNgDataSourceUrlTest.java
@@ -1,5 +1,6 @@
 package com.dotcms.dotpubsub;
 
+import java.net.MalformedURLException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import org.junit.BeforeClass;
@@ -11,9 +12,9 @@ public class PgNgDataSourceUrlTest {
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {}
 
-
 
-    final String PgNgUrl = "jdbc:pgsql://dotcmsUserName:dotcmsPassword@dbServer.com/dotcms";
+
+    final String PgNgUrl = "jdbc:pgsql://dotcmsUserName:dotcmsPassword@dbServer.com/dotcms?ssl.mode=" + PgNgDataSourceUrl.SSL_MODE;
 
 
 
@@ -72,8 +73,27 @@ public void test_PgNgDataSourceUrl_URL_escapes_special_chars() {
 
 
     }
-
-
+
+    @Test
+    public void test_ssl_mode_is_added() throws MalformedURLException {
+
+        String url = "jdbc:postgresql://dbServer.com/dotcms";
+        String username = "username";
+        String password = "password";
+
+
+        PgNgDataSourceUrl testDataSource = new PgNgDataSourceUrl(username, password, url);
+
+        assert testDataSource.getDbUrl().contains("?ssl.mode=" + PgNgDataSourceUrl.SSL_MODE);
+
+        url = "jdbc:postgresql://dbServer.com/dotcms?test=here";
+
+
+        testDataSource = new PgNgDataSourceUrl(username, password, url);
+
+        assert testDataSource.getDbUrl().contains("&ssl.mode=" + PgNgDataSourceUrl.SSL_MODE);
+
+    }
 
 }