Merge pull request #292 from udda1996/fix-permission

Add distribution validation before the permission check
ballerina-platform · May 3, 2023 · ae2e017 · ae2e017
2 parents 27ace15 + 68e4bd6
commit ae2e017
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ jreVersion=11.0.18+10
 # For test purpose
 swan-lake-version=2201.2.0
 swan-lake-spec-version=2022R3
-swan-lake-latest-version=2201.4.1
+swan-lake-latest-version=2201.5.0
 swan-lake-latest-spec-version=2022R4
 1-x-channel-version=1.2.0
 1-x-channel-spec-version=2020R1

diff --git a/src/main/java/org/ballerinalang/command/cmd/PullCommand.java b/src/main/java/org/ballerinalang/command/cmd/PullCommand.java
@@ -61,7 +61,6 @@ public void execute() {
         if (pullCommands.size() > 1) {
             throw ErrorUtil.createDistSubCommandUsageExceptionWithHelp("too many arguments", getName());
         }
-        ToolUtil.handleInstallDirPermission();
         PrintStream printStream = getPrintStream();
         String distribution = pullCommands.get(0);
 
@@ -80,10 +79,29 @@ public void execute() {
             distribution = ToolUtil.getLatest(distributions.get(0).getVersion(), "patch");
         }
 
+        // To check whether the distribution is a valid one
+        if (!distribution.equals(ToolUtil.LATEST_PULL_INPUT)) {
+            boolean validDist = false;
+            List<Channel> channels = ToolUtil.getDistributions(printStream);
+            for (Channel channel : channels) {
+                List<Distribution> distributions = channel.getDistributions();
+                for (Distribution dist : distributions) {
+                    if (dist.getVersion().equals(distribution)) {
+                        validDist = true;
+                        break;
+                    }
+                }
+            }
+            if (!validDist) {
+                throw ErrorUtil.createDistributionNotFoundException(distribution);
+            }
+        }
+
         if (distribution.equals(ToolUtil.getCurrentBallerinaVersion())) {
             printStream.println("'" + distribution + "' is already the active distribution");
             return;
         }
+        ToolUtil.handleInstallDirPermission();
         ToolUtil.downloadDistribution(printStream, distribution, ToolUtil.getType(distribution), distribution, testFlag);
         ToolUtil.useBallerinaVersion(printStream, distribution);
         printStream.println("'" + distribution + "' successfully set as the active distribution");

diff --git a/src/main/java/org/ballerinalang/command/util/ToolUtil.java b/src/main/java/org/ballerinalang/command/util/ToolUtil.java
@@ -858,6 +858,7 @@ public static void updateTool(PrintStream printStream) {
         if (latestVersion == null) {
             printStream.println("Failed to find the latest update tool version");
         } else if (!latestVersion.equals(version)) {
+            ToolUtil.handleInstallDirPermission();
             ToolUtil.downloadTool(printStream, latestVersion);
             try {
                 executeFile(printStream);