MID-8842 ninja - fixed input validation in upgrade action command

Evolveum · Sep 14, 2023 · b748488 · b748488
1 parent 25298dc
commit b748488
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/...src/main/java/com/evolveum/midpoint/ninja/action/upgrade/action/UpgradeObjectsAction.java b/...src/main/java/com/evolveum/midpoint/ninja/action/upgrade/action/UpgradeObjectsAction.java
@@ -61,7 +61,7 @@ public ActionResult<UpgradeObjectsItemsSummary> execute() throws Exception {
         if (!options.getFiles().isEmpty()) {
             if (context.isUserMode() && !options.isSkipUpgradeWarning()) {
                 log.warn("File update will remove XML comments and change formatting. Do you wish to proceed? (Y/n)");
-                String result = NinjaUtils.readInput(log, input -> StringUtils.isEmpty(input) || input.equalsIgnoreCase("y"));
+                String result = NinjaUtils.readInput(log, input -> StringUtils.isEmpty(input) || input.matches("[Yn]"));
 
                 if (result.trim().equalsIgnoreCase("n")) {
                     log.info("Upgrade aborted");
@@ -72,6 +72,15 @@ public ActionResult<UpgradeObjectsItemsSummary> execute() throws Exception {
             return upgradeObjectsInFiles();
         }
 
+        if (context.isUserMode() && !options.isSkipUpgradeWarning()) {
+            log.warn("Object now will be updated in repository. Do you wish to proceed? (Y/n)");
+            String result = NinjaUtils.readInput(log, input -> StringUtils.isEmpty(input) || input.matches("[Yn]"));
+            if (result.trim().equalsIgnoreCase("n")) {
+                log.info("Upgrade aborted");
+                return null;
+            }
+        }
+
         return super.execute();
     }