Remove job message PII variable masking code

actions · Dec 5, 2019 · fbae6f2 · fbae6f2
1 parent 5f2ccb1
commit fbae6f2
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 177 deletions.
diff --git a/src/Runner.Worker/Variables.cs b/src/Runner.Worker/Variables.cs
@@ -77,34 +77,6 @@ public Variables(IHostContext hostContext, IDictionary<string, VariableValue> co
 
         public string System_TFCollectionUrl => Get(WellKnownDistributedTaskVariables.TFCollectionUrl);
 
-        public static readonly HashSet<string> PiiVariables = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
-        {
-            "Build.AuthorizeAs",
-            "Build.QueuedBy",
-            "Build.RequestedFor",
-            "Build.RequestedForEmail",
-            "Build.SourceBranch",
-            "Build.SourceBranchName",
-            "Build.SourceTfvcShelveset",
-            "Build.SourceVersion",
-            "Build.SourceVersionAuthor",
-            "Job.AuthorizeAs",
-            "Release.Deployment.RequestedFor",
-            "Release.Deployment.RequestedForEmail",
-            "Release.RequestedFor",
-            "Release.RequestedForEmail",
-        };
-
-        public static readonly string PiiArtifactVariablePrefix = "Release.Artifacts";
-
-        public static readonly List<string> PiiArtifactVariableSuffixes = new List<string>()
-        {
-            "SourceBranch",
-            "SourceBranchName",
-            "SourceVersion",
-            "RequestedFor"
-        };
-
         public string Get(string name)
         {
             Variable variable;

diff --git a/src/Runner.Worker/Worker.cs b/src/Runner.Worker/Worker.cs
@@ -74,7 +74,7 @@ public async Task<int> RunAsync(string pipeIn, string pipeOut)
                     SetCulture(jobMessage);
 
                     // Start the job.
-                    Trace.Info($"Job message:{Environment.NewLine} {StringUtil.ConvertToJson(WorkerUtilities.ScrubPiiData(jobMessage))}");
+                    Trace.Info($"Job message:{Environment.NewLine} {StringUtil.ConvertToJson(jobMessage)}");
                     Task<TaskResult> jobRunnerTask = jobRunner.RunAsync(jobMessage, jobRequestCancellationToken.Token);
 
                     // Start listening for a cancel message from the channel.

diff --git a/src/Runner.Worker/WorkerUtilties.cs b/src/Runner.Worker/WorkerUtilties.cs
diff --git a/src/Test/L0/Worker/WorkerL0.cs b/src/Test/L0/Worker/WorkerL0.cs
@@ -187,62 +187,6 @@ await Assert.ThrowsAsync<TaskCanceledException>(
             }
         }
 
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void VerifyJobRequestMessagePiiDataIsScrubbed()
-        {
-            // Arrange
-            Pipelines.AgentJobRequestMessage message = CreateJobRequestMessage("jobwithpiidata");
-
-            // Populate PII variables
-            foreach (string piiVariable in Variables.PiiVariables)
-            {
-                message.Variables.Add(piiVariable, "MyPiiVariable");
-            }
-
-            foreach (string piiVariableSuffix in Variables.PiiArtifactVariableSuffixes)
-            {
-                message.Variables.Add($"{Variables.PiiArtifactVariablePrefix}.MyArtifact.{piiVariableSuffix}", "MyPiiVariable");
-            }
-
-            // Populate the repository PII data
-            Pipelines.RepositoryResource repository = new Pipelines.RepositoryResource();
-
-            repository.Properties.Set(
-                Pipelines.RepositoryPropertyNames.VersionInfo,
-                new Pipelines.VersionInfo()
-                {
-                    Author = "MyAuthor",
-                    Message = "MyMessage"
-                });
-
-            message.Resources.Repositories.Add(repository);
-
-            // Act
-            Pipelines.AgentJobRequestMessage scrubbedMessage = WorkerUtilities.ScrubPiiData(message);
-
-            // Assert
-            foreach (string piiVariable in Variables.PiiVariables)
-            {
-                scrubbedMessage.Variables.TryGetValue(piiVariable, out VariableValue value);
-
-                Assert.Equal("[PII]", value.Value);
-            }
-
-            foreach (string piiVariableSuffix in Variables.PiiArtifactVariableSuffixes)
-            {
-                scrubbedMessage.Variables.TryGetValue($"{Variables.PiiArtifactVariablePrefix}.MyArtifact.{piiVariableSuffix}", out VariableValue value);
-
-                Assert.Equal("[PII]", value.Value);
-            }
-
-            Pipelines.RepositoryResource scrubbedRepo = scrubbedMessage.Resources.Repositories[0];
-            Pipelines.VersionInfo scrubbedInfo = scrubbedRepo.Properties.Get<Pipelines.VersionInfo>(Pipelines.RepositoryPropertyNames.VersionInfo);
-
-            Assert.Equal("[PII]", scrubbedInfo.Author);
-        }
-
         private bool IsMessageIdentical(Pipelines.AgentJobRequestMessage source, Pipelines.AgentJobRequestMessage target)
         {
             if (source == null && target == null)