Merge remote-tracking branch 'origin/dev'

davidebbo · davidebbo · commit a0925eb31a30 · 2017-02-21T10:43:57.000-08:00
diff --git a/schemas/json/function.json b/schemas/json/function.json
diff --git a/src/WebJobs.Script.WebHost/Filters/AuthorizationLevelAttribute.cs b/src/WebJobs.Script.WebHost/Filters/AuthorizationLevelAttribute.cs
@@ -88,7 +88,7 @@ internal static async Task<AuthorizationLevel> GetAuthorizationLevelAsync(HttpRe
                 // if there is a function specific key specified try to match against that
                 if (functionName != null)
                 {
-                    IDictionary<string, string> functionSecrets = secretManager.GetFunctionSecretsAsync(functionName).GetAwaiter().GetResult();
+                    IDictionary<string, string> functionSecrets = await secretManager.GetFunctionSecretsAsync(functionName);
                     if (functionSecrets != null &&
                         functionSecrets.Values.Any(s => Key.SecretValueEquals(keyValue, s)))
                     {
diff --git a/src/WebJobs.Script.WebHost/Web.config b/src/WebJobs.Script.WebHost/Web.config
@@ -143,7 +143,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
diff --git a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj
@@ -223,7 +223,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.WebSites.DataProtection, Version=0.1.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebSites.DataProtection.0.1.6-alpha45\lib\net46\Microsoft.Azure.WebSites.DataProtection.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebSites.DataProtection.0.1.6-alpha51\lib\net46\Microsoft.Azure.WebSites.DataProtection.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Bot.Connector.DirectLine, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/src/WebJobs.Script.WebHost/packages.config b/src/WebJobs.Script.WebHost/packages.config
@@ -49,7 +49,7 @@
   <package id="Microsoft.Azure.WebJobs.Logging" version="2.0.0-beta2-10515" targetFramework="net46" />
   <package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta2-10726" targetFramework="net46" />
   <package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0-beta2-10515" targetFramework="net46" />
-  <package id="Microsoft.Azure.WebSites.DataProtection" version="0.1.6-alpha45" targetFramework="net46" />
+  <package id="Microsoft.Azure.WebSites.DataProtection" version="0.1.6-alpha51" targetFramework="net46" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net46" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net46" />
   <package id="Microsoft.Bot.Connector.DirectLine" version="3.0.0-beta" targetFramework="net46" />
diff --git a/test/WebJobs.Script.Tests.Integration/App.config b/test/WebJobs.Script.Tests.Integration/App.config
@@ -71,7 +71,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
diff --git a/test/WebJobs.Script.Tests.Integration/FunctionGeneratorEndToEndTests.cs b/test/WebJobs.Script.Tests.Integration/FunctionGeneratorEndToEndTests.cs
@@ -16,6 +16,7 @@
 using Microsoft.Azure.WebJobs.Script.Config;
 using Microsoft.Azure.WebJobs.Script.Description;
 using Microsoft.Azure.WebJobs.Script.WebHost;
+using Microsoft.WebJobs.Script.Tests;
 using Xunit;
 
 namespace Microsoft.Azure.WebJobs.Script.Tests
@@ -160,30 +161,5 @@ await TestHelpers.Await(() =>
                 }
             }
         }
-
-        private sealed class SingleThreadSynchronizationContext : SynchronizationContext
-        {
-            private readonly ConcurrentQueue<Tuple<SendOrPostCallback, object>> _workItems =
-                new ConcurrentQueue<Tuple<SendOrPostCallback, object>>();
-
-            public override void Post(SendOrPostCallback d, object state)
-            {
-                _workItems.Enqueue(new Tuple<SendOrPostCallback, object>(d, state));
-            }
-
-            public override void Send(SendOrPostCallback d, object state)
-            {
-                throw new NotSupportedException();
-            }
-
-            public void Run()
-            {
-                Tuple<SendOrPostCallback, object> item;
-                while (_workItems.TryDequeue(out item))
-                {
-                    item.Item1(item.Item2);
-                }
-            }
-        }
     }
 }
diff --git a/test/WebJobs.Script.Tests.Integration/SamplesEndToEndTests.cs b/test/WebJobs.Script.Tests.Integration/SamplesEndToEndTests.cs
@@ -10,8 +10,10 @@
 using System.Net.Http.Headers;
 using System.Reflection;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Web.Http;
+using System.Web.Http.Hosting;
 using System.Xml.Linq;
 using Microsoft.Azure.WebJobs.Host;
 using Microsoft.Azure.WebJobs.Script.Config;
@@ -20,13 +22,15 @@
 using Microsoft.Azure.WebJobs.Script.WebHost.Models;
 using Microsoft.ServiceBus;
 using Microsoft.ServiceBus.Messaging;
+using Microsoft.WebJobs.Script.Tests;
 using Microsoft.WindowsAzure.Storage;
 using Microsoft.WindowsAzure.Storage.Blob;
 using Microsoft.WindowsAzure.Storage.Queue;
 using Microsoft.WindowsAzure.Storage.Table;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Xunit;
+using static Microsoft.Azure.WebJobs.Script.Tests.FunctionGeneratorTests;
 
 namespace Microsoft.Azure.WebJobs.Script.Tests
 {
diff --git a/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj b/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj
@@ -157,7 +157,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.WebSites.DataProtection, Version=0.1.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebSites.DataProtection.0.1.6-alpha45\lib\net46\Microsoft.Azure.WebSites.DataProtection.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebSites.DataProtection.0.1.6-alpha51\lib\net46\Microsoft.Azure.WebSites.DataProtection.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Bot.Connector.DirectLine, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/test/WebJobs.Script.Tests.Integration/packages.config b/test/WebJobs.Script.Tests.Integration/packages.config
@@ -33,7 +33,7 @@
   <package id="Microsoft.Azure.WebJobs.Logging" version="2.0.0-beta2-10515" targetFramework="net46" />
   <package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta2-10726" targetFramework="net46" />
   <package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0-beta2-10515" targetFramework="net46" />
-  <package id="Microsoft.Azure.WebSites.DataProtection" version="0.1.6-alpha45" targetFramework="net46" />
+  <package id="Microsoft.Azure.WebSites.DataProtection" version="0.1.6-alpha51" targetFramework="net46" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net46" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net46" />
   <package id="Microsoft.Bot.Connector.DirectLine" version="3.0.0-beta" targetFramework="net46" />
diff --git a/test/WebJobs.Script.Tests.Shared/SingleThreadedSynchronizationContext.cs b/test/WebJobs.Script.Tests.Shared/SingleThreadedSynchronizationContext.cs
@@ -0,0 +1,51 @@
+﻿// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading;
+
+namespace Microsoft.WebJobs.Script.Tests
+{
+    internal sealed class SingleThreadSynchronizationContext : SynchronizationContext
+    {
+        private readonly ConcurrentQueue<Tuple<SendOrPostCallback, object>> _workItems =
+            new ConcurrentQueue<Tuple<SendOrPostCallback, object>>();
+        private readonly bool _runOnEmptyQueue;
+        private bool _stopped;
+
+        public SingleThreadSynchronizationContext(bool runOnEmptyQueue = false)
+        {
+            _runOnEmptyQueue = runOnEmptyQueue;
+        }
+
+        public override void Post(SendOrPostCallback d, object state)
+        {
+            _workItems.Enqueue(new Tuple<SendOrPostCallback, object>(d, state));
+        }
+
+        public override void Send(SendOrPostCallback d, object state)
+        {
+            throw new NotSupportedException();
+        }
+
+        public void Stop()
+        {
+            _stopped = true;
+        }
+
+        public void Run()
+        {
+            Tuple<SendOrPostCallback, object> item;
+            while (!_stopped && (_workItems.TryDequeue(out item) || _runOnEmptyQueue))
+            {
+                if (item != null)
+                {
+                    item.Item1(item.Item2);
+                }
+            }
+        }
+    }
+}
diff --git a/test/WebJobs.Script.Tests.Shared/WebJobs.Script.Tests.Shared.projitems b/test/WebJobs.Script.Tests.Shared/WebJobs.Script.Tests.Shared.projitems
@@ -9,6 +9,7 @@
     <Import_RootNamespace>Microsoft.WebJobs.Script.Tests</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)SingleThreadedSynchronizationContext.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)TempDirectory.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)TestHelpers.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)TestInvoker.cs" />
diff --git a/test/WebJobs.Script.Tests/Filters/AuthorizationLevelAttributeTests.cs b/test/WebJobs.Script.Tests/Filters/AuthorizationLevelAttributeTests.cs
@@ -12,6 +12,7 @@
 using System.Web.Http.Dependencies;
 using Microsoft.Azure.WebJobs.Script.WebHost;
 using Microsoft.Azure.WebJobs.Script.WebHost.Filters;
+using Microsoft.WebJobs.Script.Tests;
 using Moq;
 using Xunit;
 
@@ -155,6 +156,102 @@ public async Task GetAuthorizationLevel_ValidKeyHeader_FunctionKey_ReturnsFuncti
             Assert.Equal(AuthorizationLevel.Function, level);
         }
 
+        [Fact]
+        public void GetAuthorizationLevelAsync_CalledWithSingleThreadedContext_ResolvingSecrets_DoesNotDeadlock()
+        {
+            // Test resolving secrets
+            var secretManager = CreateSecretManager(
+                async () =>
+                {
+                    await Task.Delay(500);
+                    return new HostSecretsInfo();
+                },
+                async () =>
+                {
+                    await Task.Delay(500);
+                    return new Dictionary<string, string> { { "default", TestFunctionKeyValue1 } };
+                });
+
+            bool methodReturned = GetAuthorizationLevelAsync_CalledWithSingleThreadedContext_DoesNotDeadlock(secretManager);
+
+            Assert.True(methodReturned, $"{nameof(AuthorizationLevelAttribute.GetAuthorizationLevelAsync)} resolving secrets did not return.");
+        }
+
+        [Fact]
+        public void GetAuthorizationLevelAsync_CalledWithSingleThreadedContext_AndCachedHostSecrets_DoesNotDeadlock()
+        {
+            var secretManager = CreateSecretManager(() => Task.FromResult(new HostSecretsInfo()), async () =>
+            {
+                await Task.Delay(500);
+                return new Dictionary<string, string> { { "default", TestFunctionKeyValue1 } };
+            });
+
+            var methodReturned = GetAuthorizationLevelAsync_CalledWithSingleThreadedContext_DoesNotDeadlock(secretManager);
+
+            Assert.True(methodReturned, $"{nameof(AuthorizationLevelAttribute.GetAuthorizationLevelAsync)} with cached host secrets did not return.");
+        }
+
+        [Fact]
+        public void GetAuthorizationLevelAsync_CalledWithSingleThreadedContext_AndCachedSecrets_DoesNotDeadlock()
+        {
+            var secretManager = CreateSecretManager(() => Task.FromResult(new HostSecretsInfo()), () => Task.FromResult(new Dictionary<string, string> { { "default", TestFunctionKeyValue1 } }));
+
+            var methodReturned = GetAuthorizationLevelAsync_CalledWithSingleThreadedContext_DoesNotDeadlock(secretManager);
+
+            Assert.True(methodReturned, $"{nameof(AuthorizationLevelAttribute.GetAuthorizationLevelAsync)} with cached secrets did not return.");
+        }
+
+        private ISecretManager CreateSecretManager(Func<Task<HostSecretsInfo>> hostSecrets, Func<Task<Dictionary<string, string>>> functionSecrets)
+        {
+            var secretManagerMock = new Mock<ISecretManager>();
+
+            secretManagerMock.Setup(m => m.GetHostSecretsAsync())
+            .Returns(() => Task.FromResult(new HostSecretsInfo()));
+
+            secretManagerMock.Setup(m => m.GetFunctionSecretsAsync(It.IsAny<string>(), false))
+            .Returns(async () =>
+            {
+                await Task.Delay(500);
+                return new Dictionary<string, string> { { "default", TestFunctionKeyValue1 } };
+            });
+
+            return secretManagerMock.Object;
+        }
+
+        private bool GetAuthorizationLevelAsync_CalledWithSingleThreadedContext_DoesNotDeadlock(ISecretManager secretManager)
+        {
+            var resetEvent = new ManualResetEvent(false);
+
+            var thread = new Thread(() =>
+            {
+                HttpRequestMessage request = new HttpRequestMessage();
+                request = new HttpRequestMessage();
+                request.Headers.Add(AuthorizationLevelAttribute.FunctionsKeyHeaderName, TestFunctionKeyValue1);
+
+                var context = new SingleThreadSynchronizationContext(true);
+                SynchronizationContext.SetSynchronizationContext(context);
+
+                AuthorizationLevelAttribute.GetAuthorizationLevelAsync(request, secretManager, functionName: "TestFunction")
+                .ContinueWith(t =>
+                {
+                    context.Stop();
+
+                    resetEvent.Set();
+                });
+
+                context.Run();
+            });
+
+            thread.IsBackground = true;
+            thread.Start();
+
+            bool eventSignaled = resetEvent.WaitOne(TimeSpan.FromSeconds(5));
+
+            thread.Abort();
+
+            return eventSignaled;
+        }
+
         [Fact]
         public async Task GetAuthorizationLevel_InvalidKeyHeader_ReturnsAnonymous()
         {
diff --git a/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj b/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj
@@ -157,7 +157,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.WebSites.DataProtection, Version=0.1.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebSites.DataProtection.0.1.6-alpha45\lib\net46\Microsoft.Azure.WebSites.DataProtection.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebSites.DataProtection.0.1.6-alpha51\lib\net46\Microsoft.Azure.WebSites.DataProtection.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Bot.Connector.DirectLine, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/test/WebJobs.Script.Tests/app.config b/test/WebJobs.Script.Tests/app.config
@@ -96,7 +96,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
diff --git a/test/WebJobs.Script.Tests/packages.config b/test/WebJobs.Script.Tests/packages.config
@@ -33,7 +33,7 @@
   <package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.0-beta2-10399" targetFramework="net46" />
   <package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta2-10726" targetFramework="net46" />
   <package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0-beta2-10515" targetFramework="net46" />
-  <package id="Microsoft.Azure.WebSites.DataProtection" version="0.1.6-alpha45" targetFramework="net46" />
+  <package id="Microsoft.Azure.WebSites.DataProtection" version="0.1.6-alpha51" targetFramework="net46" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net46" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net46" />
   <package id="Microsoft.Bot.Connector.DirectLine" version="3.0.0-beta" targetFramework="net46" />

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ internal static async Task<AuthorizationLevel> GetAuthorizationLevelAsync(HttpRe`
`88`	`88`	`// if there is a function specific key specified try to match against that`
`89`	`89`	`if (functionName != null)`
`90`	`90`	`{`
`91`		`- IDictionary<string, string> functionSecrets = secretManager.GetFunctionSecretsAsync(functionName).GetAwaiter().GetResult();`
	`91`	`+ IDictionary<string, string> functionSecrets = await secretManager.GetFunctionSecretsAsync(functionName);`
`92`	`92`	`if (functionSecrets != null &&`
`93`	`93`	`functionSecrets.Values.Any(s => Key.SecretValueEquals(keyValue, s)))`
`94`	`94`	`{`