Do not send null or empty values (#5128)

Azure · Oct 22, 2019 · 0b82956 · 0b82956
1 parent 8721f67
commit 0b82956
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/WebJobs.Script/OutOfProc/Rpc/LanguageWorkerChannel.cs b/src/WebJobs.Script/OutOfProc/Rpc/LanguageWorkerChannel.cs
@@ -225,7 +225,11 @@ internal FunctionEnvironmentReloadRequest GetFunctionEnvironmentReloadRequest(ID
  FunctionEnvironmentReloadRequest request = new FunctionEnvironmentReloadRequest();
  foreach (DictionaryEntry entry in processEnv)
  {
- request.EnvironmentVariables.Add(entry.Key.ToString(), entry.Value.ToString());
+ // Do not add environment variables with empty or null values (see issue #4488 for context)
+ if (!string.IsNullOrEmpty(entry.Value?.ToString()))
+ {
+ request.EnvironmentVariables.Add(entry.Key.ToString(), entry.Value.ToString());
+ }
  }
  return request;
  }

diff --git a/test/WebJobs.Script.Tests/Rpc/LanguageWorkerChannelTests.cs b/test/WebJobs.Script.Tests/Rpc/LanguageWorkerChannelTests.cs
@@ -214,10 +214,14 @@ public async Task SendSendFunctionEnvironmentReloadRequest_ThrowsTimeout()
  [Fact]
  public void SendSendFunctionEnvironmentReloadRequest_SanitizedEnvironmentVariables()
  {
- Environment.SetEnvironmentVariable("TestNull", null);
- Environment.SetEnvironmentVariable("TestEmpty", string.Empty);
- Environment.SetEnvironmentVariable("TestValid", "TestValue");
- FunctionEnvironmentReloadRequest envReloadRequest = _workerChannel.GetFunctionEnvironmentReloadRequest(Environment.GetEnvironmentVariables());
+ var environmentVariables = new Dictionary<string, string>()
+ {
+ { "TestNull", null },
+ { "TestEmpty", string.Empty },
+ { "TestValid", "TestValue" }
+ };
+
+ FunctionEnvironmentReloadRequest envReloadRequest = _workerChannel.GetFunctionEnvironmentReloadRequest(environmentVariables);
  Assert.False(envReloadRequest.EnvironmentVariables.ContainsKey("TestNull"));
  Assert.False(envReloadRequest.EnvironmentVariables.ContainsKey("TestEmpty"));
  Assert.True(envReloadRequest.EnvironmentVariables.ContainsKey("TestValid"));