Adds extensibility points for authenticating OAuth 2 clients at the client and authorization server ends.

Fixes #105
Related to #75

1 files changed, 25 insertions, 0 deletions

diff --git a/src/DotNetOpenAuth.Core/Messaging/Channel.cs b/src/DotNetOpenAuth.Core/Messaging/Channel.cs
index 016a2b6..235c41b 100644
--- a/src/DotNetOpenAuth.Core/Messaging/Channel.cs
+++ b/src/DotNetOpenAuth.Core/Messaging/Channel.cs
@@ -478,6 +478,14 @@ namespace DotNetOpenAuth.Messaging {
 			IDirectedProtocolMessage requestMessage = this.ReadFromRequestCore(httpRequest);
 			if (requestMessage != null) {
 				Logger.Channel.DebugFormat("Incoming request received: {0}", requestMessage.GetType().Name);
+
+				var directRequest = requestMessage as IHttpDirectRequest;
+				if (directRequest != null) {
+					foreach (string header in httpRequest.Headers) {
+						directRequest.Headers[header] = httpRequest.Headers[header];
+					}
+				}
+
 				this.ProcessIncomingMessage(requestMessage);
 			}
 
@@ -717,6 +725,13 @@ namespace DotNetOpenAuth.Messaging {
 			Requires.True(request.Recipient != null, "request", MessagingStrings.DirectedMessageMissingRecipient);
 
 			HttpWebRequest webRequest = this.CreateHttpRequest(request);
+			var directRequest = request as IHttpDirectRequest;
+			if (directRequest != null) {
+				foreach (string header in directRequest.Headers) {
+					webRequest.Headers[header] = directRequest.Headers[header];
+				}
+			}
+
 			IDictionary<string, string> responseFields;
 			IDirectResponseProtocolMessage responseMessage;
 
@@ -1082,6 +1097,7 @@ namespace DotNetOpenAuth.Messaging {
 			UriBuilder builder = new UriBuilder(requestMessage.Recipient);
 			MessagingUtilities.AppendQueryArgs(builder, fields);
 			HttpWebRequest httpRequest = (HttpWebRequest)WebRequest.Create(builder.Uri);
+			this.PrepareHttpWebRequest(httpRequest);
 
 			return httpRequest;
 		}
@@ -1122,6 +1138,7 @@ namespace DotNetOpenAuth.Messaging {
 			var fields = messageAccessor.Serialize();
 
 			var httpRequest = (HttpWebRequest)WebRequest.Create(requestMessage.Recipient);
+			this.PrepareHttpWebRequest(httpRequest);
 			httpRequest.CachePolicy = this.CachePolicy;
 			httpRequest.Method = "POST";
 
@@ -1299,6 +1316,14 @@ namespace DotNetOpenAuth.Messaging {
 		}
 
 		/// <summary>
+		/// Performs additional processing on an outgoing web request before it is sent to the remote server.
+		/// </summary>
+		/// <param name="request">The request.</param>
+		protected virtual void PrepareHttpWebRequest(HttpWebRequest request) {
+			Requires.NotNull(request, "request");
+		}
+
+		/// <summary>
 		/// Customizes the binding element order for outgoing and incoming messages.
 		/// </summary>
 		/// <param name="outgoingOrder">The outgoing order.</param>