Skip to content

Prevent using vso commands with Build.SourceVersionAuthor variable #5184

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

Merged
merged 1 commit into from
Apr 25, 2025
Merged

Prevent using vso commands with Build.SourceVersionAuthor variable #5184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/Agent.Worker/Variables.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ public bool Retain_Default_Encoding
{
Constants.Variables.Build.SourceVersionMessage,
Constants.Variables.Build.DefinitionName,
Constants.Variables.Build.SourceVersionAuthor,
Constants.Variables.System.SourceVersionMessage,
Constants.Variables.System.DefinitionName,
Constants.Variables.System.JobDisplayName,
Expand Down
2 changes: 2 additions & 0 deletions src/Microsoft.VisualStudio.Services.Agent/Constants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,7 @@ public static class Build
public static readonly string SourceBranch = "build.sourcebranch";
public static readonly string SourceTfvcShelveset = "build.sourcetfvcshelveset";
public static readonly string SourceVersion = "build.sourceversion";
public static readonly string SourceVersionAuthor = "build.sourceversionauthor";
public static readonly string SourceVersionMessage = "build.sourceVersionMessage";
public static readonly string SourcesDirectory = "build.sourcesdirectory";
public static readonly string StagingDirectory = "build.stagingdirectory";
Expand Down Expand Up @@ -621,6 +622,7 @@ public static class Task
Build.SourceBranch,
Build.SourceTfvcShelveset,
Build.SourceVersion,
Build.SourceVersionAuthor,
Build.SourceVersionMessage,
Build.SourcesDirectory,
Build.StagingDirectory,
Expand Down
2 changes: 2 additions & 0 deletions src/Test/L0/Worker/WorkerL0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ public void VerifyJobRequestMessageVsoCommandsDeactivated()
message.Variables[Constants.Variables.System.DefinitionName] = "##vso[setVariable]etc4";
message.Variables[Constants.Variables.Release.ReleaseDefinitionName] = "##vso[setVariable]etc5";
message.Variables[Constants.Variables.Release.ReleaseEnvironmentName] = "##vso[setVariable]etc6";
message.Variables[Constants.Variables.Build.SourceVersionAuthor] = "##vso[setVariable]etc7";

var scrubbedMessage = WorkerUtilities.DeactivateVsoCommandsFromJobMessageVariables(message);

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

[Fact]
Expand Down
Loading