Merge pull request #1 from goncalo-oliveira/develop

added support for controller functions.

src/Api/Startup.cs

@@ -0,0 +1,64 @@
+using System;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Hosting;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Serialization;
+
+namespace OpenFaaS.Api
+{
+    public class Startup : IPluginStartup
+    {
+        public Startup( IConfiguration configuration )
+        {
+            Configuration = configuration;
+        }
+
+        public IConfiguration Configuration { get; }
+
+        public void ConfigureServices( IServiceCollection services )
+        {
+            var mvcBuilder = services.AddControllers( options =>
+            {
+            } );
+
+            mvcBuilder.AddNewtonsoftJson( options =>
+            {
+                options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
+                options.SerializerSettings.NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore;
+                options.SerializerSettings.Converters.Add( new StringEnumConverter( new CamelCaseNamingStrategy(), false ) );
+            });
+            // Replaced with Newtonsoft because Microsoft's serializer doesn't do polymorphic serialization
+
+            mvcBuilder.AddPluginControllers();
+        }
+
+        public void Configure( IApplicationBuilder app, IWebHostEnvironment env )
+        {
+            if ( env.IsDevelopment() )
+            {
+                app.UseDeveloperExceptionPage();
+            }
+
+            app.UseRouting();
+
+            if ( !Configuration.GetValue<bool>( "Args:SkipAuth" ) )
+            {
+                app.UseAuthentication();
+                app.UseAuthorization();
+            }
+
+            // allow api implementation to customize the pipeline
+            app.ConfigurePlugin( env );
+
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapControllers();
+            });
+        }
+    }
+}

src/HttpFunctionExtensions.cs → src/Functions/HttpFunctionExtensions.cs

@@ -3,7 +3,7 @@
 using OpenFaaS;
 using System.Linq;
 
-namespace OpenFaaS
+namespace OpenFaaS.Functions
 {
     internal static class HttpFunctionExtensions
     {

src/HttpMethodAttributeExtensions.cs → src/Functions/HttpMethodAttributeExtensions.cs

@@ -1,12 +1,13 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.AspNetCore.Routing;
+using OpenFaaS.Functions.Middleware;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace OpenFaaS
+namespace OpenFaaS.Functions
 {
     internal static class HttpMethodAttributeExtensions
     {

src/HttpRequestHandlerOptions.cs → src/Functions/HttpRequestHandlerOptions.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace OpenFaaS
+namespace OpenFaaS.Functions
 {
     internal class HttpRequestHandlerOptions
     {

src/Middleware/Authentication/AuthenticationHandler.cs → src/Functions/Middleware/Authentication/AuthenticationHandler.cs

@@ -7,7 +7,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace OpenFaaS
+namespace OpenFaaS.Functions.Middleware
 {
     internal class HttpAuthenticationHandler
     {

src/Middleware/AuthenticationMiddleware.cs → src/Functions/Middleware/AuthenticationMiddleware.cs

@@ -5,7 +5,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
-namespace OpenFaaS
+namespace OpenFaaS.Functions.Middleware
 {
     /// <summary>
     /// Deals with authentication

src/Middleware/AuthorizationMiddleware.cs → src/Functions/Middleware/AuthorizationMiddleware.cs

@@ -5,7 +5,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
-namespace OpenFaaS
+namespace OpenFaaS.Functions.Middleware
 {
     /// <summary>
     /// Deals with authorization

src/Middleware/FunctionMiddleware.cs → src/Functions/Middleware/FunctionMiddleware.cs

@@ -6,7 +6,7 @@
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Routing;
 
-namespace OpenFaaS
+namespace OpenFaaS.Functions.Middleware
 {
     /// <summary>
     /// Deals with function execution and response handling

src/Middleware/Routing/IRouteMatcher.cs → src/Functions/Middleware/Routing/IRouteMatcher.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Routing;
 
-namespace OpenFaaS
+namespace OpenFaaS.Functions.Middleware
 {
     internal interface IRouteMatcher
     {

src/Middleware/Routing/RouteMatcher.cs → src/Functions/Middleware/Routing/RouteMatcher.cs

@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace OpenFaaS
+namespace OpenFaaS.Functions.Middleware
 {
     internal class RouteMatcher : IRouteMatcher
     {

src/Middleware/RoutingMiddleware.cs → src/Functions/Middleware/RoutingMiddleware.cs

@@ -5,7 +5,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace OpenFaaS
+namespace OpenFaaS.Functions.Middleware
 {
     /// <summary>
     /// Deals with routing and routing templates

src/Functions/Startup.cs

@@ -0,0 +1,62 @@
+using System;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Newtonsoft.Json.Serialization;
+
+namespace OpenFaaS.Functions
+{
+    public class Startup : IPluginStartup
+    {
+        public Startup( IConfiguration configuration )
+        {
+            Configuration = configuration;
+        }
+
+        public IConfiguration Configuration { get; }
+
+        // This method gets called by the runtime. Use this method to add services to the container.
+        public void ConfigureServices( IServiceCollection services )
+        {
+            services.AddMvc()
+                .AddNewtonsoftJson( options =>
+                {
+                    options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
+                    options.SerializerSettings.NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore;
+                } );
+            // Replaced with Newtonsoft because Microsoft's serializer doesn't do polymorphic serialization
+
+            services.AddSingleton<ISystemClock, SystemClock>();
+
+            // add root request handler to the container
+            services.AddSingleton<Middleware.IRouteMatcher, Middleware.RouteMatcher>();
+            services.TryAddScoped<Middleware.HttpAuthenticationHandler>();
+            services.Configure<HttpRequestHandlerOptions>( options =>
+            {
+                options.SkipAuth = Configuration.GetValue<bool>( "Args:SkipAuth" );
+
+                if ( options.SkipAuth )
+                {
+                    Console.WriteLine( "Skipping authentication and authorization" );
+                }
+            } );
+        }
+
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+        public void Configure( IApplicationBuilder app, IWebHostEnvironment env )
+        {
+            app.UseDeveloperExceptionPage();
+
+            Console.WriteLine();
+            Console.WriteLine( "Running..." );
+
+            app.UseMiddleware<Middleware.RoutingMiddleware>()
+                .UseMiddleware<Middleware.AuthenticationMiddleware>()
+                .UseMiddleware<Middleware.AuthorizationMiddleware>()
+                .UseMiddleware<Middleware.FunctionMiddleware>();
+        }
+    }
+}

src/IPluginStartup.cs

@@ -0,0 +1,13 @@
+using System;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace OpenFaaS
+{
+    public interface IPluginStartup
+    {
+        void ConfigureServices( IServiceCollection services );
+        void Configure( IApplicationBuilder app, IWebHostEnvironment env );
+    }
+}

src/PluginServiceExtensions.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace OpenFaaS
+{
+    internal static class PluginServiceExtensions
+    {
+        private static readonly string typeName = "OpenFaaS.Startup";
+
+        private static object startup;
+
+        public static void AddPluginControllers( this IMvcBuilder builder )
+        {
+            builder.AddApplicationPart( AssemblyResolver.Default.Assembly );
+        }
+
+        public static IServiceCollection ConfigurePluginServices( this IServiceCollection services, IConfiguration configuration )
+        {
+            startup = AssemblyResolver.Default.Assembly.CreateInstance( typeName, false, BindingFlags.CreateInstance, null, new object[]
+            {
+                configuration
+            }, null, null );
+
+            startup.GetType().InvokeMember( "ConfigureServices", BindingFlags.InvokeMethod, null, startup, new object[]
+            { 
+                services 
+            } );
+
+            return ( services );
+        }
+
+        public static IApplicationBuilder ConfigurePlugin( this IApplicationBuilder app, IWebHostEnvironment env )
+        {
+            var type = startup.GetType();
+
+            var configureMethod = type.GetMethod( "Configure", BindingFlags.Public | BindingFlags.Instance, null, new Type[]
+            {
+                typeof( IApplicationBuilder ), typeof( bool )
+            }, null );
+
+            // the Configure( IApplicationBuilder, bool ) method is optional
+
+            configureMethod?.Invoke( startup, new object[]
+            { 
+                app, env.IsDevelopment()
+            } );
+
+            return ( app );
+        }
+    }
+}

src/Program.cs

@@ -37,8 +37,6 @@ static void Main(string[] args)
             Console.WriteLine("OpenFaaS ASPNET Function Loader");
             Console.WriteLine();
 
-            //AppDomain.CurrentDomain.AssemblyLoad += OnAssemblyLoad;
-
             parsed.WithParsed( options =>
             {
                 if ( options.Detach )
@@ -84,9 +82,8 @@ public static IHostBuilder CreateHostBuilder( string[] args, Options options ) =
                         } );
                     } );
 
-                    webBuilder.UseKestrel()
-                        .UseStartup<Startup>();
-
+                    webBuilder.UseKestrel();
+                    webBuilder.UseStartup<Startup>();
                     webBuilder.UseUrls( $"http://*:{options.Port}" );
                 } );