Merge branch 'wallet-zip-in-archive' into 'develop-4.0'

Check for files in zipped archive wallet during validation

See merge request weblogic-cloud/weblogic-deploy-tooling!1655

Author: robertpatrick

core/src/main/java/oracle/weblogic/deploy/util/WLSDeployArchive.java

@@ -3836,6 +3836,54 @@ public List<String> getDatabaseWalletPaths() throws WLSDeployArchiveIOException
         return new ArrayList<>(results);
     }
 
+    /**
+     * Return the wallet entry names at the specified path in the archive, if any.
+     * If that archive path contains a single zip (a wallet zip), return the entries from that zip.
+     */
+    public List<String> getDatabaseWalletEntries(String walletPath) throws WLSDeployArchiveIOException {
+        final String METHOD = "getDatabaseWalletEntries";
+        LOGGER.entering(CLASS, METHOD);
+
+        List<String> walletEntries = new ArrayList<>();
+
+        if(containsPath(walletPath)) {
+            String walletPrefix = walletPath + ZIP_SEP;
+            List<String> allEntries = new ArrayList<>();  // all entries excluding the directory entry
+            List<String> zipEntries = getZipFile().listZipEntries();
+            for (String zipEntry : zipEntries) {
+                if (zipEntry.startsWith(walletPrefix) && !zipEntry.equals(walletPrefix)) {
+                    allEntries.add(zipEntry);
+                }
+            }
+
+            String firstEntry = allEntries.isEmpty() ? null : allEntries.get(0);
+            if((firstEntry != null) && firstEntry.toLowerCase().endsWith(".zip")) {
+                try (ZipInputStream zipStream = new ZipInputStream(getZipFile().getZipEntry(firstEntry))) {
+                    ZipEntry zipEntry;
+                    while ((zipEntry = zipStream.getNextEntry()) != null) {
+                        walletEntries.add(zipEntry.getName());
+                        zipStream.closeEntry();
+                    }
+
+                } catch(IOException e) {
+                    WLSDeployArchiveIOException aioe = new WLSDeployArchiveIOException("WLSDPLY-01467", firstEntry,
+                            getArchiveFileName(), e.getLocalizedMessage());
+                    LOGGER.throwing(aioe);
+                    throw aioe;
+                }
+            } else {
+                // just return the entry names that were found in the archive directory
+                for(String entry: allEntries) {
+                    String entryName = entry.substring(walletPath.length() + 1);
+                    walletEntries.add(entryName);
+                }
+            }
+        }
+
+        LOGGER.exiting(CLASS, METHOD, walletEntries);
+        return walletEntries;
+    }
+
     /**
      * Add a database wallet to the archive.
      *

core/src/main/python/wlsdeploy/tool/util/archive_helper.py

@@ -539,6 +539,22 @@ def has_rcu_wallet_path(self):
                     or archive_file.containsPath(WLSDeployArchive.DEPRECATED_RCU_WALLET_PATH)):
                 return True
 
+    def get_wallet_entries(self, wallet_path):
+        _method_name = 'get_wallet_entries'
+        self.__logger.entering(class_name=self.__class_name, method_name=_method_name)
+
+        archive = None
+        entries = []
+        for archive_file in self.__archive_files[::-1]:
+            wallet_entries = archive_file.getDatabaseWalletEntries(wallet_path)
+            if wallet_entries:
+                archive = archive_file
+                entries = wallet_entries
+                break
+
+        self.__logger.exiting(class_name=self.__class_name, method_name=_method_name, result=(archive, entries))
+        return archive, entries
+
     def extract_opss_wallet(self):
         """
         Extract the and unzip the OPSS wallet, if present, and return the path to the wallet directory.

core/src/main/python/wlsdeploy/tool/validate/domain_info_validator.py

@@ -27,6 +27,7 @@
     DRIVER_PARAMS_TRUSTSTORE_PROPERTY
 ]
 
+
 class DomainInfoValidator(ModelValidator):
     """
     Class for validating the domainInfo section of a model file
@@ -85,8 +86,7 @@ def _validate_single_path_in_archive(self, path, attribute_name, model_folder_pa
         Extend this method to allow wallet paths to be in a wallet zip in the archive.
         """
         if attribute_name in WALLET_PATH_ATTRIBUTES:
-            if WLSDeployArchive.isPathIntoArchive(path):
-                # TODO: check inside the wallet zip
+            if self.__is_path_in_zipped_archive_wallet(path):
                 return
 
         ModelValidator._validate_single_path_in_archive(self, path, attribute_name, model_folder_path)
@@ -168,3 +168,20 @@ def _validate_single_server_group_target_limits_value(self, key, value, model_fo
             self._logger.severe('WLSDPLY-05035', key, str_helper.to_string(value), model_folder_path,
                                 str_helper.to_string(type(value)),
                                 class_name=_class_name, method_name=_method_name)
+
+    def __is_path_in_zipped_archive_wallet(self, path):
+        if not WLSDeployArchive.isPathIntoArchive(path) or not self._archive_helper:
+            return False
+
+        if self._archive_helper.contains_file(path):
+            # the file is directly in the archive, return for regular validation
+            return False
+
+        last_slash = path.rfind('/')
+        wallet_path = ''
+        if last_slash != -1:
+            wallet_path = path[:last_slash]
+        file_name = path[last_slash + 1:]
+        archive, entries = self._archive_helper.get_wallet_entries(wallet_path)
+
+        return file_name in entries

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -254,6 +254,7 @@ WLSDPLY-01464=Database wallet found in deprecated archive path {0}, should be ch
   The archive contents have been extracted and assigned to that path.
 WLSDPLY-01465=Failed to add WebLogic Remote Console Extension file {0} to archive file {1} because the archive file already contains this entry at {2}.
 WLSDPLY-01466=Failed to remove WebLogic Remote Console Extension file {0} from archive file {1} because the archive file did not contain {2}.
+WLSDPLY-01467=Unable to open the database wallet zip for path {0} in archive file {1}: {2}
 
 # oracle.weblogic.deploy.util.WLSDeployZipFile.java
 WLSDPLY-01500=The zip file {0} has the saved entry {1}