Move encryptor configuration file to the data directory config folder

zoran995 · May 5, 2021 · 0d9bb9b · 0d9bb9b
1 parent c56ed42
commit 0d9bb9b
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -61,6 +61,7 @@ web/src/main/webapp/WEB-INF/data/config/schema_plugins/dublin-core
 web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19*
 web/src/main/webapp/WEB-INF/data/config/schema_plugins/schemaplugin-uri-catalog.xml
 web/src/main/webapp/WEB-INF/data/config/schemaplugin-uri-catalog.xml
+web/src/main/webapp/WEB-INF/data/config/encryptor.properties
 web/src/main/webapp/WEB-INF/data/data/backup
 web/src/main/webapp/WEB-INF/data/data/metadata_data
 web/src/main/webapp/WEB-INF/data/data/metadata_subversion

diff --git a/core/src/main/java/org/fao/geonet/constants/Geonet.java b/core/src/main/java/org/fao/geonet/constants/Geonet.java
@@ -96,7 +96,6 @@ public static final class File {
         public static final String UPDATE_FIXED_INFO = "update-fixed-info.xsl";
         public static final String UPDATE_FIXED_INFO_SUBTEMPLATE = "update-fixed-info-subtemplate.xsl";
         public static final String UPDATE_CHILD_FROM_PARENT_INFO = "update-child-from-parent-info.xsl";
-        public static final String ENCRYPTOR_DIR = "encryptor";
         public static final String EXTRACT_UUID = "extract-uuid.xsl";
         public static final String EXTRACT_TITLES = "extract-titles.xsl";
         public static final String EXTRACT_DEFAULT_LANGUAGE = "extract-default-language.xsl";
@@ -119,7 +118,9 @@ public static final class File {
         public static final String METADATA_BRIEF = "metadata-brief.xsl";
         public static final String METADATA_BASEBLANK = "blanks/metadata-schema00";
         public static final String METADATA_BLANK = "blanks/metadata-schema";
+        public static final String ENCRYPTOR_CONFIGURATION = "encryptor.properties";
         public static final int METADATA_MAX_BLANKS = 20;
+
     }
 
     public static final class SchemaPath {

diff --git a/core/src/main/java/org/fao/geonet/kernel/GeonetworkDataDirectory.java b/core/src/main/java/org/fao/geonet/kernel/GeonetworkDataDirectory.java
@@ -444,27 +444,25 @@ private void initDataDirectory() throws IOException {
             }
         }
 
-        Path encryptorFolder = configDir.resolve(Geonet.File.ENCRYPTOR_DIR);
-        if (!Files.exists(encryptorFolder)) {
-            Log.info(Geonet.DATA_DIRECTORY, "     - Copying encryptor directory...");
-            try {
-                final Path srcEncryptorDir = getDefaultDataDir(webappDir).resolve("config").resolve(Geonet.File.ENCRYPTOR_DIR);
-                final Path destDir = this.configDir.resolve(Geonet.File.ENCRYPTOR_DIR);
-                // Copy encryptor dir if doesn't exist
-                if (!Files.exists(destDir)) {
-                    IO.copyDirectoryOrFile(srcEncryptorDir, destDir, true);
-                }
 
-            } catch (IOException e) {
-                Log.info(
-                    Geonet.DATA_DIRECTORY,
-                    "      - Error copying encryptor config directory: "
-                        + e.getMessage());
-                throw e;
+        Log.info(Geonet.DATA_DIRECTORY, "     - Copying encryptor.properties file...");
+        try {
+            final Path srcEncryptorFile = getDefaultDataDir(webappDir).resolve("config").resolve(Geonet.File.ENCRYPTOR_CONFIGURATION);
+            final Path destEncryptorFile = this.configDir.resolve("encryptor.properties");
+            // Copy encryptor.properties if doesn't exist
+            if (!Files.exists(destEncryptorFile)) {
+                IO.copyDirectoryOrFile(srcEncryptorFile, destEncryptorFile, true);
             }
 
+        } catch (IOException e) {
+            Log.info(
+                Geonet.DATA_DIRECTORY,
+                "      - Error copying encryptor.propeties file: "
+                    + e.getMessage());
+            throw e;
         }
 
+
         final Path locDir = webappDir.resolve("loc");
         if (!Files.exists(locDir)) {
             Files.createDirectories(locDir);

diff --git a/web/pom.xml b/web/pom.xml
@@ -797,6 +797,28 @@
               <overwrite>true</overwrite>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-encryptor-config-to-source</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <escapeString>\</escapeString>
+              <includeEmptyDirs>false</includeEmptyDirs>
+              <outputDirectory>${basedir}/src/main/webapp/WEB-INF/data/config</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${basedir}/src/main/webResources/WEB-INF/data/config</directory>
+                  <filtering>true</filtering>
+                  <includes>
+                    <include>encryptor.properties</include>
+                  </includes>
+                </resource>
+              </resources>
+              <overwrite>false</overwrite>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
 

diff --git a/web/src/main/java/org/fao/geonet/EncryptorInitializer.java b/web/src/main/java/org/fao/geonet/EncryptorInitializer.java
@@ -292,8 +292,7 @@ private int encryptDatabaseValuesStringId(StandardPBEStringEncryptor previousEnc
      */
     private PropertiesConfiguration getEncryptorPropertiesFile(GeonetworkDataDirectory dataDirectory)
         throws Exception {
-        Path securityPropsPath = dataDirectory.getConfigDir().resolve("encryptor")
-            .resolve("encryptor.properties");
+        Path securityPropsPath = dataDirectory.getConfigDir().resolve(Geonet.File.ENCRYPTOR_CONFIGURATION);
 
         // Create the file if doesn't exists
         if (!Files.exists(securityPropsPath)) {

diff --git a/...ata/config/encryptor/encryptor.properties → .../WEB-INF/data/config/encryptor.properties b/...ata/config/encryptor/encryptor.properties → .../WEB-INF/data/config/encryptor.properties
@@ -1,3 +1,3 @@
-# Password encripter configuration
+# Password encryptor configuration
 encryptor.algorithm = PBEWithMD5AndDES
 encryptor.password =