From f81c5bd9543814c0477b55628b1bd65d7ad32f47 Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Sun, 20 Dec 2020 07:30:15 +0100
Subject: [PATCH] IDEMPIERE-4602 Encrypt passwords on properties files
 (FHCA-1982) (#472)

* Secure sensitive files containing passwords at the end of build.xml for linux
  * jettyhome/etc/jetty-ssl-context.xml - contains keystore password
  * idempiereEnv.properties, idempiere.properties, utils/myEnvironment.sh - contain database and other passwords
* setup-alt.sh and console-setup-alt.sh don't need to chmod as the ant task already did it
* add port to hazelcast-template.xml (useful in case there are same databases in different ports on the server)
---
 org.adempiere.server-feature/build.xml              | 6 +++++-
 org.adempiere.server-feature/console-setup-alt.sh   | 6 ------
 org.adempiere.server-feature/hazelcast-template.xml | 2 +-
 org.adempiere.server-feature/setup-alt.sh           | 4 ----
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/org.adempiere.server-feature/build.xml b/org.adempiere.server-feature/build.xml
index 6052f83aa4..f00a707e28 100644
--- a/org.adempiere.server-feature/build.xml
+++ b/org.adempiere.server-feature/build.xml
@@ -49,6 +49,7 @@
 			tofile="jettyhome/etc/jetty-http.xml" filtering="yes" overwrite="yes"/>
 		<copy file="hazelcast-template.xml"
 			tofile="hazelcast.xml" filtering="yes" overwrite="yes"/>
+		<chmod file="jettyhome/etc/jetty-ssl-context.xml" perm="0600"/>
 
 		<mkdir dir="jettyhome/work"/>
 		<mkdir dir="log"/>
@@ -98,6 +99,9 @@
 		<!--	Fix OS stuff	-->
 		<fixcrlf srcdir="." eol="lf" eof="remove" includes="**/*.sh" />
 		<chmod dir="." perm="ugo+x" includes="**/*.sh" />
+		<chmod file="idempiereEnv.properties" perm="0600"/>
+		<chmod file="idempiere.properties" perm="0600"/>
+		<chmod file="utils/myEnvironment.sh" perm="0700"/>
 
 		<delete>
 			<fileset dir="." includes="*.bat" />
@@ -112,4 +116,4 @@
 	<target name="setup" depends="setupInit, setupWin, setupNonWin"
 		description="Setup iDempiere">
 	</target>
-</project>
\ No newline at end of file
+</project>
diff --git a/org.adempiere.server-feature/console-setup-alt.sh b/org.adempiere.server-feature/console-setup-alt.sh
index 14e1dad5e9..9e1462010d 100644
--- a/org.adempiere.server-feature/console-setup-alt.sh
+++ b/org.adempiere.server-feature/console-setup-alt.sh
@@ -19,11 +19,5 @@ $JAVA -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configur
 # Setup Jetty
 $JAVA -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.eclipse.ant.core.antRunner -buildfile build.xml
 
-echo ===================================
-echo Make .sh executable & set Env
-echo ===================================
-chmod -R a+x -- *.sh
-find . -name '*.sh' -exec chmod a+x '{}' \;
-
 echo .
 echo For problems, check log file in base directory
diff --git a/org.adempiere.server-feature/hazelcast-template.xml b/org.adempiere.server-feature/hazelcast-template.xml
index 5fa61d879f..e4dd1fd1f9 100644
--- a/org.adempiere.server-feature/hazelcast-template.xml
+++ b/org.adempiere.server-feature/hazelcast-template.xml
@@ -32,7 +32,7 @@
            http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd">
 
     <group>
-        <name>@ADEMPIERE_DB_USER@.@ADEMPIERE_DB_NAME@/@ADEMPIERE_DB_SERVER@</name>
+        <name>@ADEMPIERE_DB_USER@.@ADEMPIERE_DB_NAME@/@ADEMPIERE_DB_SERVER@:@ADEMPIERE_DB_PORT@</name>
         <!-- https://github.com/hazelcast/hazelcast/issues/11667 -->
     </group>
     <management-center enabled="false">http://localhost:8080/hazelcast-mancenter</management-center>
diff --git a/org.adempiere.server-feature/setup-alt.sh b/org.adempiere.server-feature/setup-alt.sh
index 11ea8d17d1..6d393da588 100644
--- a/org.adempiere.server-feature/setup-alt.sh
+++ b/org.adempiere.server-feature/setup-alt.sh
@@ -19,9 +19,5 @@ echo ... Setup Jetty
 #setup jetty
 $JAVA -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.eclipse.ant.core.antRunner -buildfile build.xml
 
-echo ... Make .sh executable
-chmod -R a+x -- *.sh
-find . -name '*.sh' -exec chmod a+x '{}' \;
-
 echo ...
 echo For problems, check log file in base directory