added support for - (dash) substition or more percisely none

managedfusion · Jul 8, 2011 · 3397969 · 3397969
1 parent c5123fe
commit 3397969
Show file tree

Hide file tree

Showing 26 changed files with 56 additions and 26 deletions.
diff --git a/src/Engines/ApacheRuleSet.cs b/src/Engines/ApacheRuleSet.cs
@@ -427,7 +427,13 @@ public void RefreshRules(TextReader reader)
 								{
 									switch (parts[0])
 									{
+										case "inherit":
+											break;
+
+										// obsolete in 2.1 mod_rewrite
 										case "MaxRedirects":
+											Manager.LogIf(tempLogLevel >= 1, "MaxRedirects is obsolete", "Obsolete");
+
 											int maxInternalTransfers;
 											if (Int32.TryParse(parts[1], out maxInternalTransfers))
 											{

diff --git a/src/Rules/DefaultRuleAction.cs b/src/Rules/DefaultRuleAction.cs
@@ -117,6 +117,12 @@ public virtual bool IsMatch(RuleContext context)
 		/// <returns></returns>
 		public virtual void Execute(RuleContext context)
 		{
+			if (_substitution == "-")
+			{
+				Manager.LogIf(context.LogLevel >= 2, "Output: " + context.CurrentUrl, context.LogCategory);
+				return;
+			}
+
 			string inputUrl = context.CurrentUrl.AbsolutePath;
 			string substituedUrl = Pattern.Replace(inputUrl, _substitution, context);
 

diff --git a/test/ManagedFusion.Rewriter.Tests/ApacheStyleTest.cs b/test/ManagedFusion.Rewriter.Tests/ApacheStyleTest.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using NUnit.Framework;
 
-namespace ManagedFusion.Rewriter.Test
+namespace ManagedFusion.Rewriter.Tests
 {
 	[TestFixture]
 	public class ApacheStyleTest : BaseTest
@@ -89,6 +89,24 @@ public void RewriteCondWithHttpHeader()
 			Assert.AreEqual(expected, result);
 		}
 
+		[Test]
+		public void SimpleRule_WithNoSubstituion()
+		{
+			var target = CreateRuleSet(@"
+RewriteRule ^.* - [F,L]");
+
+			var url = new Uri("http://www.somesite.com/test.aspx");
+			var context = HttpHelpers.MockHttpContext(url);
+			context.Request.SetServerVariables(new Dictionary<string, string> { 
+				{ "REQUEST_URI", url.GetComponents(UriComponents.PathAndQuery, UriFormat.SafeUnescaped) } 
+			});
+
+			Uri expected = null; // no change
+			Uri result = target.RunRules(context, url);
+
+			Assert.AreEqual(expected, result);
+		}
+
 		[Test]
 		public void SimpleRule_WithComplexCondition()
 		{

diff --git a/test/ManagedFusion.Rewriter.Tests/BaseTest.cs b/test/ManagedFusion.Rewriter.Tests/BaseTest.cs
@@ -7,7 +7,7 @@
 using ManagedFusion.Rewriter.Engines;
 using System.Text.RegularExpressions;
 
-namespace ManagedFusion.Rewriter.Test
+namespace ManagedFusion.Rewriter.Tests
 {
 	public class BaseTest
 	{

diff --git a/test/ManagedFusion.Rewriter.Tests/CommonProblemTest.cs b/test/ManagedFusion.Rewriter.Tests/CommonProblemTest.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using NUnit.Framework;
 
-namespace ManagedFusion.Rewriter.Test
+namespace ManagedFusion.Rewriter.Tests
 {
 	[TestFixture]
 	public class CommonProblemTest : BaseTest

diff --git a/test/ManagedFusion.Rewriter.Tests/CommonUseTest.cs b/test/ManagedFusion.Rewriter.Tests/CommonUseTest.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using NUnit.Framework;
 
-namespace ManagedFusion.Rewriter.Test
+namespace ManagedFusion.Rewriter.Tests
 {
 	[TestFixture]
 	public class CommonUseTest : BaseTest

diff --git a/test/ManagedFusion.Rewriter.Tests/Conditions/Flags/NoCaseTest.cs b/test/ManagedFusion.Rewriter.Tests/Conditions/Flags/NoCaseTest.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using NUnit.Framework;
 
-namespace ManagedFusion.Rewriter.Test.Conditions.Flags
+namespace ManagedFusion.Rewriter.Tests.Conditions.Flags
 {
 	/// <summary>
 	/// Summary description for NoCaseTest

diff --git a/test/ManagedFusion.Rewriter.Tests/Conditions/Flags/OrNextTest.cs b/test/ManagedFusion.Rewriter.Tests/Conditions/Flags/OrNextTest.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using NUnit.Framework;
 
-namespace ManagedFusion.Rewriter.Test.Conditions.Flags
+namespace ManagedFusion.Rewriter.Tests.Conditions.Flags
 {
 	/// <summary>
 	/// Summary description for OrNextTest

diff --git a/test/ManagedFusion.Rewriter.Tests/HttpHelpers.cs b/test/ManagedFusion.Rewriter.Tests/HttpHelpers.cs
@@ -6,7 +6,7 @@
 using System.Collections;
 using System.IO;
 
-namespace ManagedFusion.Rewriter.Test
+namespace ManagedFusion.Rewriter.Tests
 {
 	public static class HttpHelpers
 	{

diff --git a/test/ManagedFusion.Rewriter.Tests/KnownHttpVerbTest.cs b/test/ManagedFusion.Rewriter.Tests/KnownHttpVerbTest.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using NUnit.Framework;
 
-namespace ManagedFusion.Rewriter.Test
+namespace ManagedFusion.Rewriter.Tests
 {
 	/// <summary>
 	/// Summary description for KnownHttpVerbTest

diff --git a/test/ManagedFusion.Rewriter.Tests/PatternTest.cs b/test/ManagedFusion.Rewriter.Tests/PatternTest.cs
@@ -3,7 +3,7 @@
 using NUnit.Framework;
 using System.Text.RegularExpressions;
 
-namespace ManagedFusion.Rewriter.Test
+namespace ManagedFusion.Rewriter.Tests
 {
 	[TestFixture]
 	public class PatternTest : BaseTest

diff --git a/test/ManagedFusion.Rewriter.Tests/ProxyTest.cs b/test/ManagedFusion.Rewriter.Tests/ProxyTest.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using NUnit.Framework;
 
-namespace ManagedFusion.Rewriter.Test
+namespace ManagedFusion.Rewriter.Tests
 {
 	[TestFixture]
 	public class ProxyTest : BaseTest

diff --git a/test/ManagedFusion.Rewriter.Tests/Rules/DefaultOutputRuleActionTest.cs b/test/ManagedFusion.Rewriter.Tests/Rules/DefaultOutputRuleActionTest.cs
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using NUnit.Framework;
-using ManagedFusion.Rewriter.Test;
 using ManagedFusion.Rewriter.Conditions;
+using ManagedFusion.Rewriter.Rules;
 
-namespace ManagedFusion.Rewriter.Rules.Test
+namespace ManagedFusion.Rewriter.Tests.Rules
 {
 	[TestFixture]
 	public class DefaultOutputRuleActionTest : BaseTest

diff --git a/test/ManagedFusion.Rewriter.Tests/Rules/DefaultRuleActionTest.cs b/test/ManagedFusion.Rewriter.Tests/Rules/DefaultRuleActionTest.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using ManagedFusion.Rewriter.Test;
 using ManagedFusion.Rewriter.Conditions;
 using NUnit.Framework;
+using ManagedFusion.Rewriter.Rules;
 
-namespace ManagedFusion.Rewriter.Rules.Test
+namespace ManagedFusion.Rewriter.Tests.Rules
 {
 	[TestFixture]
 	public class DefaultRuleActionTest : BaseTest

diff --git a/test/ManagedFusion.Rewriter.Tests/Rules/Flags/ChainFlagTest.cs b/test/ManagedFusion.Rewriter.Tests/Rules/Flags/ChainFlagTest.cs
@@ -1,7 +1,7 @@
 using System;
 using NUnit.Framework;
 
-namespace ManagedFusion.Rewriter.Test.Rules.Flags
+namespace ManagedFusion.Rewriter.Tests.Rules.Flags
 {
 	/// <summary>
 	/// Summary description for ChainFlagTest

diff --git a/test/ManagedFusion.Rewriter.Tests/Rules/Flags/LastFlagTest.cs b/test/ManagedFusion.Rewriter.Tests/Rules/Flags/LastFlagTest.cs
@@ -1,7 +1,7 @@
 using System;
 using NUnit.Framework;
 
-namespace ManagedFusion.Rewriter.Test.Rules.Flags
+namespace ManagedFusion.Rewriter.Tests.Rules.Flags
 {
 	/// <summary>
 	/// Summary description for LastFlagTest

diff --git a/test/ManagedFusion.Rewriter.Tests/Rules/Flags/NextRuleFlagTest.cs b/test/ManagedFusion.Rewriter.Tests/Rules/Flags/NextRuleFlagTest.cs
@@ -1,7 +1,7 @@
 using System;
 using NUnit.Framework;
 
-namespace ManagedFusion.Rewriter.Test.Rules.Flags
+namespace ManagedFusion.Rewriter.Tests.Rules.Flags
 {
 	/// <summary>
 	/// Summary description for NextRuleFlagTest

diff --git a/test/ManagedFusion.Rewriter.Tests/Rules/Flags/NoCaseTest.cs b/test/ManagedFusion.Rewriter.Tests/Rules/Flags/NoCaseTest.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using NUnit.Framework;
 
-namespace ManagedFusion.Rewriter.Test.Rules.Flags
+namespace ManagedFusion.Rewriter.Tests.Rules.Flags
 {
 	/// <summary>
 	/// Summary description for NoCaseTest

diff --git a/test/ManagedFusion.Rewriter.Tests/Rules/Flags/QueryStringAppendFlagTest.cs b/test/ManagedFusion.Rewriter.Tests/Rules/Flags/QueryStringAppendFlagTest.cs
@@ -1,7 +1,7 @@
 using System;
 using NUnit.Framework;
 
-namespace ManagedFusion.Rewriter.Test.Rules.Flags
+namespace ManagedFusion.Rewriter.Tests.Rules.Flags
 {
 	[TestFixture]
 	public class QueryStringAppendFlagTest : BaseTest

diff --git a/test/ManagedFusion.Rewriter.Tests/Rules/Flags/RedirectFlagTest.cs b/test/ManagedFusion.Rewriter.Tests/Rules/Flags/RedirectFlagTest.cs
@@ -1,7 +1,7 @@
 using System;
 using NUnit.Framework;
 
-namespace ManagedFusion.Rewriter.Test.Rules.Flags
+namespace ManagedFusion.Rewriter.Tests.Rules.Flags
 {
 	/// <summary>
 	/// Summary description for ChainFlagTest

diff --git a/test/ManagedFusion.Rewriter.Tests/Rules/Flags/SkipRuleFlagTest.cs b/test/ManagedFusion.Rewriter.Tests/Rules/Flags/SkipRuleFlagTest.cs
@@ -1,7 +1,7 @@
 using System;
 using NUnit.Framework;
 
-namespace ManagedFusion.Rewriter.Test.Rules.Flags
+namespace ManagedFusion.Rewriter.Tests.Rules.Flags
 {
 	[TestFixture]
 	public class SkipRuleFlagTest : BaseTest

diff --git a/test/ManagedFusion.Rewriter.Tests/RulesHelper.cs b/test/ManagedFusion.Rewriter.Tests/RulesHelper.cs
@@ -1,7 +1,7 @@
 using System;
 using Moq;
 
-namespace ManagedFusion.Rewriter.Test
+namespace ManagedFusion.Rewriter.Tests
 {
 	public static class RulesHelper
 	{

diff --git a/test/ManagedFusion.Rewriter.Tests/StringExtensions.cs b/test/ManagedFusion.Rewriter.Tests/StringExtensions.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace ManagedFusion.Rewriter.Test
+namespace ManagedFusion.Rewriter.Tests
 {
 	public static class StringExtensions
 	{

diff --git a/test/ManagedFusion.Rewriter.Tests/TestProxyAsyncHandler.cs b/test/ManagedFusion.Rewriter.Tests/TestProxyAsyncHandler.cs
@@ -5,7 +5,7 @@
 using System.Web;
 using System.Net;
 
-namespace ManagedFusion.Rewriter.Test
+namespace ManagedFusion.Rewriter.Tests
 {
 	public class TestProxyAsyncHandler : ProxyAsyncHandler
 	{

diff --git a/test/ManagedFusion.Rewriter.Tests/TestProxyHandler.cs b/test/ManagedFusion.Rewriter.Tests/TestProxyHandler.cs
@@ -5,7 +5,7 @@
 using System.Web;
 using System.Net;
 
-namespace ManagedFusion.Rewriter.Test
+namespace ManagedFusion.Rewriter.Tests
 {
 	public class TestProxyHandler : ProxyHandler
 	{

diff --git a/test/ManagedFusion.Rewriter.Tests/TestRuleAction.cs b/test/ManagedFusion.Rewriter.Tests/TestRuleAction.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace ManagedFusion.Rewriter.Test
+namespace ManagedFusion.Rewriter.Tests
 {
 	public class TestRuleAction : IRuleAction
 	{