mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-04 04:06:05 +13:00
Fixed signature match problem
This commit is contained in:
parent
af1c47a03d
commit
5541d6136f
1 changed files with 37 additions and 29 deletions
|
@ -79,26 +79,27 @@ public override UploadResult Upload(Stream stream, string fileName)
|
||||||
string expiresTotalSeconds = ((long)TimeSpan.FromHours(1).TotalSeconds).ToString();
|
string expiresTotalSeconds = ((long)TimeSpan.FromHours(1).TotalSeconds).ToString();
|
||||||
string contentType = Helpers.GetMimeType(fileName);
|
string contentType = Helpers.GetMimeType(fileName);
|
||||||
|
|
||||||
Dictionary<string, string> args = new Dictionary<string, string>();
|
|
||||||
args.Add("X-Amz-Algorithm", algorithm);
|
|
||||||
args.Add("X-Amz-Credential", credential);
|
|
||||||
args.Add("X-Amz-Date", longDate);
|
|
||||||
args.Add("X-Amz-Expires", expiresTotalSeconds);
|
|
||||||
args.Add("X-Amz-SignedHeaders", "content-type;host;x-amz-acl;x-amz-storage-class");
|
|
||||||
|
|
||||||
NameValueCollection headers = new NameValueCollection();
|
NameValueCollection headers = new NameValueCollection();
|
||||||
headers["content-type"] = contentType;
|
headers["content-type"] = contentType;
|
||||||
headers["host"] = host;
|
headers["host"] = host;
|
||||||
headers["x-amz-acl"] = "public-read";
|
headers["x-amz-acl"] = "public-read";
|
||||||
headers["x-amz-storage-class"] = Settings.UseReducedRedundancyStorage ? "REDUCED_REDUNDANCY" : "STANDARD";
|
headers["x-amz-storage-class"] = Settings.UseReducedRedundancyStorage ? "REDUCED_REDUNDANCY" : "STANDARD";
|
||||||
|
|
||||||
|
string signedHeaders = GetSignedHeaders(headers);
|
||||||
|
|
||||||
|
Dictionary<string, string> args = new Dictionary<string, string>();
|
||||||
|
args.Add("X-Amz-Algorithm", algorithm);
|
||||||
|
args.Add("X-Amz-Credential", credential);
|
||||||
|
args.Add("X-Amz-Date", longDate);
|
||||||
|
args.Add("X-Amz-Expires", expiresTotalSeconds);
|
||||||
|
args.Add("X-Amz-SignedHeaders", signedHeaders);
|
||||||
|
|
||||||
string uploadPath = GetUploadPath(fileName);
|
string uploadPath = GetUploadPath(fileName);
|
||||||
string canonicalURI = URLHelpers.AddSlash(uploadPath, SlashType.Prefix);
|
string canonicalURI = URLHelpers.AddSlash(uploadPath, SlashType.Prefix);
|
||||||
canonicalURI = URLHelpers.URLPathEncode(canonicalURI);
|
canonicalURI = URLHelpers.URLPathEncode(canonicalURI);
|
||||||
|
|
||||||
string canonicalQueryString = CreateQuery(args);
|
string canonicalQueryString = CreateQueryString(args);
|
||||||
string canonicalHeaders = CreateCanonicalHeaders(headers);
|
string canonicalHeaders = CreateCanonicalHeaders(headers);
|
||||||
string signedHeaders = GetSignedHeaders(headers);
|
|
||||||
|
|
||||||
string canonicalRequest = "PUT" + "\n" +
|
string canonicalRequest = "PUT" + "\n" +
|
||||||
canonicalURI + "\n" +
|
canonicalURI + "\n" +
|
||||||
|
@ -112,21 +113,20 @@ public override UploadResult Upload(Stream stream, string fileName)
|
||||||
scope + "\n" +
|
scope + "\n" +
|
||||||
BytesToHex(ComputeHash(canonicalRequest));
|
BytesToHex(ComputeHash(canonicalRequest));
|
||||||
|
|
||||||
string dateKey = ComputeHMAC("AWS4" + Settings.SecretAccessKey, credentialDate);
|
byte[] secretKey = Encoding.UTF8.GetBytes("AWS4" + Settings.SecretAccessKey);
|
||||||
string dateRegionKey = ComputeHMAC(dateKey, Settings.Endpoint);
|
byte[] dateKey = ComputeHMAC(Encoding.UTF8.GetBytes(credentialDate), secretKey);
|
||||||
string dateRegionServiceKey = ComputeHMAC(dateRegionKey, "s3");
|
byte[] dateRegionKey = ComputeHMAC(Encoding.UTF8.GetBytes(Settings.Endpoint), dateKey);
|
||||||
string signingKey = ComputeHMAC(dateRegionServiceKey, "aws4_request");
|
byte[] dateRegionServiceKey = ComputeHMAC(Encoding.UTF8.GetBytes("s3"), dateRegionKey);
|
||||||
|
byte[] signingKey = ComputeHMAC(Encoding.UTF8.GetBytes("aws4_request"), dateRegionServiceKey);
|
||||||
string signature = StringToHex(ComputeHMAC(signingKey, stringToSign));
|
string signature = BytesToHex(ComputeHMAC(Encoding.UTF8.GetBytes(stringToSign), signingKey));
|
||||||
|
|
||||||
args.Add("X-Amz-Signature", signature);
|
args.Add("X-Amz-Signature", signature);
|
||||||
|
|
||||||
headers.Remove("content-type");
|
headers.Remove("content-type");
|
||||||
headers.Remove("host");
|
headers.Remove("host");
|
||||||
|
|
||||||
string url = URLHelpers.ForcePrefix(host, "https://");
|
string url = URLHelpers.CombineURL(host, canonicalURI) + "?" + CreateQueryString(args);
|
||||||
url = URLHelpers.CombineURL(url, canonicalURI);
|
url = URLHelpers.ForcePrefix(url, "https://");
|
||||||
url = CreateQuery(url, args);
|
|
||||||
|
|
||||||
NameValueCollection responseHeaders = SendRequestGetHeaders(HttpMethod.PUT, url, stream, contentType, null, headers);
|
NameValueCollection responseHeaders = SendRequestGetHeaders(HttpMethod.PUT, url, stream, contentType, null, headers);
|
||||||
|
|
||||||
|
@ -136,9 +136,7 @@ public override UploadResult Upload(Stream stream, string fileName)
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
string eTag = responseHeaders.Get("ETag");
|
if (responseHeaders["ETag"] == null)
|
||||||
|
|
||||||
if (eTag == null)
|
|
||||||
{
|
{
|
||||||
Errors.Add("Upload to Amazon S3 failed.");
|
Errors.Add("Upload to Amazon S3 failed.");
|
||||||
return null;
|
return null;
|
||||||
|
@ -147,7 +145,7 @@ public override UploadResult Upload(Stream stream, string fileName)
|
||||||
return new UploadResult
|
return new UploadResult
|
||||||
{
|
{
|
||||||
IsSuccess = true,
|
IsSuccess = true,
|
||||||
URL = URLHelpers.CombineURL($"https://s3.{Settings.Endpoint}.amazonaws.com", Settings.Bucket, uploadPath, fileName)
|
URL = GenerateURL(fileName)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -157,13 +155,19 @@ private string GetUploadPath(string fileName)
|
||||||
return URLHelpers.CombineURL(path, fileName);
|
return URLHelpers.CombineURL(path, fileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private string GenerateURL(string fileName)
|
||||||
|
{
|
||||||
|
string uploadPath = GetUploadPath(fileName);
|
||||||
|
return URLHelpers.CombineURL($"https://s3.{Settings.Endpoint}.amazonaws.com", Settings.Bucket, uploadPath);
|
||||||
|
}
|
||||||
|
|
||||||
private string CreateCanonicalHeaders(NameValueCollection headers)
|
private string CreateCanonicalHeaders(NameValueCollection headers)
|
||||||
{
|
{
|
||||||
string result = "";
|
string result = "";
|
||||||
|
|
||||||
foreach (string key in headers)
|
foreach (string key in headers)
|
||||||
{
|
{
|
||||||
result += key.ToLowerInvariant() + ":" + headers[key].ToLowerInvariant().Trim() + "\n";
|
result += key.ToLowerInvariant() + ":" + headers[key].Trim() + "\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
@ -182,12 +186,11 @@ private byte[] ComputeHash(string data)
|
||||||
return hash;
|
return hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
private string ComputeHMAC(string data, string key)
|
private byte[] ComputeHMAC(byte[] data, byte[] key)
|
||||||
{
|
{
|
||||||
using (HashAlgorithm hashAlgorithm = new HMACSHA256(Encoding.UTF8.GetBytes(key)))
|
using (HashAlgorithm hashAlgorithm = new HMACSHA256(key))
|
||||||
{
|
{
|
||||||
byte[] buffer = Encoding.UTF8.GetBytes(data);
|
return hashAlgorithm.ComputeHash(data);
|
||||||
return Convert.ToBase64String(hashAlgorithm.ComputeHash(buffer));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -201,9 +204,14 @@ private string BytesToHex(byte[] bytes)
|
||||||
return sb.ToString();
|
return sb.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
private string StringToHex(string text)
|
private string CreateQueryString(Dictionary<string, string> args)
|
||||||
{
|
{
|
||||||
return BytesToHex(Encoding.UTF8.GetBytes(text));
|
if (args != null && args.Count > 0)
|
||||||
|
{
|
||||||
|
return string.Join("&", args.Select(x => x.Key + "=" + URLHelpers.URLEncode(x.Value)).ToArray());
|
||||||
|
}
|
||||||
|
|
||||||
|
return "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in a new issue