Skip to content

add x-www-form-urlencoded body for digest #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 19, 2012
Merged

add x-www-form-urlencoded body for digest #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions QBox/Client.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ namespace QBox
{
public abstract class Client
{
public abstract void SetAuth(HttpWebRequest request);

public abstract void SetAuth(HttpWebRequest request, byte[] body);
public CallRet Call(string url)
{
Console.WriteLine("URL: " + url);
try
{
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
request.Method = "POST";
SetAuth(request);
SetAuth(request, null);
using (HttpWebResponse response = request.GetResponse() as HttpWebResponse)
{
return HandleResult(response);
Expand All @@ -37,7 +37,7 @@ public CallRet CallWithBinary(string url, string contentType, byte[] body)
request.Method = "POST";
request.ContentType = contentType;
request.ContentLength = body.Length;
SetAuth(request);
SetAuth(request, body);
using (Stream requestStream = request.GetRequestStream())
{
requestStream.Write(body, 0, body.Length);
Expand Down
21 changes: 15 additions & 6 deletions QBox/DigestAuthClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,27 @@ namespace QBox
{
public class DigestAuthClient : Client
{
public override void SetAuth(HttpWebRequest request)
public override void SetAuth(HttpWebRequest request, byte[] body)
{
byte[] secretKey = Encoding.ASCII.GetBytes(Config.SECRET_KEY);
using (HMACSHA1 hmac = new HMACSHA1(secretKey))
{
string pathAndQuery = request.Address.PathAndQuery;
byte[] bytesIn = Encoding.ASCII.GetBytes(pathAndQuery + "\n");
byte[] digest = hmac.ComputeHash(bytesIn);
string digestBase64 = Base64UrlSafe.Encode(digest);
byte[] pathAndQueryBytes = Encoding.ASCII.GetBytes(pathAndQuery);
using (MemoryStream buffer = new MemoryStream())
{
buffer.Write(pathAndQueryBytes, 0, pathAndQueryBytes.Length);
buffer.WriteByte((byte)'\n');
if (request.ContentType == "application/x-www-form-urlencoded" && body != null)
{
buffer.Write(body, 0, body.Length);
}
byte[] digest = hmac.ComputeHash(buffer.ToArray());
string digestBase64 = Base64UrlSafe.Encode(digest);

string authHead = "QBox " + Config.ACCESS_KEY + ":" + digestBase64;
request.Headers.Add("Authorization", authHead);
string authHead = "QBox " + Config.ACCESS_KEY + ":" + digestBase64;
request.Headers.Add("Authorization", authHead);
}
}
}
}
Expand Down