Added default port for implicit FTPS (#20603)

microsoft · Oct 29, 2024 · 42b37cc · 42b37cc
1 parent 4bf61e2
commit 42b37cc
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 19 deletions.
diff --git a/Tasks/FtpUploadV2/ftpuploadtask.ts b/Tasks/FtpUploadV2/ftpuploadtask.ts
@@ -220,10 +220,18 @@ function getAccessOption(options: FtpOptions): ftp.AccessOptions {
 
     const hostName: string = options.serverEndpointUrl.hostname!;
     const portStr: string = options.serverEndpointUrl.port!;
-    let port: number = 21;
+    let port: number;
+
     if (portStr) {
         // port not explicitly specified, use default
         port = parseInt(portStr);
+    } else if (secure === "implicit") {
+        // port for implicit FTPS
+        port = 990;
+    }
+    else {
+        // port for FTP and explicit FTPS
+        port = 21;
     }
 
     console.log(tl.loc("ConnectPort", hostName, port));

diff --git a/Tasks/FtpUploadV2/task.json b/Tasks/FtpUploadV2/task.json
@@ -18,7 +18,7 @@
   "demands": [],
   "version": {
     "Major": 2,
-    "Minor": 246,
+    "Minor": 248,
     "Patch": 0
   },
   "minimumAgentVersion": "2.182.1",

diff --git a/Tasks/FtpUploadV2/task.loc.json b/Tasks/FtpUploadV2/task.loc.json
@@ -18,7 +18,7 @@
   "demands": [],
   "version": {
     "Major": 2,
-    "Minor": 246,
+    "Minor": 248,
     "Patch": 0
   },
   "minimumAgentVersion": "2.182.1",

diff --git a/_generated/FtpUploadV2.versionmap.txt b/_generated/FtpUploadV2.versionmap.txt
@@ -1,2 +1,2 @@
-Default|2.246.0
-Node20-225|2.246.1
+Default|2.248.0
+Node20-225|2.248.1
diff --git a/_generated/FtpUploadV2/ftpuploadtask.ts b/_generated/FtpUploadV2/ftpuploadtask.ts
@@ -220,10 +220,18 @@ function getAccessOption(options: FtpOptions): ftp.AccessOptions {
 
     const hostName: string = options.serverEndpointUrl.hostname!;
     const portStr: string = options.serverEndpointUrl.port!;
-    let port: number = 21;
+    let port: number;
+
     if (portStr) {
         // port not explicitly specified, use default
         port = parseInt(portStr);
+    } else if (secure === "implicit") {
+        // port for implicit FTPS
+        port = 990;
+    }
+    else {
+        // port for FTP and explicit FTPS
+        port = 21;
     }
 
     console.log(tl.loc("ConnectPort", hostName, port));

diff --git a/_generated/FtpUploadV2/task.json b/_generated/FtpUploadV2/task.json
@@ -18,7 +18,7 @@
   "demands": [],
   "version": {
     "Major": 2,
-    "Minor": 246,
+    "Minor": 248,
     "Patch": 0
   },
   "minimumAgentVersion": "2.182.1",
@@ -216,7 +216,7 @@
     "UploadFailed": "Ftp Upload failed"
   },
   "_buildConfigMapping": {
-    "Default": "2.246.0",
-    "Node20-225": "2.246.1"
+    "Default": "2.248.0",
+    "Node20-225": "2.248.1"
   }
 }
diff --git a/_generated/FtpUploadV2/task.loc.json b/_generated/FtpUploadV2/task.loc.json
@@ -18,7 +18,7 @@
   "demands": [],
   "version": {
     "Major": 2,
-    "Minor": 246,
+    "Minor": 248,
     "Patch": 0
   },
   "minimumAgentVersion": "2.182.1",
@@ -216,7 +216,7 @@
     "UploadFailed": "ms-resource:loc.messages.UploadFailed"
   },
   "_buildConfigMapping": {
-    "Default": "2.246.0",
-    "Node20-225": "2.246.1"
+    "Default": "2.248.0",
+    "Node20-225": "2.248.1"
   }
 }
diff --git a/_generated/FtpUploadV2_Node20/ftpuploadtask.ts b/_generated/FtpUploadV2_Node20/ftpuploadtask.ts
@@ -220,10 +220,18 @@ function getAccessOption(options: FtpOptions): ftp.AccessOptions {
 
     const hostName: string = options.serverEndpointUrl.hostname!;
     const portStr: string = options.serverEndpointUrl.port!;
-    let port: number = 21;
+    let port: number;
+
     if (portStr) {
         // port not explicitly specified, use default
         port = parseInt(portStr);
+    } else if (secure === "implicit") {
+        // port for implicit FTPS
+        port = 990;
+    }
+    else {
+        // port for FTP and explicit FTPS
+        port = 21;
     }
 
     console.log(tl.loc("ConnectPort", hostName, port));

diff --git a/_generated/FtpUploadV2_Node20/task.json b/_generated/FtpUploadV2_Node20/task.json
@@ -18,7 +18,7 @@
   "demands": [],
   "version": {
     "Major": 2,
-    "Minor": 246,
+    "Minor": 248,
     "Patch": 1
   },
   "minimumAgentVersion": "2.182.1",
@@ -220,7 +220,7 @@
     "UploadFailed": "Ftp Upload failed"
   },
   "_buildConfigMapping": {
-    "Default": "2.246.0",
-    "Node20-225": "2.246.1"
+    "Default": "2.248.0",
+    "Node20-225": "2.248.1"
   }
 }
diff --git a/_generated/FtpUploadV2_Node20/task.loc.json b/_generated/FtpUploadV2_Node20/task.loc.json
@@ -18,7 +18,7 @@
   "demands": [],
   "version": {
     "Major": 2,
-    "Minor": 246,
+    "Minor": 248,
     "Patch": 1
   },
   "minimumAgentVersion": "2.182.1",
@@ -220,7 +220,7 @@
     "UploadFailed": "ms-resource:loc.messages.UploadFailed"
   },
   "_buildConfigMapping": {
-    "Default": "2.246.0",
-    "Node20-225": "2.246.1"
+    "Default": "2.248.0",
+    "Node20-225": "2.248.1"
   }
 }