Improved template normalization for CORS.

vmelamed · Apr 7, 2016 · 9de1bf9 · 9de1bf9
1 parent d547e2e
commit 9de1bf9
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 33 deletions.
diff --git a/Aspects/Linq/Expressions/Serialization/NuGet/ExpressionSerialization.nuspec b/Aspects/Linq/Expressions/Serialization/NuGet/ExpressionSerialization.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>AspectExpressionSerialization</id>
-        <version>1.0.37</version>
+        <version>1.0.39</version>
         <authors>Val Melamed</authors>
         <owners>Val Melamed</owners>
         <summary>

diff --git a/Aspects/Linq/Expressions/Serialization/Properties/AssemblyInfo.cs b/Aspects/Linq/Expressions/Serialization/Properties/AssemblyInfo.cs
@@ -4,9 +4,9 @@
 [assembly: AssemblyTitle("vm.Aspects.Linq.Expressions.Serialization")]
 [assembly: AssemblyDescription("Serializes and deserializes LINQ expression trees to and from XML documents.")]
 
-[assembly: AssemblyVersion("1.0.37")]
-[assembly: AssemblyFileVersion("1.0.37")]
-[assembly: AssemblyInformationalVersion("1.0.37")]
+[assembly: AssemblyVersion("1.0.39")]
+[assembly: AssemblyFileVersion("1.0.39")]
+[assembly: AssemblyInformationalVersion("1.0.39")]
 
 [assembly: InternalsVisibleTo(
     "vm.Aspects.Linq.Expressions.Serialization.Test, " +

diff --git a/Aspects/Model/Properties/AssemblyInfo.cs b/Aspects/Model/Properties/AssemblyInfo.cs
@@ -3,9 +3,9 @@
 [assembly: AssemblyTitle("vm.Aspect.Model")]
 [assembly: AssemblyDescription("Defines the IRepository and related base classes and utilities - a framework of building domain object model.")]
 
-[assembly: AssemblyVersion("1.0.37")]
-[assembly: AssemblyFileVersion("1.0.37")]
-[assembly: AssemblyInformationalVersion("1.0.37")]
+[assembly: AssemblyVersion("1.0.39")]
+[assembly: AssemblyFileVersion("1.0.39")]
+[assembly: AssemblyInformationalVersion("1.0.39")]
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo(
     "vm.Aspects.Model.Tests, " +

diff --git a/Aspects/NuGet/vm.Aspects.nuspec b/Aspects/NuGet/vm.Aspects.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>vm.Aspects</id>
-        <version>1.0.37-beta</version>
+        <version>1.0.39-beta</version>
         <authors>Val Melamed</authors>
         <owners>Val Melamed</owners>
         <summary>
@@ -12,8 +12,17 @@
             A set of classes, utilities, etc. addressing various common cross-cutting concerns or extending existing similar libraries like Enterprise Library, Unity, etc.            
         </description>
         <releaseNotes>
-            * Grouped all behaviors in the vm.Aspects.Wcf.Behaviors namespace.
-            * Fixed a bug in the ExceptionShieldingBehavior where the ExceptionManager was not instantiated.
+            * Camelcased the names of the properties in the fault messages.
+            * Added setters to the Money class' properties for work with DB-s. Added metadata.
+            * Added NonemptyGuidValidator.
+            * Added Regex-es: ISO 8601 dates and times, credit card validators, routing number validators, bug fixes.
+            * Added conventions for Numeric and String data annotation attributes and a convention for DateTime properties to map to SQL type datetime2.
+            * Added HttpStatusCode mapping tables and Exception to/from Fault mapping tables.
+            * Changed all CallContext.Set/GetData to Get/SetLogicalData.
+            * Added DisposeExtensions.
+            * CORS behavior for WebHttpBinding (WCF REST).
+            * Number of bug fixes.
+            * ImmutableAttribute.
         </releaseNotes>
         <licenseUrl>https://github.com/vmelamed/vm/blob/master/LICENSE</licenseUrl>
         <projectUrl>https://github.com/vmelamed/vm/tree/master/Aspects</projectUrl>

diff --git a/Aspects/Parsers/Properties/AssemblyInfo.cs b/Aspects/Parsers/Properties/AssemblyInfo.cs
@@ -6,9 +6,9 @@
 [assembly: AssemblyTitle("vm.Aspects.Parser")]
 [assembly: AssemblyDescription("Text parsing readers, e.g. CSV/TSV reader.")]
 
-[assembly: AssemblyVersion("1.0.37")]
-[assembly: AssemblyFileVersion("1.0.37")]
-[assembly: AssemblyInformationalVersion("1.0.37")]
+[assembly: AssemblyVersion("1.0.39")]
+[assembly: AssemblyFileVersion("1.0.39")]
+[assembly: AssemblyInformationalVersion("1.0.39")]
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo(
     "vm.Aspects.Parsers.Tests, " +

diff --git a/Aspects/Properties/AssemblyInfo.cs b/Aspects/Properties/AssemblyInfo.cs
@@ -2,9 +2,9 @@
 
 [assembly: AssemblyTitle("vm.Aspects")]
 [assembly: AssemblyDescription("A set of classes addressing various common cross-cutting concerns.")]
-[assembly: AssemblyVersion("1.0.37")]
-[assembly: AssemblyFileVersion("1.0.37")]
-[assembly: AssemblyInformationalVersion("1.0.37")]
+[assembly: AssemblyVersion("1.0.39")]
+[assembly: AssemblyFileVersion("1.0.39")]
+[assembly: AssemblyInformationalVersion("1.0.39")]
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo(
     "vm.Aspects.Test, " +

diff --git a/Aspects/Wcf/Properties/AssemblyInfo.cs b/Aspects/Wcf/Properties/AssemblyInfo.cs
@@ -3,9 +3,9 @@
 [assembly: AssemblyTitle("Wcf")]
 [assembly: AssemblyDescription("A set of classes and generics simplifying the initial configuration work of creating WCF services.")]
 
-[assembly: AssemblyVersion("1.0.37")]
-[assembly: AssemblyFileVersion("1.0.37")]
-[assembly: AssemblyInformationalVersion("1.0.37")]
+[assembly: AssemblyVersion("1.0.39")]
+[assembly: AssemblyFileVersion("1.0.39")]
+[assembly: AssemblyInformationalVersion("1.0.39")]
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo(
     "vm.Aspects.Wcf.Test, " +

diff --git a/Aspects/Wcf/Services/ServiceHostExtensions.cs b/Aspects/Wcf/Services/ServiceHostExtensions.cs
@@ -1,5 +1,4 @@
-using Microsoft.Practices.ServiceLocation;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
@@ -10,6 +9,8 @@
 using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
 using System.ServiceModel.Web;
+using System.Text.RegularExpressions;
+using Microsoft.Practices.ServiceLocation;
 using vm.Aspects.Wcf.Behaviors;
 using vm.Aspects.Wcf.Bindings;
 
@@ -517,6 +518,8 @@ static void AddPreflightOperationSelectors(
             }
         }
 
+        static Regex _rexNamedParams = new Regex(@"{[^}]+}(?:/{[^}]+})*", RegexOptions.Compiled);
+
         static string NormalizeTemplate(string uriTemplate)
         {
             Contract.Requires<ArgumentNullException>(uriTemplate != null, nameof(uriTemplate));
@@ -527,18 +530,7 @@ static string NormalizeTemplate(string uriTemplate)
                 // no query string used for this
                 uriTemplate = uriTemplate.Substring(0, queryIndex);
 
-            int paramIndex;
-
-            while ((paramIndex = uriTemplate.IndexOf('{')) >= 0)
-            {
-                // Replace all named parameters with wild-cards
-                int endParamIndex = uriTemplate.IndexOf('}', paramIndex);
-
-                if (endParamIndex >= 0)
-                    uriTemplate = uriTemplate.Substring(0, paramIndex) + '*' + uriTemplate.Substring(endParamIndex + 1);
-            }
-
-            return uriTemplate;
+            return _rexNamedParams.Replace(uriTemplate, "*");
         }
     }
 }