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.

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

Add setSanitizedResult function #1022

Merged
merged 1 commit into from
Feb 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions node/internal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,20 @@ export function _endsWith(str: string, end: string): boolean {
return str.slice(-end.length) == end;
}

export function _truncateBeforeSensitiveKeyword(str: string, sensitiveKeywordsPattern: RegExp): string {
if(!str) {
return str;
}

const index = str.search(sensitiveKeywordsPattern);

if (index <= 0) {
return str;
}

return `${str.substring(0, index)}...`;
}

//-----------------------------------------------------
// General Helpers
//-----------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions node/mock-task.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ module.exports.Platform = task.Platform;
module.exports.setStdStream = task.setStdStream;
module.exports.setErrStream = task.setErrStream;
module.exports.setResult = task.setResult;
module.exports.setSanitizedResult = task.setSanitizedResult;

//-----------------------------------------------------
// Loc Helpers
Expand Down
2 changes: 1 addition & 1 deletion node/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "azure-pipelines-task-lib",
"version": "4.9.0",
"version": "4.9.1",
"description": "Azure Pipelines Task SDK",
"main": "./task.js",
"typings": "./task.d.ts",
Expand Down
18 changes: 18 additions & 0 deletions node/task.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,24 @@ export function setResult(result: TaskResult, message: string, done?: boolean):
command('task.complete', properties, message);
}

/**
* Sets the result of the task with sanitized message.
*
* @param result TaskResult enum of Succeeded, SucceededWithIssues, Failed, Cancelled or Skipped.
* @param message A message which will be logged as an error issue if the result is Failed. Message will be truncated
* before first occurence of wellknown sensitive keyword.
* @param done Optional. Instructs the agent the task is done. This is helpful when child processes
* may still be running and prevent node from fully exiting. This argument is supported
* from agent version 2.142.0 or higher (otherwise will no-op).
* @returns void
*/

export function setSanitizedResult(result: TaskResult, message: string, done?: boolean): void {
const pattern = /password|key|secret|bearer|authorization|token|pat/i;
const sanitizedMessage = im._truncateBeforeSensitiveKeyword(message, pattern);
setResult(result, sanitizedMessage, done);
}

//
// Catching all exceptions
//
Expand Down
27 changes: 27 additions & 0 deletions node/test/internalhelpertests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,33 @@ import * as tl from '../_build/task';
import * as im from '../_build/internal';
import * as mockery from '../_build/lib-mocker'

describe('Internal String Helper Tests: _truncateBeforeSensitiveKeyword', function () {

it('truncates before known sensitive keywords', () => {
const input = "this is a secret password";

const result = im._truncateBeforeSensitiveKeyword(input, /secret/i);

assert.strictEqual(result, "this is a ...");
});

it('does not truncate without sensitive keyword', () => {
const input = "this is a secret password";

const result = im._truncateBeforeSensitiveKeyword(input, /key/i);

assert.strictEqual(result, input);
});

it('process undefined gracefully', () => {
const input: string = undefined;

const result = im._truncateBeforeSensitiveKeyword(input, /key/i);

assert.strictEqual(result, input);
});
});

describe('Internal Path Helper Tests', function () {

before(function (done) {
Expand Down
17 changes: 17 additions & 0 deletions node/test/resulttests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,23 @@ describe('Result Tests', function () {

assert.equal(output, expected);

done();
})
it('setSanitizedResult success outputs', function (done) {
this.timeout(1000);

var stdStream = testutil.createStringStream();
tl.setStdStream(stdStream);
tl.setSanitizedResult(tl.TaskResult.Succeeded, 'success msg with secret data');

var expected = testutil.buildOutput(
['##vso[task.debug]task result: Succeeded',
'##vso[task.complete result=Succeeded;]success msg with ...']);

var output = stdStream.getContents();

assert.equal(output, expected);

done();
})
});
Loading