diff options
Diffstat (limited to 'src')
5 files changed, 15 insertions, 11 deletions
diff --git a/src/DotNetOAuth.Test/Scenarios/CoordinatingOAuthChannel.cs b/src/DotNetOAuth.Test/Scenarios/CoordinatingOAuthChannel.cs index 4aa85f5..08f086f 100644 --- a/src/DotNetOAuth.Test/Scenarios/CoordinatingOAuthChannel.cs +++ b/src/DotNetOAuth.Test/Scenarios/CoordinatingOAuthChannel.cs @@ -67,7 +67,6 @@ namespace DotNetOAuth.Test.Scenarios { protected override IProtocolMessage RequestInternal(IDirectedProtocolMessage request) {
HttpRequestInfo requestInfo = this.SpoofHttpMethod(request);
- TestBase.TestLogger.InfoFormat("Sending request: {0}", requestInfo.Message);
// Drop the outgoing message in the other channel's in-slot and let them know it's there.
this.RemoteChannel.incomingMessage = requestInfo.Message;
this.RemoteChannel.incomingMessageSignal.Set();
@@ -76,14 +75,12 @@ namespace DotNetOAuth.Test.Scenarios { }
protected override Response SendDirectMessageResponse(IProtocolMessage response) {
- TestBase.TestLogger.InfoFormat("Sending response: {0}", response);
this.RemoteChannel.incomingMessage = CloneSerializedParts(response, null);
this.RemoteChannel.incomingMessageSignal.Set();
return null;
}
protected override Response SendIndirectMessage(IDirectedProtocolMessage message) {
- TestBase.TestLogger.Info("Next response is an indirect message...");
// In this mock transport, direct and indirect messages are the same.
return this.SendDirectMessageResponse(message);
}
diff --git a/src/DotNetOAuth/ChannelElements/HmacSha1SigningBindingElement.cs b/src/DotNetOAuth/ChannelElements/HmacSha1SigningBindingElement.cs index f1455e8..6f01a40 100644 --- a/src/DotNetOAuth/ChannelElements/HmacSha1SigningBindingElement.cs +++ b/src/DotNetOAuth/ChannelElements/HmacSha1SigningBindingElement.cs @@ -33,7 +33,6 @@ namespace DotNetOAuth.ChannelElements { string key = GetConsumerAndTokenSecretString(message);
HashAlgorithm hasher = new HMACSHA1(Encoding.ASCII.GetBytes(key));
string baseString = ConstructSignatureBaseString(message);
- Logger.DebugFormat("Signing message with signature base string: {0}", baseString);
byte[] digest = hasher.ComputeHash(Encoding.ASCII.GetBytes(baseString));
return Convert.ToBase64String(digest);
}
diff --git a/src/DotNetOAuth/ChannelElements/SigningBindingElementBase.cs b/src/DotNetOAuth/ChannelElements/SigningBindingElementBase.cs index 7850bd8..20eab0f 100644 --- a/src/DotNetOAuth/ChannelElements/SigningBindingElementBase.cs +++ b/src/DotNetOAuth/ChannelElements/SigningBindingElementBase.cs @@ -73,6 +73,7 @@ namespace DotNetOAuth.ChannelElements { var signedMessage = message as ITamperResistantOAuthMessage;
if (signedMessage != null && this.IsMessageApplicable(signedMessage)) {
signedMessage.SignatureMethod = this.signatureMethod;
+ Logger.DebugFormat("Signing {0} message using {1}.", message.GetType().Name, this.signatureMethod);
signedMessage.Signature = this.GetSignature(signedMessage);
return true;
}
@@ -89,6 +90,8 @@ namespace DotNetOAuth.ChannelElements { public bool PrepareMessageForReceiving(IProtocolMessage message) {
var signedMessage = message as ITamperResistantOAuthMessage;
if (signedMessage != null && this.IsMessageApplicable(signedMessage)) {
+ Logger.DebugFormat("Verifying incoming {0} message signature of: {1}", message.GetType().Name, signedMessage.Signature);
+
if (!string.Equals(signedMessage.SignatureMethod, this.signatureMethod, StringComparison.Ordinal)) {
Logger.WarnFormat("Expected signature method '{0}' but received message with a signature method of '{1}'.", this.signatureMethod, signedMessage.SignatureMethod);
return false;
@@ -168,6 +171,7 @@ namespace DotNetOAuth.ChannelElements { signatureBaseString.Append(Uri.EscapeDataString(element));
}
+ Logger.DebugFormat("Constructed signature base string: {0}", signatureBaseString);
return signatureBaseString.ToString();
}
diff --git a/src/DotNetOAuth/ClassDiagram.cd b/src/DotNetOAuth/ClassDiagram.cd index 722c7d3..ac54a5f 100644 --- a/src/DotNetOAuth/ClassDiagram.cd +++ b/src/DotNetOAuth/ClassDiagram.cd @@ -3,7 +3,7 @@ <Class Name="DotNetOAuth.ServiceProvider">
<Position X="0.5" Y="0.5" Width="5.75" />
<TypeIdentifier>
- <HashCode>EAoAAAAgAAACAAABCAAEAAAAAAAIAAEAAQAIAAAAAQA=</HashCode>
+ <HashCode>EAoAAAAgAAAAAAABCAAEAAAAAAAIAAEAAQAIAAAAAQA=</HashCode>
<FileName>ServiceProvider.cs</FileName>
</TypeIdentifier>
</Class>
@@ -14,12 +14,15 @@ <FileName>Consumer.cs</FileName>
</TypeIdentifier>
</Class>
- <Enum Name="DotNetOAuth.Messaging.MessageTransport">
- <Position X="0.5" Y="4.5" Width="2" />
+ <Class Name="DotNetOAuth.ServiceProviderDescription">
+ <Position X="1.25" Y="4.5" Width="4.75" />
+ <Compartments>
+ <Compartment Name="Fields" Collapsed="true" />
+ </Compartments>
<TypeIdentifier>
- <HashCode>AAACAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
- <FileName>Messaging\MessageTransport.cs</FileName>
+ <HashCode>AAACAAgAAAAEAAAQAAAAAAAAAAAAACAAAAAgAAAAAAA=</HashCode>
+ <FileName>ServiceProviderDescription.cs</FileName>
</TypeIdentifier>
- </Enum>
+ </Class>
<Font Name="Segoe UI" Size="9" />
</ClassDiagram>
\ No newline at end of file diff --git a/src/DotNetOAuth/Messaging/Channel.cs b/src/DotNetOAuth/Messaging/Channel.cs index a5cf25f..270a540 100644 --- a/src/DotNetOAuth/Messaging/Channel.cs +++ b/src/DotNetOAuth/Messaging/Channel.cs @@ -247,6 +247,7 @@ namespace DotNetOAuth.Messaging { protected internal IProtocolMessage ReadFromRequest(HttpRequestInfo httpRequest) {
IProtocolMessage requestMessage = this.ReadFromRequestInternal(httpRequest);
if (requestMessage != null) {
+ Logger.DebugFormat("Incoming request received: {0}", requestMessage);
this.VerifyMessageAfterReceiving(requestMessage);
}
@@ -303,7 +304,6 @@ namespace DotNetOAuth.Messaging { if (response != null) {
Logger.DebugFormat("Received response: {0}", response);
this.VerifyMessageAfterReceiving(response);
- Logger.DebugFormat("Response verified.");
}
return response;
@@ -316,6 +316,7 @@ namespace DotNetOAuth.Messaging { /// <returns>The deserialized message, if one is found. Null otherwise.</returns>
protected internal IProtocolMessage ReadFromResponse(Stream responseStream) {
IProtocolMessage message = this.ReadFromResponseInternal(responseStream);
+ Logger.DebugFormat("Received message response: {0}", message);
this.VerifyMessageAfterReceiving(message);
return message;
}
|