Http binding refactor (stage 1)

Author: mathewc

src/Packages/Packages.csproj

@@ -6,7 +6,8 @@
     <SkipCopyBuildProduct>true</SkipCopyBuildProduct>
     <ProjectGuid>{34AB8F63-18DE-4E0D-B21C-15E33B091634}</ProjectGuid>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <NuGetPackageImportStamp>d7fae0d2</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -70,7 +71,9 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
   </Target>
+  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

src/Packages/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net46" />
   <package id="StyleCop.Analyzers" version="1.1.0-beta001" targetFramework="net46" developmentDependency="true" />
 </packages>

src/WebJobs.Script.WebHost/Controllers/FunctionsController.cs

@@ -3,14 +3,14 @@
 
 using System;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Web.Http;
 using System.Web.Http.Controllers;
 using System.Web.Http.Dependencies;
+using Microsoft.Azure.WebJobs.Script.Binding;
 using Microsoft.Azure.WebJobs.Script.Description;
 using Microsoft.Azure.WebJobs.Script.WebHost.Filters;
 using Microsoft.Azure.WebJobs.Script.WebHost.WebHooks;
@@ -74,8 +74,8 @@ public static async Task<AuthorizationLevel> DetermineAuthorizationLevelAsync(Ht
 
         private async Task<HttpResponseMessage> ProcessRequestAsync(HttpRequestMessage request, FunctionDescriptor function, CancellationToken cancellationToken)
         {
-            HttpTriggerBindingMetadata httpFunctionMetadata = (HttpTriggerBindingMetadata)function.Metadata.InputBindings.FirstOrDefault(p => string.Compare("HttpTrigger", p.Type, StringComparison.OrdinalIgnoreCase) == 0);
-            bool isWebHook = !string.IsNullOrEmpty(httpFunctionMetadata.WebHookType);
+            var httpTrigger = function.GetTriggerAttributeOrNull<HttpTriggerAttribute>();
+            bool isWebHook = !string.IsNullOrEmpty(httpTrigger.WebHookType);
             var authorizationLevel = request.GetAuthorizationLevel();
             HttpResponseMessage response = null;
 
@@ -105,7 +105,7 @@ private async Task<HttpResponseMessage> ProcessRequestAsync(HttpRequestMessage r
             else
             {
                 // Authorize
-                if (authorizationLevel < httpFunctionMetadata.AuthLevel)
+                if (authorizationLevel < httpTrigger.AuthLevel)
                 {
                     return new HttpResponseMessage(HttpStatusCode.Unauthorized);
                 }

src/WebJobs.Script.WebHost/WebHooks/WebHookReceiverManager.cs

@@ -15,6 +15,7 @@
 using Microsoft.AspNet.WebHooks;
 using Microsoft.AspNet.WebHooks.Config;
 using Microsoft.Azure.WebJobs.Host;
+using Microsoft.Azure.WebJobs.Script.Binding;
 using Microsoft.Azure.WebJobs.Script.Description;
 using Microsoft.Azure.WebJobs.Script.WebHost.Filters;
 
@@ -57,8 +58,8 @@ public async Task<HttpResponseMessage> HandleRequestAsync(FunctionDescriptor fun
         {
             // First check if there is a registered WebHook Receiver for this request, and if
             // so use it
-            HttpTriggerBindingMetadata httpFunctionMetadata = (HttpTriggerBindingMetadata)function.Metadata.InputBindings.FirstOrDefault(p => string.Compare("HttpTrigger", p.Type, StringComparison.OrdinalIgnoreCase) == 0);
-            string webHookReceiver = httpFunctionMetadata.WebHookType;
+            var httpTrigger = function.GetTriggerAttributeOrNull<HttpTriggerAttribute>();
+            string webHookReceiver = httpTrigger.WebHookType;
             IWebHookReceiver receiver = null;
             if (string.IsNullOrEmpty(webHookReceiver) || !_receiverLookup.TryGetValue(webHookReceiver, out receiver))
             {

src/WebJobs.Script.WebHost/WebScriptHostManager.cs

@@ -306,8 +306,8 @@ private static Dictionary<string, object> GetFunctionArguments(FunctionDescripto
 
             if (triggerParameter.Type != typeof(HttpRequestMessage))
             {
-                HttpTriggerBindingMetadata httpFunctionMetadata = (HttpTriggerBindingMetadata)function.Metadata.InputBindings.FirstOrDefault(p => string.Compare("HttpTrigger", p.Type, StringComparison.OrdinalIgnoreCase) == 0);
-                if (!string.IsNullOrEmpty(httpFunctionMetadata.WebHookType))
+                var httpTrigger = function.GetTriggerAttributeOrNull<HttpTriggerAttribute>();
+                if (httpTrigger != null && !string.IsNullOrEmpty(httpTrigger.WebHookType))
                 {
                     WebHookHandlerContext webHookContext;
                     if (request.Properties.TryGetValue(ScriptConstants.AzureFunctionsWebHookContextKey, out webHookContext))
@@ -423,13 +423,7 @@ protected override void OnInitializeConfig(ScriptHostConfiguration config)
 
         protected override void OnHostCreated()
         {
-            // whenever the host is created (or recreated) we build a cache map of
-            // all http function routes
-            InitializeHttpFunctions(Instance.Functions);
-
-            // since the request manager is created based on configurable
-            // settings, it has to be recreated when host config changes
-            _httpRequestManager = new WebScriptHostRequestManager(Instance.ScriptConfig.HttpConfiguration, PerformanceManager, _metricsLogger, _config.TraceWriter);
+            InitializeHttp();
 
             base.OnHostCreated();
         }
@@ -442,22 +436,42 @@ protected override void OnHostStarted()
             base.OnHostStarted();
         }
 
-        internal void InitializeHttpFunctions(IEnumerable<FunctionDescriptor> functions)
+        private void InitializeHttp()
+        {
+            // get the registered http configuration from the extension registry
+            var extensions = Instance.ScriptConfig.HostConfig.GetService<IExtensionRegistry>();
+            var httpConfig = extensions.GetExtensions<IExtensionConfigProvider>().OfType<Microsoft.Azure.WebJobs.Script.Binding.Http.HttpConfiguration>().Single();
+
+            // whenever the host is created (or recreated) we build a cache map of
+            // all http function routes
+            InitializeHttpFunctions(Instance.Functions, httpConfig);
+
+            // since the request manager is created based on configurable
+            // settings, it has to be recreated when host config changes
+            _httpRequestManager = new WebScriptHostRequestManager(httpConfig, PerformanceManager, _metricsLogger, _config.TraceWriter);
+        }
+
+        private void InitializeHttpFunctions(IEnumerable<FunctionDescriptor> functions, Microsoft.Azure.WebJobs.Script.Binding.Http.HttpConfiguration httpConfig)
         {
             // we must initialize the route factory here AFTER full configuration
             // has been resolved so we apply any route prefix customizations
-            var httpRouteFactory = new HttpRouteFactory(_config.HttpConfiguration.RoutePrefix);
+            var httpRouteFactory = new HttpRouteFactory(httpConfig.RoutePrefix);
 
             _httpFunctions = new Dictionary<IHttpRoute, FunctionDescriptor>();
             _httpRoutes = new HttpRouteCollection();
 
             foreach (var function in functions)
             {
-                var httpTriggerBinding = function.Metadata.InputBindings.OfType<HttpTriggerBindingMetadata>().SingleOrDefault();
-                if (httpTriggerBinding != null)
+                var httpTrigger = function.GetTriggerAttributeOrNull<HttpTriggerAttribute>();
+                if (httpTrigger != null)
                 {
                     IHttpRoute httpRoute = null;
-                    if (httpRouteFactory.TryAddRoute(function.Metadata.Name, httpTriggerBinding.Route, httpTriggerBinding.Methods, _httpRoutes, out httpRoute))
+                    IEnumerable<HttpMethod> httpMethods = null;
+                    if (httpTrigger.Methods != null)
+                    {
+                        httpMethods = httpTrigger.Methods.Select(p => new HttpMethod(p)).ToArray();
+                    }
+                    if (httpRouteFactory.TryAddRoute(function.Metadata.Name, httpTrigger.Route, httpMethods, _httpRoutes, out httpRoute))
                     {
                         _httpFunctions.Add(httpRoute, function);
                     }

src/WebJobs.Script/Binding/ExtensionBinding.cs

@@ -22,18 +22,19 @@ namespace Microsoft.Azure.WebJobs.Script.Binding
     public class ExtensionBinding : FunctionBinding, IResultProcessingBinding
     {
         private ScriptBinding _binding;
-        private Collection<Attribute> _attributes;
 
         public ExtensionBinding(ScriptHostConfiguration config, ScriptBinding binding, BindingMetadata metadata) : base(config, metadata, binding.Context.Access)
         {
             _binding = binding;
-            _attributes = _binding.GetAttributes();
+            Attributes = _binding.GetAttributes();
         }
 
+        internal Collection<Attribute> Attributes { get; private set; }
+
         public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType)
         {
             Collection<CustomAttributeBuilder> attributeBuilders = new Collection<CustomAttributeBuilder>();
-            foreach (var attribute in _attributes)
+            foreach (var attribute in Attributes)
             {
                 CustomAttributeBuilder builder = GetAttributeBuilder(attribute);
                 attributeBuilders.Add(builder);
@@ -44,7 +45,7 @@ public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type para
 
         public override async Task BindAsync(BindingContext context)
         {
-            context.Attributes = _attributes.ToArray();
+            context.Attributes = Attributes.ToArray();
 
             if (_binding.DefaultType == typeof(IAsyncCollector<byte[]>))
             {

src/WebJobs.Script/Binding/Http/HttpConfiguration.cs

@@ -2,10 +2,11 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System.Threading.Tasks.Dataflow;
+using Microsoft.Azure.WebJobs.Host.Config;
 
 namespace Microsoft.Azure.WebJobs.Script.Binding.Http
 {
-    public class HttpConfiguration
+    public class HttpConfiguration : IExtensionConfigProvider
     {
         public HttpConfiguration()
         {
@@ -40,5 +41,10 @@ public HttpConfiguration()
         /// checks should be enabled.
         /// </summary>
         public bool DynamicThrottlesEnabled { get; set; }
+
+        public void Initialize(ExtensionConfigContext context)
+        {
+            context.Config.RegisterBindingExtension(new HttpTriggerAttributeBindingProvider());
+        }
     }
 }

src/WebJobs.Script/Binding/Http/HttpJobHostConfigurationExtensions.cs

@@ -0,0 +1,34 @@
+// 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 Microsoft.Azure.WebJobs.Script.Binding.Http;
+
+namespace Microsoft.Azure.WebJobs
+{
+    /// <summary>
+    /// Extension methods for Http integration
+    /// </summary>
+    public static class HttpJobHostConfigurationExtensions
+    {
+        /// <summary>
+        /// Enables use of Http extensions
+        /// </summary>
+        /// <param name="config">The <see cref="JobHostConfiguration"/> to configure.</param>
+        /// <param name="httpConfig">The <see cref="HttpConfiguration"/> to use.</param>
+        public static void UseHttp(this JobHostConfiguration config, HttpConfiguration httpConfig = null)
+        {
+            if (config == null)
+            {
+                throw new ArgumentNullException("config");
+            }
+
+            if (httpConfig == null)
+            {
+                httpConfig = new HttpConfiguration();
+            }
+
+            config.RegisterExtensionConfigProvider(httpConfig);
+        }
+    }
+}

src/WebJobs.Script/Binding/Http/HttpTriggerAttribute.cs

@@ -2,16 +2,46 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.Azure.WebJobs.Description;
 
 namespace Microsoft.Azure.WebJobs.Script.Binding
 {
+    [Binding]
     [AttributeUsage(AttributeTargets.Parameter)]
     public sealed class HttpTriggerAttribute : Attribute
     {
         public HttpTriggerAttribute()
         {
+            AuthLevel = AuthorizationLevel.Function;
         }
 
-        public string RouteTemplate { get; set; }
+        public HttpTriggerAttribute(AuthorizationLevel authLevel, params string[] methods)
+        {
+            AuthLevel = authLevel;
+            Methods = methods;
+        }
+
+        /// <summary>
+        /// Gets or sets the route template for the function. Can include
+        /// route parameters using WebApi supported syntax. If not specified,
+        /// will default to the function name.
+        /// See: https://www.asp.net/web-api/overview/web-api-routing-and-actions/attribute-routing-in-web-api-2#constraints
+        /// </summary>
+        public string Route { get; set; }
+
+        /// <summary>
+        /// Gets the http methods that are supported for the function.
+        /// </summary>
+        public string[] Methods { get; private set; }
+
+        /// <summary>
+        /// Gets the authorization level for the function.
+        /// </summary>
+        public AuthorizationLevel AuthLevel { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the WebHook type, if this function represents a WebHook.
+        /// </summary>
+        public string WebHookType { get; set; }
     }
 }

src/WebJobs.Script/Binding/Http/HttpTriggerAttributeBindingProvider.cs

@@ -80,9 +80,9 @@ public HttpTriggerBinding(HttpTriggerAttribute attribute, ParameterInfo paramete
                 }
 
                 // add any route parameters to the contract
-                if (!string.IsNullOrEmpty(attribute.RouteTemplate))
+                if (!string.IsNullOrEmpty(attribute.Route))
                 {
-                    var routeParameters = _httpRouteFactory.GetRouteParameters(attribute.RouteTemplate);
+                    var routeParameters = _httpRouteFactory.GetRouteParameters(attribute.Route);
                     var parameters = ((MethodInfo)parameter.Member).GetParameters().ToDictionary(p => p.Name, p => p.ParameterType, StringComparer.OrdinalIgnoreCase);
                     foreach (string parameterName in routeParameters)
                     {