Merge changes from development to release branch.

percussion · Mar 26, 2024 · 18742bc · 18742bc
1 parent 8ea4aa7
commit 18742bc
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 5 deletions.
diff --git a/...elivery-tier-suite/delivery-tier-distribution/src/main/conf/perc/perc-catalina.properties b/...elivery-tier-suite/delivery-tier-distribution/src/main/conf/perc/perc-catalina.properties
@@ -61,7 +61,7 @@ https.keystoreFile=conf/.keystore
 https.keystorePass=changeit
 https.keyAlias=tomcat
 https.keystoreType=JKS
-https.ciphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_DH_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
+https.ciphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
 https.clientAuth=false
 https.compressibleMimeType=text/html,txt/xml,text/plain,text/css,text/javascript,application/javascript,application/json,application/xml
 https.compression=on

diff --git a/...m/percussion/ant/install/mockinstall/Deployment/Server/conf/perc/perc-catalina.properties b/...m/percussion/ant/install/mockinstall/Deployment/Server/conf/perc/perc-catalina.properties
@@ -22,7 +22,7 @@ https.port=28443
 http.rejectIllegalHeader=false
 https.useKeepAliveResponseHeader=true
 http.useBodyEncodingForURI=false
-https.ciphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DH_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
+https.ciphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
 https.keystoreFile=conf/A.keystore
 https.useBodyEncodingForURI=false
 https.clientAuth=false

diff --git a/...sion/ant/install/mockinstall/Staging/Deployment/Server/conf/perc/perc-catalina.properties b/...sion/ant/install/mockinstall/Staging/Deployment/Server/conf/perc/perc-catalina.properties
@@ -23,7 +23,7 @@ https.port=29443
 http.rejectIllegalHeader=false
 https.useKeepAliveResponseHeader=true
 http.useBodyEncodingForURI=false
-https.ciphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DH_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
+https.ciphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
 https.keystoreFile=conf/A.keystore
 https.useBodyEncodingForURI=false
 https.clientAuth=false

diff --git a/...tribution-tree/src/main/resources/distribution/rxconfig/Installer/updateConfiguration.xml b/...tribution-tree/src/main/resources/distribution/rxconfig/Installer/updateConfiguration.xml
@@ -232,6 +232,10 @@
             <available file="${install.dir}/jetty/base/start.d/jvm.ini"/>
             <then>
                 <replace file="${install.dir}/jetty/base/start.d/jvm.ini" token="@@rxdir@@" value="${normalized.install.dir}" />
+                <replace file="${install.dir}/jetty/base/start.d/jvm.ini" token="-Djavax.xml.transform.TransformerFactory" value="#-Djavax.xml.transform.TransformerFactory" />
+                <replace file="${install.dir}/jetty/base/start.d/jvm.ini" token="-Djavax.xml.parsers.SAXParserFactory" value="#-Djavax.xml.parsers.SAXParserFactory" />
+                <replace file="${install.dir}/jetty/base/start.d/jvm.ini" token="-Djavax.xml.datatype.DatatypeFactory" value="#-Djavax.xml.datatype.DatatypeFactory" />
+                <replace file="${install.dir}/jetty/base/start.d/jvm.ini" token="-Djavax.xml.parsers.DocumentBuilderFactory" value="#-Djavax.xml.parsers.DocumentBuilderFactory" />
             </then>
         </if>
         <replace file="${install.dir}/PercussionXMLCatalog.xml" token="@@rxdir@@" value="${lead.slash}${normalized.install.dir}" />

diff --git a/...anage/src/main/java/com/percussion/sitemanage/importer/utils/PSFileDownLoadJobRunner.java b/...anage/src/main/java/com/percussion/sitemanage/importer/utils/PSFileDownLoadJobRunner.java
@@ -144,6 +144,12 @@ public List<PSPair<Boolean, String>> downloadFile(String url, String destination
             URI uri = new URI(url);
             URL fileUrl = uri.toURL();
 
+            //If the destination and the source are the same then skipping file creation as they are external resources.
+            if(url.equals(destinationPath)){
+                PSPair<Boolean, String> result = new PSPair<>(false, "Skipping creation of external resource : "+destinationPath);
+                localResults.add(result);
+                return localResults;
+            }
             File file = new File(destinationPath);
 
             if (doesFileExist(file))

diff --git a/system/config/Default/server.properties b/system/config/Default/server.properties
@@ -44,7 +44,7 @@ xContentTypeOptions=nosniff
 cacheControlRequired=true
 cacheControl=no-cache\='Set-Cookie, Set-Cookie2',must-revalidate
 autotuneCachePercentage=40
-enabledCiphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DH_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
+enabledCiphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
 optimizePublishWithChecksum =false
 publicCmsHostname=
 requestBehindProxy=false

diff --git a/system/config/server.properties b/system/config/server.properties
@@ -426,7 +426,7 @@ autotuneCachePercentage=60
 ###################################################
 # Enabled TLS Ciphers
 ##################################################
-enabledCiphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DH_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
+enabledCiphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
 #################################################################
 # Sets the value of the public host name to use when generating links to
 # content in the CMS.  If using a proxy in front of the CMS, this should