From e963211bb2fa88e883a6bc4310bc1a715f626e61 Mon Sep 17 00:00:00 2001 From: "Denis Nikulin (Akvelon inc)" Date: Thu, 31 Aug 2023 11:09:44 +0400 Subject: [PATCH 1/7] Fixed an issue with FTPUploadV2 task when using implicit FTPS. --- .../resources.resjson/de-DE/resources.resjson | 1 + .../resources.resjson/en-US/resources.resjson | 1 + .../resources.resjson/es-ES/resources.resjson | 1 + .../resources.resjson/fr-FR/resources.resjson | 1 + .../resources.resjson/it-IT/resources.resjson | 1 + .../resources.resjson/ja-JP/resources.resjson | 1 + .../resources.resjson/ko-KR/resources.resjson | 1 + .../resources.resjson/ru-RU/resources.resjson | 1 + .../resources.resjson/zh-CN/resources.resjson | 1 + .../resources.resjson/zh-TW/resources.resjson | 1 + Tasks/FtpUploadV2/ftpuploadtask.ts | 12 +++++++++++- Tasks/FtpUploadV2/task.json | 7 +++++++ Tasks/FtpUploadV2/task.loc.json | 7 +++++++ 13 files changed, 35 insertions(+), 1 deletion(-) diff --git a/Tasks/FtpUploadV2/Strings/resources.resjson/de-DE/resources.resjson b/Tasks/FtpUploadV2/Strings/resources.resjson/de-DE/resources.resjson index baeff4c43182..1631d241b053 100644 --- a/Tasks/FtpUploadV2/Strings/resources.resjson/de-DE/resources.resjson +++ b/Tasks/FtpUploadV2/Strings/resources.resjson/de-DE/resources.resjson @@ -11,6 +11,7 @@ "loc.input.label.serverUrl": "Server-URL", "loc.input.label.username": "Benutzername", "loc.input.label.password": "Kennwort", + "loc.input.label.implicitFTPS": "Verwenden Sie implizites FTPS", "loc.input.label.rootFolder": "Stammordner", "loc.input.help.rootFolder": "Der Quellordner, aus dem Dateien hochgeladen werden sollen.", "loc.input.label.filePatterns": "Dateimuster", diff --git a/Tasks/FtpUploadV2/Strings/resources.resjson/en-US/resources.resjson b/Tasks/FtpUploadV2/Strings/resources.resjson/en-US/resources.resjson index 98c922de5795..0a96625d162a 100644 --- a/Tasks/FtpUploadV2/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/FtpUploadV2/Strings/resources.resjson/en-US/resources.resjson @@ -11,6 +11,7 @@ "loc.input.label.serverUrl": "Server URL", "loc.input.label.username": "Username", "loc.input.label.password": "Password", + "loc.input.label.implicitFTPS": "Use implicit FTPS", "loc.input.label.rootFolder": "Root folder", "loc.input.help.rootFolder": "The source folder to upload files from.", "loc.input.label.filePatterns": "File patterns", diff --git a/Tasks/FtpUploadV2/Strings/resources.resjson/es-ES/resources.resjson b/Tasks/FtpUploadV2/Strings/resources.resjson/es-ES/resources.resjson index 767dc0406b72..75c96dbda248 100644 --- a/Tasks/FtpUploadV2/Strings/resources.resjson/es-ES/resources.resjson +++ b/Tasks/FtpUploadV2/Strings/resources.resjson/es-ES/resources.resjson @@ -11,6 +11,7 @@ "loc.input.label.serverUrl": "Dirección URL del servidor", "loc.input.label.username": "Nombre de usuario", "loc.input.label.password": "Contraseña", + "loc.input.label.implicitFTPS": "Utilice FTPS implícito", "loc.input.label.rootFolder": "Carpeta raíz", "loc.input.help.rootFolder": "Carpeta de origen de donde se cargan los archivos.", "loc.input.label.filePatterns": "Patrones de archivo", diff --git a/Tasks/FtpUploadV2/Strings/resources.resjson/fr-FR/resources.resjson b/Tasks/FtpUploadV2/Strings/resources.resjson/fr-FR/resources.resjson index 1bb46724c141..189256fc7808 100644 --- a/Tasks/FtpUploadV2/Strings/resources.resjson/fr-FR/resources.resjson +++ b/Tasks/FtpUploadV2/Strings/resources.resjson/fr-FR/resources.resjson @@ -11,6 +11,7 @@ "loc.input.label.serverUrl": "URL du serveur", "loc.input.label.username": "Nom d'utilisateur", "loc.input.label.password": "Mot de passe", + "loc.input.label.implicitFTPS": "Utiliser FTPS implicite", "loc.input.label.rootFolder": "Dossier racine", "loc.input.help.rootFolder": "Dossier source du chargement des fichiers.", "loc.input.label.filePatterns": "Modèles de fichiers", diff --git a/Tasks/FtpUploadV2/Strings/resources.resjson/it-IT/resources.resjson b/Tasks/FtpUploadV2/Strings/resources.resjson/it-IT/resources.resjson index 592dda67f48a..8e4390f4a2b6 100644 --- a/Tasks/FtpUploadV2/Strings/resources.resjson/it-IT/resources.resjson +++ b/Tasks/FtpUploadV2/Strings/resources.resjson/it-IT/resources.resjson @@ -11,6 +11,7 @@ "loc.input.label.serverUrl": "URL del server", "loc.input.label.username": "Nome utente", "loc.input.label.password": "Password", + "loc.input.label.implicitFTPS": "Utilizza FTPS implicito", "loc.input.label.rootFolder": "Cartella radice", "loc.input.help.rootFolder": "Cartella di origine da cui caricare i file.", "loc.input.label.filePatterns": "Criteri dei file", diff --git a/Tasks/FtpUploadV2/Strings/resources.resjson/ja-JP/resources.resjson b/Tasks/FtpUploadV2/Strings/resources.resjson/ja-JP/resources.resjson index 5895d2238495..bb28304fd47c 100644 --- a/Tasks/FtpUploadV2/Strings/resources.resjson/ja-JP/resources.resjson +++ b/Tasks/FtpUploadV2/Strings/resources.resjson/ja-JP/resources.resjson @@ -11,6 +11,7 @@ "loc.input.label.serverUrl": "サーバーの URL", "loc.input.label.username": "ユーザー名", "loc.input.label.password": "パスワード", + "loc.input.label.implicitFTPS": "暗黙的 FTPS を使用する", "loc.input.label.rootFolder": "ルート フォルダー", "loc.input.help.rootFolder": "ファイルのアップロード元のソース フォルダー。", "loc.input.label.filePatterns": "ファイル パターン", diff --git a/Tasks/FtpUploadV2/Strings/resources.resjson/ko-KR/resources.resjson b/Tasks/FtpUploadV2/Strings/resources.resjson/ko-KR/resources.resjson index 971cb146e2e6..e84b631b9168 100644 --- a/Tasks/FtpUploadV2/Strings/resources.resjson/ko-KR/resources.resjson +++ b/Tasks/FtpUploadV2/Strings/resources.resjson/ko-KR/resources.resjson @@ -11,6 +11,7 @@ "loc.input.label.serverUrl": "서버 URL", "loc.input.label.username": "사용자 이름", "loc.input.label.password": "암호", + "loc.input.label.implicitFTPS": "암시적 FTPS 사용", "loc.input.label.rootFolder": "루트 폴더", "loc.input.help.rootFolder": "파일을 업로드할 소스 폴더입니다.", "loc.input.label.filePatterns": "파일 패턴", diff --git a/Tasks/FtpUploadV2/Strings/resources.resjson/ru-RU/resources.resjson b/Tasks/FtpUploadV2/Strings/resources.resjson/ru-RU/resources.resjson index 7300365fe28e..0c82951bd0de 100644 --- a/Tasks/FtpUploadV2/Strings/resources.resjson/ru-RU/resources.resjson +++ b/Tasks/FtpUploadV2/Strings/resources.resjson/ru-RU/resources.resjson @@ -11,6 +11,7 @@ "loc.input.label.serverUrl": "URL-адрес сервера", "loc.input.label.username": "Имя пользователя", "loc.input.label.password": "Пароль", + "loc.input.label.implicitFTPS": "Использовать неявный FTPS", "loc.input.label.rootFolder": "Корневая папка", "loc.input.help.rootFolder": "Исходная папка, из которой выполняется отправка файлов.", "loc.input.label.filePatterns": "Шаблоны файлов", diff --git a/Tasks/FtpUploadV2/Strings/resources.resjson/zh-CN/resources.resjson b/Tasks/FtpUploadV2/Strings/resources.resjson/zh-CN/resources.resjson index f97312549302..62f748b7fcaf 100644 --- a/Tasks/FtpUploadV2/Strings/resources.resjson/zh-CN/resources.resjson +++ b/Tasks/FtpUploadV2/Strings/resources.resjson/zh-CN/resources.resjson @@ -11,6 +11,7 @@ "loc.input.label.serverUrl": "服务器 URL", "loc.input.label.username": "用户名", "loc.input.label.password": "密码", + "loc.input.label.implicitFTPS": "使用隐式 FTPS", "loc.input.label.rootFolder": "根文件夹", "loc.input.help.rootFolder": "要上传其中文件的源文件夹。", "loc.input.label.filePatterns": "文件模式", diff --git a/Tasks/FtpUploadV2/Strings/resources.resjson/zh-TW/resources.resjson b/Tasks/FtpUploadV2/Strings/resources.resjson/zh-TW/resources.resjson index a194a934ea42..39c0a63bf3c4 100644 --- a/Tasks/FtpUploadV2/Strings/resources.resjson/zh-TW/resources.resjson +++ b/Tasks/FtpUploadV2/Strings/resources.resjson/zh-TW/resources.resjson @@ -11,6 +11,7 @@ "loc.input.label.serverUrl": "伺服器 URL", "loc.input.label.username": "使用者名稱", "loc.input.label.password": "密碼", + "loc.input.label.implicitFTPS": "使用隱式 FTPS", "loc.input.label.rootFolder": "根資料夾", "loc.input.help.rootFolder": "要上傳之檔案所在的來源資料夾。", "loc.input.label.filePatterns": "檔案模式", diff --git a/Tasks/FtpUploadV2/ftpuploadtask.ts b/Tasks/FtpUploadV2/ftpuploadtask.ts index 88d5497ee4c0..2b2c94c2cf00 100644 --- a/Tasks/FtpUploadV2/ftpuploadtask.ts +++ b/Tasks/FtpUploadV2/ftpuploadtask.ts @@ -24,6 +24,7 @@ interface FtpOptions { cleanContents: boolean; preservePaths: boolean; trustSSL: boolean; + implicitFTPS: boolean; enableUtf8: boolean; customCmds: string[]; } @@ -199,14 +200,23 @@ function getFtpOptions(): FtpOptions { cleanContents: tl.getBoolInput("cleanContents", false), preservePaths: tl.getBoolInput("preservePaths", true), trustSSL: tl.getBoolInput("trustSSL", true), + implicitFTPS: tl.getBoolInput("implicitFTPS", false), enableUtf8: tl.getBoolInput("enableUtf8", false), customCmds: tl.getDelimitedInput("customCmds", "\n", false) + }; } function getAccessOption(options: FtpOptions): ftp.AccessOptions { const protocol = options.serverEndpointUrl.protocol; - const secure: boolean = protocol != undefined ? protocol.toLowerCase() === "ftps:" : false; + let secure: boolean | "implicit"; + if (options.implicitFTPS) { + secure = "implicit"; + } + else { + secure = protocol != undefined ? protocol.toLowerCase() === "ftps:" : false; + } + const secureOptions: any = { rejectUnauthorized: !options.trustSSL }; const hostName: string = options.serverEndpointUrl.hostname!; diff --git a/Tasks/FtpUploadV2/task.json b/Tasks/FtpUploadV2/task.json index b94989d14a41..8fef9661aa49 100644 --- a/Tasks/FtpUploadV2/task.json +++ b/Tasks/FtpUploadV2/task.json @@ -79,6 +79,13 @@ "required": true, "visibleRule": "credsType = inputs" }, + { + "name": "implicitFTPS", + "type": "boolean", + "label": "Use implicit FTPS", + "defaultValue": "false", + "required": false + }, { "name": "rootFolder", "aliases": [ diff --git a/Tasks/FtpUploadV2/task.loc.json b/Tasks/FtpUploadV2/task.loc.json index f8a0c8e0c29a..1abf0e083ed9 100644 --- a/Tasks/FtpUploadV2/task.loc.json +++ b/Tasks/FtpUploadV2/task.loc.json @@ -79,6 +79,13 @@ "required": true, "visibleRule": "credsType = inputs" }, + { + "name": "implicitFTPS", + "type": "boolean", + "label": "ms-resource:loc.input.label.implicitFTPS", + "defaultValue": "false", + "required": false + }, { "name": "rootFolder", "aliases": [ From cfb4de13fc233630d79aa250bebc58bea51c6a42 Mon Sep 17 00:00:00 2001 From: "Denis Nikulin (Akvelon inc)" Date: Thu, 31 Aug 2023 15:55:53 +0400 Subject: [PATCH 2/7] Changed the version of the task. --- Tasks/FtpUploadV2/task.json | 2 +- Tasks/FtpUploadV2/task.loc.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/FtpUploadV2/task.json b/Tasks/FtpUploadV2/task.json index 8fef9661aa49..7be105d88b29 100644 --- a/Tasks/FtpUploadV2/task.json +++ b/Tasks/FtpUploadV2/task.json @@ -18,7 +18,7 @@ "demands": [], "version": { "Major": 2, - "Minor": 211, + "Minor": 227, "Patch": 0 }, "minimumAgentVersion": "2.182.1", diff --git a/Tasks/FtpUploadV2/task.loc.json b/Tasks/FtpUploadV2/task.loc.json index 1abf0e083ed9..4f66c6ab4506 100644 --- a/Tasks/FtpUploadV2/task.loc.json +++ b/Tasks/FtpUploadV2/task.loc.json @@ -18,7 +18,7 @@ "demands": [], "version": { "Major": 2, - "Minor": 211, + "Minor": 227, "Patch": 0 }, "minimumAgentVersion": "2.182.1", From d70db18914cd5e4978402a1813fe0fb31372df82 Mon Sep 17 00:00:00 2001 From: Denis Nikulin Date: Fri, 8 Sep 2023 13:07:05 +0400 Subject: [PATCH 3/7] Update the minor version in task.json --- Tasks/FtpUploadV2/task.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/FtpUploadV2/task.json b/Tasks/FtpUploadV2/task.json index 7be105d88b29..f1968a6da50c 100644 --- a/Tasks/FtpUploadV2/task.json +++ b/Tasks/FtpUploadV2/task.json @@ -18,7 +18,7 @@ "demands": [], "version": { "Major": 2, - "Minor": 227, + "Minor": 228, "Patch": 0 }, "minimumAgentVersion": "2.182.1", @@ -215,4 +215,4 @@ "UploadSucceedRes": "FTP upload successful", "UploadFailed": "Ftp Upload failed" } -} \ No newline at end of file +} From edfe88a7d0ffd3bea1ed231c3345c02d40cff5bb Mon Sep 17 00:00:00 2001 From: Denis Nikulin Date: Fri, 8 Sep 2023 13:08:55 +0400 Subject: [PATCH 4/7] Updated the minor version in task.loc.json --- Tasks/FtpUploadV2/task.loc.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/FtpUploadV2/task.loc.json b/Tasks/FtpUploadV2/task.loc.json index 4f66c6ab4506..4cc3be31d8b1 100644 --- a/Tasks/FtpUploadV2/task.loc.json +++ b/Tasks/FtpUploadV2/task.loc.json @@ -18,7 +18,7 @@ "demands": [], "version": { "Major": 2, - "Minor": 227, + "Minor": 228, "Patch": 0 }, "minimumAgentVersion": "2.182.1", @@ -215,4 +215,4 @@ "UploadSucceedRes": "ms-resource:loc.messages.UploadSucceedRes", "UploadFailed": "ms-resource:loc.messages.UploadFailed" } -} \ No newline at end of file +} From 5c0fc2991ba34ae8dd0eaccd57a0d067b079d2b1 Mon Sep 17 00:00:00 2001 From: "Denis Nikulin (Akvelon Inc)" Date: Fri, 8 Sep 2023 15:36:42 +0400 Subject: [PATCH 5/7] Updated task.loc.json --- Tasks/FtpUploadV2/task.loc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tasks/FtpUploadV2/task.loc.json b/Tasks/FtpUploadV2/task.loc.json index 4cc3be31d8b1..cac90b366ff1 100644 --- a/Tasks/FtpUploadV2/task.loc.json +++ b/Tasks/FtpUploadV2/task.loc.json @@ -215,4 +215,4 @@ "UploadSucceedRes": "ms-resource:loc.messages.UploadSucceedRes", "UploadFailed": "ms-resource:loc.messages.UploadFailed" } -} +} \ No newline at end of file From dbd692ecf5f329e9c3482576030094d985feff62 Mon Sep 17 00:00:00 2001 From: "Denis Nikulin (Akvelon Inc)" Date: Mon, 11 Sep 2023 10:15:22 +0400 Subject: [PATCH 6/7] Reverted localization strings to master branch. --- .../Strings/resources.resjson/de-DE/resources.resjson | 1 - .../Strings/resources.resjson/es-ES/resources.resjson | 1 - .../Strings/resources.resjson/fr-FR/resources.resjson | 1 - .../Strings/resources.resjson/it-IT/resources.resjson | 1 - .../Strings/resources.resjson/ja-JP/resources.resjson | 1 - .../Strings/resources.resjson/ko-KR/resources.resjson | 1 - .../Strings/resources.resjson/ru-RU/resources.resjson | 1 - .../Strings/resources.resjson/zh-CN/resources.resjson | 1 - .../Strings/resources.resjson/zh-TW/resources.resjson | 1 - 9 files changed, 9 deletions(-) diff --git a/Tasks/FtpUploadV2/Strings/resources.resjson/de-DE/resources.resjson b/Tasks/FtpUploadV2/Strings/resources.resjson/de-DE/resources.resjson index 1631d241b053..baeff4c43182 100644 --- a/Tasks/FtpUploadV2/Strings/resources.resjson/de-DE/resources.resjson +++ b/Tasks/FtpUploadV2/Strings/resources.resjson/de-DE/resources.resjson @@ -11,7 +11,6 @@ "loc.input.label.serverUrl": "Server-URL", "loc.input.label.username": "Benutzername", "loc.input.label.password": "Kennwort", - "loc.input.label.implicitFTPS": "Verwenden Sie implizites FTPS", "loc.input.label.rootFolder": "Stammordner", "loc.input.help.rootFolder": "Der Quellordner, aus dem Dateien hochgeladen werden sollen.", "loc.input.label.filePatterns": "Dateimuster", diff --git a/Tasks/FtpUploadV2/Strings/resources.resjson/es-ES/resources.resjson b/Tasks/FtpUploadV2/Strings/resources.resjson/es-ES/resources.resjson index 75c96dbda248..767dc0406b72 100644 --- a/Tasks/FtpUploadV2/Strings/resources.resjson/es-ES/resources.resjson +++ b/Tasks/FtpUploadV2/Strings/resources.resjson/es-ES/resources.resjson @@ -11,7 +11,6 @@ "loc.input.label.serverUrl": "Dirección URL del servidor", "loc.input.label.username": "Nombre de usuario", "loc.input.label.password": "Contraseña", - "loc.input.label.implicitFTPS": "Utilice FTPS implícito", "loc.input.label.rootFolder": "Carpeta raíz", "loc.input.help.rootFolder": "Carpeta de origen de donde se cargan los archivos.", "loc.input.label.filePatterns": "Patrones de archivo", diff --git a/Tasks/FtpUploadV2/Strings/resources.resjson/fr-FR/resources.resjson b/Tasks/FtpUploadV2/Strings/resources.resjson/fr-FR/resources.resjson index 189256fc7808..1bb46724c141 100644 --- a/Tasks/FtpUploadV2/Strings/resources.resjson/fr-FR/resources.resjson +++ b/Tasks/FtpUploadV2/Strings/resources.resjson/fr-FR/resources.resjson @@ -11,7 +11,6 @@ "loc.input.label.serverUrl": "URL du serveur", "loc.input.label.username": "Nom d'utilisateur", "loc.input.label.password": "Mot de passe", - "loc.input.label.implicitFTPS": "Utiliser FTPS implicite", "loc.input.label.rootFolder": "Dossier racine", "loc.input.help.rootFolder": "Dossier source du chargement des fichiers.", "loc.input.label.filePatterns": "Modèles de fichiers", diff --git a/Tasks/FtpUploadV2/Strings/resources.resjson/it-IT/resources.resjson b/Tasks/FtpUploadV2/Strings/resources.resjson/it-IT/resources.resjson index 8e4390f4a2b6..592dda67f48a 100644 --- a/Tasks/FtpUploadV2/Strings/resources.resjson/it-IT/resources.resjson +++ b/Tasks/FtpUploadV2/Strings/resources.resjson/it-IT/resources.resjson @@ -11,7 +11,6 @@ "loc.input.label.serverUrl": "URL del server", "loc.input.label.username": "Nome utente", "loc.input.label.password": "Password", - "loc.input.label.implicitFTPS": "Utilizza FTPS implicito", "loc.input.label.rootFolder": "Cartella radice", "loc.input.help.rootFolder": "Cartella di origine da cui caricare i file.", "loc.input.label.filePatterns": "Criteri dei file", diff --git a/Tasks/FtpUploadV2/Strings/resources.resjson/ja-JP/resources.resjson b/Tasks/FtpUploadV2/Strings/resources.resjson/ja-JP/resources.resjson index bb28304fd47c..5895d2238495 100644 --- a/Tasks/FtpUploadV2/Strings/resources.resjson/ja-JP/resources.resjson +++ b/Tasks/FtpUploadV2/Strings/resources.resjson/ja-JP/resources.resjson @@ -11,7 +11,6 @@ "loc.input.label.serverUrl": "サーバーの URL", "loc.input.label.username": "ユーザー名", "loc.input.label.password": "パスワード", - "loc.input.label.implicitFTPS": "暗黙的 FTPS を使用する", "loc.input.label.rootFolder": "ルート フォルダー", "loc.input.help.rootFolder": "ファイルのアップロード元のソース フォルダー。", "loc.input.label.filePatterns": "ファイル パターン", diff --git a/Tasks/FtpUploadV2/Strings/resources.resjson/ko-KR/resources.resjson b/Tasks/FtpUploadV2/Strings/resources.resjson/ko-KR/resources.resjson index e84b631b9168..971cb146e2e6 100644 --- a/Tasks/FtpUploadV2/Strings/resources.resjson/ko-KR/resources.resjson +++ b/Tasks/FtpUploadV2/Strings/resources.resjson/ko-KR/resources.resjson @@ -11,7 +11,6 @@ "loc.input.label.serverUrl": "서버 URL", "loc.input.label.username": "사용자 이름", "loc.input.label.password": "암호", - "loc.input.label.implicitFTPS": "암시적 FTPS 사용", "loc.input.label.rootFolder": "루트 폴더", "loc.input.help.rootFolder": "파일을 업로드할 소스 폴더입니다.", "loc.input.label.filePatterns": "파일 패턴", diff --git a/Tasks/FtpUploadV2/Strings/resources.resjson/ru-RU/resources.resjson b/Tasks/FtpUploadV2/Strings/resources.resjson/ru-RU/resources.resjson index 0c82951bd0de..7300365fe28e 100644 --- a/Tasks/FtpUploadV2/Strings/resources.resjson/ru-RU/resources.resjson +++ b/Tasks/FtpUploadV2/Strings/resources.resjson/ru-RU/resources.resjson @@ -11,7 +11,6 @@ "loc.input.label.serverUrl": "URL-адрес сервера", "loc.input.label.username": "Имя пользователя", "loc.input.label.password": "Пароль", - "loc.input.label.implicitFTPS": "Использовать неявный FTPS", "loc.input.label.rootFolder": "Корневая папка", "loc.input.help.rootFolder": "Исходная папка, из которой выполняется отправка файлов.", "loc.input.label.filePatterns": "Шаблоны файлов", diff --git a/Tasks/FtpUploadV2/Strings/resources.resjson/zh-CN/resources.resjson b/Tasks/FtpUploadV2/Strings/resources.resjson/zh-CN/resources.resjson index 62f748b7fcaf..f97312549302 100644 --- a/Tasks/FtpUploadV2/Strings/resources.resjson/zh-CN/resources.resjson +++ b/Tasks/FtpUploadV2/Strings/resources.resjson/zh-CN/resources.resjson @@ -11,7 +11,6 @@ "loc.input.label.serverUrl": "服务器 URL", "loc.input.label.username": "用户名", "loc.input.label.password": "密码", - "loc.input.label.implicitFTPS": "使用隐式 FTPS", "loc.input.label.rootFolder": "根文件夹", "loc.input.help.rootFolder": "要上传其中文件的源文件夹。", "loc.input.label.filePatterns": "文件模式", diff --git a/Tasks/FtpUploadV2/Strings/resources.resjson/zh-TW/resources.resjson b/Tasks/FtpUploadV2/Strings/resources.resjson/zh-TW/resources.resjson index 39c0a63bf3c4..a194a934ea42 100644 --- a/Tasks/FtpUploadV2/Strings/resources.resjson/zh-TW/resources.resjson +++ b/Tasks/FtpUploadV2/Strings/resources.resjson/zh-TW/resources.resjson @@ -11,7 +11,6 @@ "loc.input.label.serverUrl": "伺服器 URL", "loc.input.label.username": "使用者名稱", "loc.input.label.password": "密碼", - "loc.input.label.implicitFTPS": "使用隱式 FTPS", "loc.input.label.rootFolder": "根資料夾", "loc.input.help.rootFolder": "要上傳之檔案所在的來源資料夾。", "loc.input.label.filePatterns": "檔案模式", From 8bed05746897dcffcf4fa740b08701329d44564a Mon Sep 17 00:00:00 2001 From: Denis Nikulin Date: Mon, 18 Sep 2023 15:17:34 +0400 Subject: [PATCH 7/7] Updated Tasks/FtpUploadV2/ftpuploadtask.ts Refactored a secure conditional expression. Co-authored-by: Konstantin Tyukalov <52399739+KonstantinTyukalov@users.noreply.github.com> --- Tasks/FtpUploadV2/ftpuploadtask.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tasks/FtpUploadV2/ftpuploadtask.ts b/Tasks/FtpUploadV2/ftpuploadtask.ts index 2b2c94c2cf00..655ad9e029a5 100644 --- a/Tasks/FtpUploadV2/ftpuploadtask.ts +++ b/Tasks/FtpUploadV2/ftpuploadtask.ts @@ -214,7 +214,7 @@ function getAccessOption(options: FtpOptions): ftp.AccessOptions { secure = "implicit"; } else { - secure = protocol != undefined ? protocol.toLowerCase() === "ftps:" : false; + secure = !!protocol && protocol.toLowerCase() === "ftps:"; } const secureOptions: any = { rejectUnauthorized: !options.trustSSL };