PR: guard against nulls

NuGet · Apr 25, 2017 · 55ce5ba · 55ce5ba
1 parent 8308c39
commit 55ce5ba
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/src/NuGetGallery/Security/RequireMinClientVersionForPushPolicy.cs b/src/NuGetGallery/Security/RequireMinClientVersionForPushPolicy.cs
@@ -35,7 +35,9 @@ public RequireMinClientVersionForPushPolicy()
         /// </summary>
         private NuGetVersion GetMaxOfMinClientVersions(UserSecurityPolicyContext context)
         {
-            var policyStates = context.Policies.Select(p => JsonConvert.DeserializeObject<State>(p.Value));
+            var policyStates = context.Policies
+                .Where(p => !string.IsNullOrEmpty(p.Value))
+                .Select(p => JsonConvert.DeserializeObject<State>(p.Value));
             return policyStates.Max(s => s.MinClientVersion);
         }
 

diff --git a/tests/NuGetGallery.Facts/Security/RequireMinClientVersionForPushPolicyFacts.cs b/tests/NuGetGallery.Facts/Security/RequireMinClientVersionForPushPolicyFacts.cs
@@ -52,11 +52,33 @@ public void EvaluateReturnsFailureIfNoClientHeader()
             Assert.NotNull(result.ErrorMessage);
         }
 
+        [Fact]
+        public void EvaluateReturnsSuccess_PolicyMissingMinVerAndClientVersionHeader()
+        {
+            // Arrange & Act
+            var result = Evaluate(minClientVersions: "", actualClientVersion: "4.1.0");
+
+            // Assert
+            Assert.True(result.Success);
+            Assert.Null(result.ErrorMessage);
+        }
+
+        [Fact]
+        public void EvaluateReturnsFailure_PolicyMissingMinVerAndNoClientVersionHeader()
+        {
+            // Arrange & Act
+            var result = Evaluate(minClientVersions: "", actualClientVersion: "");
+
+            // Assert
+            Assert.False(result.Success);
+            Assert.NotNull(result.ErrorMessage);
+        }
+
         private static UserSecurityPolicy CreateMinClientVersionForPushPolicy(string minClientVersion)
         {
             return new UserSecurityPolicy("RequireMinClientVersionForPushPolicy")
             {
-                Value = $"{{\"v\":\"{minClientVersion}\"}}"
+                Value = string.IsNullOrEmpty(minClientVersion) ? null : $"{{\"v\":\"{minClientVersion}\"}}"
             };
         }