Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed a bug when an error occurred when using implicit FTPS (FTP over TLS). #18908

Merged
merged 10 commits into from
Sep 18, 2023
Merged

Fixed a bug when an error occurred when using implicit FTPS (FTP over TLS). #18908

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e963211
Fixed an issue with FTPUploadV2 task when using implicit FTPS.
DenisNikulin5 Aug 31, 2023
cfb4de1
Changed the version of the task.
DenisNikulin5 Aug 31, 2023
025cfc9
Merge branch 'master' into users/denis-nikulin/implicit-FTPS-fix
Sep 8, 2023
d70db18
Update the minor version in task.json
DenisNikulin5 Sep 8, 2023
edfe88a
Updated the minor version in task.loc.json
DenisNikulin5 Sep 8, 2023
5c0fc29
Updated task.loc.json
Sep 8, 2023
a3c4682
Merge branch 'master' into users/denis-nikulin/implicit-FTPS-fix
Sep 11, 2023
dbd692e
Reverted localization strings to master branch.
Sep 11, 2023
8bed057
Updated Tasks/FtpUploadV2/ftpuploadtask.ts
DenisNikulin5 Sep 18, 2023
937a83f
Merge branch 'master' into users/denis-nikulin/implicit-FTPS-fix
Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Tasks/FtpUploadV2/Strings/resources.resjson/en-US/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 11 additions & 1 deletion Tasks/FtpUploadV2/ftpuploadtask.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ interface FtpOptions {
cleanContents: boolean;
preservePaths: boolean;
trustSSL: boolean;
implicitFTPS: boolean;
enableUtf8: boolean;
customCmds: string[];
}
Expand Down Expand Up @@ -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;
DenisNikulin5 marked this conversation as resolved.
Show resolved Hide resolved
}

const secureOptions: any = { rejectUnauthorized: !options.trustSSL };

const hostName: string = options.serverEndpointUrl.hostname!;
Expand Down
11 changes: 9 additions & 2 deletions Tasks/FtpUploadV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"demands": [],
"version": {
"Major": 2,
"Minor": 211,
"Minor": 228,
"Patch": 0
},
"minimumAgentVersion": "2.182.1",
Expand Down Expand Up @@ -79,6 +79,13 @@
"required": true,
"visibleRule": "credsType = inputs"
},
{
"name": "implicitFTPS",
"type": "boolean",
"label": "Use implicit FTPS",
"defaultValue": "false",
"required": false
},
{
"name": "rootFolder",
"aliases": [
Expand Down Expand Up @@ -208,4 +215,4 @@
"UploadSucceedRes": "FTP upload successful",
"UploadFailed": "Ftp Upload failed"
}
}
}
9 changes: 8 additions & 1 deletion Tasks/FtpUploadV2/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"demands": [],
"version": {
"Major": 2,
"Minor": 211,
"Minor": 228,
"Patch": 0
},
"minimumAgentVersion": "2.182.1",
Expand Down Expand Up @@ -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": [
Expand Down