Merge pull request #21 from latticework/kenbrubaker/HandleDeepPaths

clavecoder · clavecoder · commit 17eea323c330 · 2015-11-20T17:52:47.000-06:00
Added support for services running in a deep path.
diff --git a/Jali.Pcl/samples/HelloJali.Web/App_Start/WebApiConfig.cs b/Jali.Pcl/samples/HelloJali.Web/App_Start/WebApiConfig.cs
@@ -1,7 +1,11 @@
-﻿using System.Linq;
+﻿using System;
+using System.Linq;
+using System.Security.Policy;
 using System.Security.Principal;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Web;
+using System.Web.Hosting;
 using System.Web.Http;
 using Jali;
 using Jali.Core;
@@ -18,18 +22,12 @@ public static void Register(HttpConfiguration config)
             // Web API configuration and services
 
             // Web API routes
+            var context = new AspNetExecutionContext();
 
-            var claims = WindowsIdentity.GetCurrent()?.Claims.Select(c => new Jali.Secure.Claim(c.Type, c.Value));
+            var absolutePath = VirtualPathUtility.ToAbsolute("~");
+            var baseUri = new Uri(absolutePath, UriKind.Relative);
 
-            if (claims == null)
-            {
-                throw new InternalErrorException("The AppPool identity is not assigned. Cannot create Jali Service");
-            }
-
-            var identity = new SecurityIdentity(claims);
-            var context = new DefaultExecutionContext(identity);
-
-            config.UseJaliService(context, async ctx => await Task.FromResult(new HelloService(ctx)),  null);
+            config.UseJaliService(context, async ctx => await Task.FromResult(new HelloService(ctx, baseUri)),  null);
 
             config.MapHttpAttributeRoutes();
 
diff --git a/Jali.Pcl/src/Jali.Serve.Pcl/Jali.Serve.Pcl.csproj b/Jali.Pcl/src/Jali.Serve.Pcl/Jali.Serve.Pcl.csproj
@@ -288,6 +288,7 @@
       <Link>TenantIdentity.cs</Link>
     </Compile>
     <Compile Include="Definition\RestMethodVerbs.cs" />
+    <Compile Include="JaliUriExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Jali.Pcl/src/Jali.Serve.Pcl/JaliUriExtensions.cs b/Jali.Pcl/src/Jali.Serve.Pcl/JaliUriExtensions.cs
@@ -0,0 +1,94 @@
+﻿using System.Text.RegularExpressions;
+using Jali.Core;
+using Jali.Note;
+using Jali.Serve;
+
+// ReSharper disable once CheckNamespace
+namespace System
+{
+    /// <summary>
+    ///     Provides Jali-specific extensions to the <see cref="Uri"/> class.
+    /// </summary>
+    public static class JaliUriExtensions
+    {
+        /// <summary>
+        ///     Parses the request for Jali Message information
+        /// </summary>
+        /// <param name="uri">
+        ///     The request URL.
+        /// </param>
+        /// <param name="rootUrl">
+        ///     A relative URL that represents the service root.
+        /// </param>
+        /// <returns>
+        ///     The parse result.
+        /// </returns>
+        public static HttpRequestParseResult JaliParse(this Uri uri, string rootUrl = null)
+        {
+            if (uri == null) throw new ArgumentNullException(nameof(uri));
+
+            rootUrl = rootUrl ?? string.Empty;
+
+            if (rootUrl.Length > 0 && rootUrl[0] == '/')
+            {
+                rootUrl = rootUrl.Substring(1);
+            }
+
+            var messages = new NotificationMessageCollection();
+
+            var path = uri.GetComponents(UriComponents.Path, UriFormat.Unescaped);
+
+            if (!path.StartsWith(rootUrl, StringComparison.OrdinalIgnoreCase))
+            {
+                // TODO: JaliHttpRequestMessageExtensions.Parse: Change to Domain error.
+                var message =
+                    $"Route '{uri}' is not rooted with the Jali Server url, which is '{rootUrl}'. The request should not have been forwarded to it.";
+                messages.Append(new InternalErrorException(message).Messages);
+                return new HttpRequestParseResult(messages);
+            }
+            else
+            {
+                path = path.Substring(rootUrl.Length);
+
+                if (path.Length > 0 && path[0] == '/')
+                {
+                    path = path.Substring(1);
+                }
+            }
+
+            var resourceMatch = Regex.Match(
+                path,
+                @"^resources/(?<resourceName>[_a-zA-Z][_a-zA-Z0-9]*)(/(?<resourceKey>[_a-zA-Z0-9]+))?(/routines/(?<routineName>[_a-zA-Z][_a-zA-Z0-9]*)(?<messageAction>)[_a-zA-Z][_a-zA-Z0-9]*)?$");
+
+            if (!resourceMatch.Success)
+            {
+                // TODO: JaliHttpRequestMessageExtensions.Parse: Change to Domain error.
+                var message =
+                    $"Jali Server cannot handle route '{uri}'. The request should not have been forwarded to it.";
+                messages.Append(new InternalErrorException(message).Messages);
+                return new HttpRequestParseResult(messages);
+            }
+
+            var resourceName = GetCaptureValue(resourceMatch, "resourceName");
+            var resourceKey = GetCaptureValue(resourceMatch, "resourceKey");
+            var routineName = GetCaptureValue(resourceMatch, "routineName");
+            var messageAction = GetCaptureValue(resourceMatch, "messageAction");
+
+            return new HttpRequestParseResult(
+                method: null,
+                resourceName: resourceName,
+                payload: null,
+                resourceKey: resourceKey,
+                routineName: routineName,
+                messageAction: messageAction,
+                messages: messages);
+        }
+
+        private static string GetCaptureValue(Match match, string name)
+        {
+            var value = match.Groups[name].Value;
+
+            return (value == string.Empty) ? null : value;
+        }
+    }
+}
diff --git a/psakefile.ps1 b/psakefile.ps1
@@ -3,7 +3,7 @@ properties {
   $zipFileName = "Jali00r1.zip"
   $majorVersion = "0.0"
   $majorWithReleaseVersion = "0.0.1"
-  $nugetPrelease = "prealpha603"
+  $nugetPrelease = "prealpha609"
   $version = GetVersion $majorWithReleaseVersion
   $signAssemblies = $false
 #  $signKeyPath = "C:\Development\Releases\newtonsoft.snk"
diff --git a/samples/Jali.Serve.Samples.HelloServices/GreetingData/GetGreetingDataRoutine.cs b/samples/Jali.Serve.Samples.HelloServices/GreetingData/GetGreetingDataRoutine.cs
@@ -43,7 +43,7 @@ protected override async Task ExecuteProcedureCore(
 
         public static Routine GetDefinition(Uri resourceUrl)
         {
-            var url = new Uri(resourceUrl, $"routines/{Name}");
+            var url = resourceUrl.Combine($"routines/{Name}");
             return new Routine
             {
                 Name = Name,
diff --git a/samples/Jali.Serve.Samples.HelloServices/GreetingData/GreetingDataResource.cs b/samples/Jali.Serve.Samples.HelloServices/GreetingData/GreetingDataResource.cs
@@ -19,7 +19,7 @@ public GreetingDataResource(ServiceBase service, Resource definition, IResourceC
 
         public static Resource GetDefinition(Uri helloServiceUrl)
         {
-            var url = new Uri(helloServiceUrl, "resources/greetingdata/v1.0.0");
+            var url = helloServiceUrl.Combine("resources/greetingdata/v1.0.0");
             var schema = GetSchema();
             var keySchema = GetKeySchema();
 
diff --git a/samples/Jali.Serve.Samples.HelloServices/GreetingData/NewGreetingDataRoutine.cs b/samples/Jali.Serve.Samples.HelloServices/GreetingData/NewGreetingDataRoutine.cs
@@ -33,7 +33,7 @@ protected override async Task ExecuteProcedureCore(
 
         public static Routine GetDefinition(Uri resourceUrl)
         {
-            var url = new Uri(resourceUrl, $"routines/{Name}");
+            var url = resourceUrl.Combine($"routines/{Name}");
             return new Routine
             {
                 Name = Name,
diff --git a/samples/Jali.Serve.Samples.HelloServices/GreetingData/RemoveGreetingDataRoutine.cs b/samples/Jali.Serve.Samples.HelloServices/GreetingData/RemoveGreetingDataRoutine.cs
@@ -47,7 +47,7 @@ protected override async Task ExecuteProcedureCore(
 
         public static Routine GetDefinition(Uri resourceUrl)
         {
-            var url = new Uri(resourceUrl, $"routines/{Name}");
+            var url = resourceUrl.Combine($"routines/{Name}");
             return new Routine
             {
                 Name = Name,
diff --git a/samples/Jali.Serve.Samples.HelloServices/GreetingData/SetGreetingDataRoutine.cs b/samples/Jali.Serve.Samples.HelloServices/GreetingData/SetGreetingDataRoutine.cs
@@ -96,7 +96,7 @@ protected override async Task ExecuteProcedureCore(
 
         public static Routine GetDefinition(Uri resourceUrl)
         {
-            var url = new Uri(resourceUrl, $"routines/{Name}");
+            var url = resourceUrl.Combine($"routines/{Name}");
             return new Routine
             {
                 Name = Name,
diff --git a/samples/Jali.Serve.Samples.HelloServices/Hello/HelloResource.cs b/samples/Jali.Serve.Samples.HelloServices/Hello/HelloResource.cs
@@ -19,7 +19,7 @@ public HelloResource(ServiceBase service, Resource definition, IResourceContext
 
         public static Resource GetDefinition(Uri helloServiceUrl)
         {
-            var helloResourceUrl = new Uri(helloServiceUrl, "resources/hello/v1.0.0");
+            var helloResourceUrl = helloServiceUrl.Combine("resources/hello/v1.0.0");
 
             var resourceSchema = JSchema.Parse(@"{
   ""$schema"": ""http://json-schema.org/draft-04/schema#"",
@@ -52,7 +52,7 @@ public static Resource GetDefinition(Uri helloServiceUrl)
                     ["get-hello"] = new Routine
                     {
                         Name = "get-hello",
-                        Url = new Uri(helloResourceUrl, "routines/get-hello"),
+                        Url = helloResourceUrl.Combine("routines/get-hello"),
                         Description = "Retrieves the hello message.",
                         Messages =
                         {
diff --git a/samples/Jali.Serve.Samples.HelloServices/HelloService.cs b/samples/Jali.Serve.Samples.HelloServices/HelloService.cs
@@ -10,20 +10,19 @@ namespace Jali.Serve.Samples.HelloServices
 
     public class HelloService : ServiceBase
     {
-        public HelloService(IServiceContext serviceContext) : base(HelloService.GetDefinition(), serviceContext)
+        public HelloService(IServiceContext serviceContext, Uri url) : base(HelloService.GetDefinition(url), serviceContext)
         {
         }
 
-        public static Service GetDefinition()
+        public static Service GetDefinition(Uri serviceUrl)
         {
-            var helloServiceUrl = new Uri("http://jali.io/serve/v0.0.1/samples/hello");
-            var helloResource = HelloResource.GetDefinition(helloServiceUrl);
-            var greetingDataResource = GreetingDataResource.GetDefinition(helloServiceUrl);
+            var helloResource = HelloResource.GetDefinition(serviceUrl);
+            var greetingDataResource = GreetingDataResource.GetDefinition(serviceUrl);
 
             var helloService = new Service
             {
                 Name = "hello",
-                Url = helloServiceUrl,
+                Url = serviceUrl,
                 Version = "1.0.0",
                 Description = "Hello Jali service.",
                 Resources =
diff --git a/src/Jali.Serve.AspNet.Mvc.Net45/JaliHttpMessageHandler.cs b/src/Jali.Serve.AspNet.Mvc.Net45/JaliHttpMessageHandler.cs
@@ -17,6 +17,8 @@ public JaliHttpMessageHandler(
 
             // TODO: JaliHttpMessageHandler.ctor: this should be handled lazily on first request.
             this.Server.Initialize(context).Wait();
+            this.Service = this.Server.Service;
+
             this.Server.Run(context, CancellationToken.None).Wait();
         }
 
diff --git a/src/Jali.Serve.AspNet.Mvc.Net45/JaliHttpRoute.cs b/src/Jali.Serve.AspNet.Mvc.Net45/JaliHttpRoute.cs
@@ -1,9 +1,11 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Net.Http;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Web.Http.Routing;
+using Jali.Core;
+using Jali.Note;
 using Jali.Serve.Server;
 
 namespace Jali.Serve.AspNet.Mvc
@@ -18,36 +20,36 @@ public JaliHttpRoute(
 
         public IHttpRouteData GetRouteData(string virtualPathRoot, HttpRequestMessage request)
         {
+            var baseUrl = ((JaliHttpMessageHandler) this.Handler).Service.Definition.Url;
+
+            var rootUrl = (baseUrl.IsAbsoluteUri)
+                ? baseUrl.GetComponents(UriComponents.Path, UriFormat.Unescaped)
+                : baseUrl.ToString();
+
             var uri = request.RequestUri;
 
+            // TODO: JaliHttpRoute.GetRoutData: Consider scheme check in JaliParse, itself.
             if (!(uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps))
             {
                 return null;
             }
 
-            var components = uri.GetComponents(UriComponents.Path, UriFormat.Unescaped);
-
-            var routeData = new HttpRouteData(this);
+            var result = uri.JaliParse(rootUrl);
 
+            // TODO: JaliHttpRoute.GetRoutData: Improve error handling.
+            //if (result.Messages.GetSeverity() == MessageSeverity.Critical)
+            //{
+            //    throw new NotificationMessageException(result.Messages);
+            //}
 
-            if (string.Equals(components, "/", StringComparison.OrdinalIgnoreCase) && request.Method.Method == "GET")
-            {
-                return routeData;
-            }
-
-            if (Regex.IsMatch(components, 
-@"^resources/(?<resourceName>[_a-zA-Z][_a-zA-Z0-9]*)(/(?<resourceKey>[_a-zA-Z0-9]+))?$"))
+            //if (result.Messages.GetSeverity() == MessageSeverity.Error)
+            if (result.Messages.HasErrors())
             {
-                return routeData;
-            }
-
-            if (Regex.IsMatch(components,
-@"^resources/(?<resourceName>[_a-zA-Z][_a-zA-Z0-9]*)(/(?<resourceKey>[_a-zA-Z0-9]+))?/routines/(?<routineName>[_a-zA-Z][_a-zA-Z0-9]*)$"))
-            {
-                return routeData;
+                // TODO: JaliHttpRoute.GetRoutData: Debug log errors.
+                return null;
             }
 
-            return null;
+            return new HttpRouteData(this);
         }
 
         public IHttpVirtualPathData GetVirtualPath(HttpRequestMessage request, IDictionary<string, object> values)
diff --git a/src/Jali.Serve.Server/JaliServer.cs b/src/Jali.Serve.Server/JaliServer.cs
@@ -37,7 +37,7 @@ public JaliServer(
 
             this.Options = new JaliServerOptions
             {
-                Authenticator = overrideOptions.Authenticator ?? new DefaultAuthenticator(GenerateRandom(256)),
+                Authenticator = overrideOptions.Authenticator ?? new DefaultAuthenticator(GenerateRandom(32)),
                 Authorizer = overrideOptions.Authorizer ?? new DefaultAuthorizor(),
                 MessageConverter = overrideOptions.MessageConverter ?? new CompositeServiceMessageConverter(),
                 KeyConverter = overrideOptions.KeyConverter ?? new DefaultResourceKeyConverter(),
@@ -120,7 +120,9 @@ public async Task<HttpResponseMessage> Send(HttpRequestMessage request, Cancella
         {
             if (request == null) throw new ArgumentNullException(nameof(request));
 
-            var parseResult = await request.JaliParse();
+            var baseUrl = this.Service.Definition.Url.ToString();
+
+            var parseResult = await request.JaliParse(baseUrl);
 
             if (!parseResult.Succeeded)
             {
diff --git a/src/Jali.Serve/JaliHttpRequestMessageExtensions.cs b/src/Jali.Serve/JaliHttpRequestMessageExtensions.cs
diff --git a/src/Jali.Serve/Secure/DefaultAuthenticator.cs b/src/Jali.Serve/Secure/DefaultAuthenticator.cs

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ protected override async Task ExecuteProcedureCore(`
`43`	`43`
`44`	`44`	`public static Routine GetDefinition(Uri resourceUrl)`
`45`	`45`	`{`
`46`		`- var url = new Uri(resourceUrl, $"routines/{Name}");`
	`46`	`+ var url = resourceUrl.Combine($"routines/{Name}");`
`47`	`47`	`return new Routine`
`48`	`48`	`{`
`49`	`49`	`Name = Name,`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public GreetingDataResource(ServiceBase service, Resource definition, IResourceC`
`19`	`19`
`20`	`20`	`public static Resource GetDefinition(Uri helloServiceUrl)`
`21`	`21`	`{`
`22`		`- var url = new Uri(helloServiceUrl, "resources/greetingdata/v1.0.0");`
	`22`	`+ var url = helloServiceUrl.Combine("resources/greetingdata/v1.0.0");`
`23`	`23`	`var schema = GetSchema();`
`24`	`24`	`var keySchema = GetKeySchema();`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected override async Task ExecuteProcedureCore(`
`33`	`33`
`34`	`34`	`public static Routine GetDefinition(Uri resourceUrl)`
`35`	`35`	`{`
`36`		`- var url = new Uri(resourceUrl, $"routines/{Name}");`
	`36`	`+ var url = resourceUrl.Combine($"routines/{Name}");`
`37`	`37`	`return new Routine`
`38`	`38`	`{`
`39`	`39`	`Name = Name,`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ protected override async Task ExecuteProcedureCore(`
`47`	`47`
`48`	`48`	`public static Routine GetDefinition(Uri resourceUrl)`
`49`	`49`	`{`
`50`		`- var url = new Uri(resourceUrl, $"routines/{Name}");`
	`50`	`+ var url = resourceUrl.Combine($"routines/{Name}");`
`51`	`51`	`return new Routine`
`52`	`52`	`{`
`53`	`53`	`Name = Name,`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ protected override async Task ExecuteProcedureCore(`
`96`	`96`
`97`	`97`	`public static Routine GetDefinition(Uri resourceUrl)`
`98`	`98`	`{`
`99`		`- var url = new Uri(resourceUrl, $"routines/{Name}");`
	`99`	`+ var url = resourceUrl.Combine($"routines/{Name}");`
`100`	`100`	`return new Routine`
`101`	`101`	`{`
`102`	`102`	`Name = Name,`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public HelloResource(ServiceBase service, Resource definition, IResourceContext`
`19`	`19`
`20`	`20`	`public static Resource GetDefinition(Uri helloServiceUrl)`
`21`	`21`	`{`
`22`		`- var helloResourceUrl = new Uri(helloServiceUrl, "resources/hello/v1.0.0");`
	`22`	`+ var helloResourceUrl = helloServiceUrl.Combine("resources/hello/v1.0.0");`
`23`	`23`
`24`	`24`	`var resourceSchema = JSchema.Parse(@"{`
`25`	`25`	`""$schema"": ""http://json-schema.org/draft-04/schema#"",`
`@@ -52,7 +52,7 @@ public static Resource GetDefinition(Uri helloServiceUrl)`
`52`	`52`	`["get-hello"] = new Routine`
`53`	`53`	`{`
`54`	`54`	`Name = "get-hello",`
`55`		`- Url = new Uri(helloResourceUrl, "routines/get-hello"),`
	`55`	`+ Url = helloResourceUrl.Combine("routines/get-hello"),`
`56`	`56`	`Description = "Retrieves the hello message.",`
`57`	`57`	`Messages =`
`58`	`58`	`{`