Skip to content

Commit a03d33e

Browse files
sirkhinSlava Irkhin
andauthored
Prevent using vso commands with Build.SourceVersionAuthor variable (#5184)
Co-authored-by: Slava Irkhin <[email protected]>
1 parent f32fede commit a03d33e

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

src/Agent.Worker/Variables.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ public bool Retain_Default_Encoding
270270
{
271271
Constants.Variables.Build.SourceVersionMessage,
272272
Constants.Variables.Build.DefinitionName,
273+
Constants.Variables.Build.SourceVersionAuthor,
273274
Constants.Variables.System.SourceVersionMessage,
274275
Constants.Variables.System.DefinitionName,
275276
Constants.Variables.System.JobDisplayName,

src/Microsoft.VisualStudio.Services.Agent/Constants.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,7 @@ public static class Build
427427
public static readonly string SourceBranch = "build.sourcebranch";
428428
public static readonly string SourceTfvcShelveset = "build.sourcetfvcshelveset";
429429
public static readonly string SourceVersion = "build.sourceversion";
430+
public static readonly string SourceVersionAuthor = "build.sourceversionauthor";
430431
public static readonly string SourceVersionMessage = "build.sourceVersionMessage";
431432
public static readonly string SourcesDirectory = "build.sourcesdirectory";
432433
public static readonly string StagingDirectory = "build.stagingdirectory";
@@ -621,6 +622,7 @@ public static class Task
621622
Build.SourceBranch,
622623
Build.SourceTfvcShelveset,
623624
Build.SourceVersion,
625+
Build.SourceVersionAuthor,
624626
Build.SourceVersionMessage,
625627
Build.SourcesDirectory,
626628
Build.StagingDirectory,

src/Test/L0/Worker/WorkerL0.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ public void VerifyJobRequestMessageVsoCommandsDeactivated()
241241
message.Variables[Constants.Variables.System.DefinitionName] = "##vso[setVariable]etc4";
242242
message.Variables[Constants.Variables.Release.ReleaseDefinitionName] = "##vso[setVariable]etc5";
243243
message.Variables[Constants.Variables.Release.ReleaseEnvironmentName] = "##vso[setVariable]etc6";
244+
message.Variables[Constants.Variables.Build.SourceVersionAuthor] = "##vso[setVariable]etc7";
244245

245246
var scrubbedMessage = WorkerUtilities.DeactivateVsoCommandsFromJobMessageVariables(message);
246247

@@ -250,6 +251,7 @@ public void VerifyJobRequestMessageVsoCommandsDeactivated()
250251
Assert.Equal("**vso[setVariable]etc4", scrubbedMessage.Variables[Constants.Variables.System.DefinitionName]);
251252
Assert.Equal("**vso[setVariable]etc5", scrubbedMessage.Variables[Constants.Variables.Release.ReleaseDefinitionName]);
252253
Assert.Equal("**vso[setVariable]etc6", scrubbedMessage.Variables[Constants.Variables.Release.ReleaseEnvironmentName]);
254+
Assert.Equal("**vso[setVariable]etc7", scrubbedMessage.Variables[Constants.Variables.Build.SourceVersionAuthor]);
253255
}
254256

255257
[Fact]

0 commit comments

Comments
 (0)