Merge branch 'v3.0' into v3.1

Conflicts:
	src/DotNetOpenAuth.vsmdi
	src/DotNetOpenAuth/OpenId/OpenIdStrings.Designer.cs
	src/DotNetOpenAuth/OpenId/OpenIdStrings.resx

4 files changed, 90 insertions, 9 deletions

diff --git a/src/DotNetOpenAuth.Test/OpenId/AuthenticationTests.cs b/src/DotNetOpenAuth.Test/OpenId/AuthenticationTests.cs
index d825f4b..807beae 100644
--- a/src/DotNetOpenAuth.Test/OpenId/AuthenticationTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/AuthenticationTests.cs
@@ -58,6 +58,28 @@ namespace DotNetOpenAuth.Test.OpenId {
 			this.ParameterizedAuthenticationTest(false, false, false);
 		}
 
+		/// <summary>
+		/// Verifies that unsolicited assertions can be sent and received.
+		/// </summary>
+		[TestMethod]
+		public void UnsolicitedAssertion() {
+			var coordinator = new OpenIdCoordinator(
+				rp => {
+					// register with RP so that id discovery passes
+					rp.Channel.WebRequestHandler = this.MockResponder.MockWebRequestHandler;
+
+					// Receive the unsolicited assertion
+					var response = rp.GetResponse();
+					Assert.AreEqual(AuthenticationStatus.Authenticated, response.Status);
+				},
+				op => {
+					Identifier id = GetMockIdentifier(ProtocolVersion.V20);
+					op.SendUnsolicitedAssertion(OPUri, GetMockRealm(false), id, id);
+					AutoProvider(op);
+				});
+			coordinator.Run();
+		}
+
 		private void ParameterizedAuthenticationTest(bool sharedAssociation, bool positive, bool tamper) {
 			foreach (Protocol protocol in Protocol.AllPracticalVersions) {
 				foreach (bool statelessRP in new[] { false, true }) {
diff --git a/src/DotNetOpenAuth.Test/OpenId/OpenIdTestBase.cs b/src/DotNetOpenAuth.Test/OpenId/OpenIdTestBase.cs
index dddae27..6099b86 100644
--- a/src/DotNetOpenAuth.Test/OpenId/OpenIdTestBase.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/OpenIdTestBase.cs
@@ -71,6 +71,14 @@ namespace DotNetOpenAuth.Test.OpenId {
 			this.MockResponder = MockHttpRequest.CreateUntrustedMockHttpHandler();
 			this.RequestHandler = this.MockResponder.MockWebRequestHandler;
 			this.AutoProviderScenario = Scenarios.AutoApproval;
+			Identifier.EqualityOnStrings = true;
+		}
+
+		[TestCleanup]
+		public override void Cleanup() {
+			base.Cleanup();
+
+			Identifier.EqualityOnStrings = false;
 		}
 
 		/// <summary>
@@ -162,6 +170,11 @@ namespace DotNetOpenAuth.Test.OpenId {
 			}
 		}
 
+		protected Realm GetMockRealm(bool useSsl) {
+			var rpDescription = new RelyingPartyEndpointDescription(useSsl ? RPUriSsl : RPUri, new string[] { Protocol.V20.RPReturnToTypeURI });
+			return new MockRealm(useSsl ? RPRealmUriSsl : RPRealmUri, rpDescription);
+		}
+
 		protected Identifier GetMockIdentifier(ProtocolVersion providerVersion) {
 			return this.GetMockIdentifier(providerVersion, false);
 		}
diff --git a/src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs b/src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs
index 28b2b55..0a6cdcc 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs
@@ -6,6 +6,7 @@
 
 namespace DotNetOpenAuth.Test.OpenId.Provider {
 	using System;
+	using System.IO;
 	using DotNetOpenAuth.Messaging;
 	using DotNetOpenAuth.OpenId;
 	using DotNetOpenAuth.OpenId.Extensions;
@@ -126,15 +127,19 @@ namespace DotNetOpenAuth.Test.OpenId.Provider {
 
 		[TestMethod]
 		public void BadRequestsGenerateValidErrorResponsesHosted() {
-			using (AspNetHost host = AspNetHost.CreateHost(TestWebDirectory)) {
-				Uri opEndpoint = new Uri(host.BaseUri, "/OpenIdProviderEndpoint.ashx");
-				var rp = new OpenIdRelyingParty(null);
-				var nonOpenIdMessage = new Mocks.TestDirectedMessage();
-				nonOpenIdMessage.Recipient = opEndpoint;
-				nonOpenIdMessage.HttpMethods = HttpDeliveryMethods.PostRequest;
-				MessagingTestBase.GetStandardTestMessage(MessagingTestBase.FieldFill.AllRequired, nonOpenIdMessage);
-				var response = rp.Channel.Request<DirectErrorResponse>(nonOpenIdMessage);
-				Assert.IsNotNull(response.ErrorMessage);
+			try {
+				using (AspNetHost host = AspNetHost.CreateHost(TestWebDirectory)) {
+					Uri opEndpoint = new Uri(host.BaseUri, "/OpenIdProviderEndpoint.ashx");
+					var rp = new OpenIdRelyingParty(null);
+					var nonOpenIdMessage = new Mocks.TestDirectedMessage();
+					nonOpenIdMessage.Recipient = opEndpoint;
+					nonOpenIdMessage.HttpMethods = HttpDeliveryMethods.PostRequest;
+					MessagingTestBase.GetStandardTestMessage(MessagingTestBase.FieldFill.AllRequired, nonOpenIdMessage);
+					var response = rp.Channel.Request<DirectErrorResponse>(nonOpenIdMessage);
+					Assert.IsNotNull(response.ErrorMessage);
+				}
+			} catch (FileNotFoundException ex) {
+				Assert.Inconclusive("Unable to execute hosted ASP.NET tests because {0} could not be found.  {1}", ex.FileName, ex.FusionLog);
 			}
 		}
 	}
diff --git a/src/DotNetOpenAuth.Test/OpenId/RelyingParty/OpenIdRelyingPartyTests.cs b/src/DotNetOpenAuth.Test/OpenId/RelyingParty/OpenIdRelyingPartyTests.cs
index 68bbff3..f6a57e7 100644
--- a/src/DotNetOpenAuth.Test/OpenId/RelyingParty/OpenIdRelyingPartyTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/RelyingParty/OpenIdRelyingPartyTests.cs
@@ -63,6 +63,21 @@ namespace DotNetOpenAuth.Test.OpenId.RelyingParty {
 			Assert.AreEqual(1, requests.Count());
 		}
 
+		[TestMethod]
+		public void CreateRequestsWithEndpointFilter() {
+			var rp = this.CreateRelyingParty();
+			StoreAssociation(rp, OPUri, HmacShaAssociation.Create("somehandle", new byte[20], TimeSpan.FromDays(1)));
+			Identifier id = Identifier.Parse(GetMockIdentifier(ProtocolVersion.V20));
+
+			rp.EndpointFilter = opendpoint => true;
+			var requests = rp.CreateRequests(id, RPRealmUri, RPUri);
+			Assert.AreEqual(1, requests.Count());
+
+			rp.EndpointFilter = opendpoint => false;
+			requests = rp.CreateRequests(id, RPRealmUri, RPUri);
+			Assert.AreEqual(0, requests.Count());
+		}
+
 		[TestMethod, ExpectedException(typeof(ProtocolException))]
 		public void CreateRequestOnNonOpenID() {
 			Uri nonOpenId = new Uri("http://www.microsoft.com/");
@@ -79,5 +94,31 @@ namespace DotNetOpenAuth.Test.OpenId.RelyingParty {
 			var requests = rp.CreateRequests(nonOpenId, RPRealmUri, RPUri);
 			Assert.AreEqual(0, requests.Count());
 		}
+
+		/// <summary>
+		/// Verifies that incoming positive assertions throw errors if they come from
+		/// OPs that are not approved by <see cref="OpenIdRelyingParty.EndpointFilter"/>.
+		/// </summary>
+		[TestMethod]
+		public void AssertionWithEndpointFilter() {
+			var coordinator = new OpenIdCoordinator(
+				rp => {
+					// register with RP so that id discovery passes
+					rp.Channel.WebRequestHandler = this.MockResponder.MockWebRequestHandler;
+
+					// Rig it to always deny the incoming OP
+					rp.EndpointFilter = op => false;
+
+					// Receive the unsolicited assertion
+					var response = rp.GetResponse();
+					Assert.AreEqual(AuthenticationStatus.Failed, response.Status);
+				},
+				op => {
+					Identifier id = GetMockIdentifier(ProtocolVersion.V20);
+					op.SendUnsolicitedAssertion(OPUri, GetMockRealm(false), id, id);
+					AutoProvider(op);
+				});
+			coordinator.Run();
+		}
 	}
 }