Fix Azure#2363 - make lease timeout range check more robust

ConnorMcMahon · Mar 29, 2018 · 043561c · 043561c
1 parent 928d2f6
commit 043561c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/WebJobs.Script/Host/PrimaryHostCoordinator.cs b/src/WebJobs.Script/Host/PrimaryHostCoordinator.cs
@@ -89,9 +89,9 @@ public static PrimaryHostCoordinator Create(
             ILoggerFactory loggerFactory,
             TimeSpan? renewalInterval = null)
         {
-            if (leaseTimeout.TotalSeconds < 15 || leaseTimeout.TotalSeconds > 60)
+            if (leaseTimeout < TimeSpan.FromSeconds(15) || leaseTimeout > TimeSpan.FromSeconds(60))
             {
-                throw new ArgumentOutOfRangeException(nameof(leaseTimeout), $"The {nameof(leaseTimeout)} should be between 15 and 60 seconds");
+                throw new ArgumentOutOfRangeException(nameof(leaseTimeout), $"The {nameof(leaseTimeout)} should be between 15 and 60 seconds but was '{leaseTimeout}'");
             }
 
             var manager = new PrimaryHostCoordinator(lockManager, leaseTimeout, hostId, instanceId, loggerFactory, renewalInterval);

diff --git a/test/WebJobs.Script.Tests.Integration/PrimaryHostCoordinatorTests.cs b/test/WebJobs.Script.Tests.Integration/PrimaryHostCoordinatorTests.cs
@@ -37,6 +37,20 @@ private static IDistributedLockManager CreateLockManager()
             return lockManager;
         }
 
+        [Theory]
+        [InlineData(14.99)]
+        [InlineData(60.01)]
+        public void RejectsInvalidLeaseTimeout(double leaseTimeoutSeconds)
+        {
+            var leaseTimeout = TimeSpan.FromSeconds(leaseTimeoutSeconds);
+
+            string hostId = Guid.NewGuid().ToString();
+            string instanceId = Guid.NewGuid().ToString();
+
+            Assert.Throws<ArgumentOutOfRangeException>(
+                () => PrimaryHostCoordinator.Create(CreateLockManager(), leaseTimeout, hostId, instanceId, _loggerFactory));
+        }
+
         [Fact]
         public async Task HasLease_WhenLeaseIsAcquired_ReturnsTrue()
         {