mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-02 18:26:27 +13:00
Merge pull request #636 from alanedwardes/AmazonAuthV4
Amazon Auth V4 Support
This commit is contained in:
commit
d0be0cff95
6 changed files with 164 additions and 115 deletions
|
@ -25,81 +25,72 @@ You should have received a copy of the GNU General Public License
|
|||
|
||||
// Credits: https://github.com/alanedwardes
|
||||
|
||||
using Newtonsoft.Json;
|
||||
using ShareX.HelpersLib;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using System.Linq;
|
||||
using Amazon;
|
||||
using Amazon.S3;
|
||||
using Amazon.S3.Model;
|
||||
using Amazon.Runtime;
|
||||
using System.Collections.Specialized;
|
||||
|
||||
namespace ShareX.UploadersLib.FileUploaders
|
||||
{
|
||||
{
|
||||
public sealed class AmazonS3 : FileUploader
|
||||
{
|
||||
private AmazonS3Settings S3Settings { get; set; }
|
||||
private AmazonS3Settings s3Settings { get; set; }
|
||||
|
||||
public AmazonS3(AmazonS3Settings accessKeys)
|
||||
private static readonly AmazonS3Region UnknownEndpoint = new AmazonS3Region("Unknown Endpoint");
|
||||
private static readonly AmazonS3Region DreamObjectsEndpoint = new AmazonS3Region("DreamObjects", "dreamobjects", "objects.dreamhost.com");
|
||||
|
||||
private static IList<AmazonS3Region> regionEndpoints = new List<AmazonS3Region>();
|
||||
|
||||
public static IEnumerable<AmazonS3Region> RegionEndpoints
|
||||
{
|
||||
S3Settings = accessKeys;
|
||||
get
|
||||
{
|
||||
if (!regionEndpoints.Any())
|
||||
{
|
||||
regionEndpoints.Add(UnknownEndpoint);
|
||||
RegionEndpoint.EnumerableAllRegions.Select(r => new AmazonS3Region(r)).ForEach(regionEndpoints.Add);
|
||||
regionEndpoints.Add(DreamObjectsEndpoint);
|
||||
}
|
||||
|
||||
return regionEndpoints;
|
||||
}
|
||||
}
|
||||
|
||||
public AmazonS3(AmazonS3Settings s3Settings)
|
||||
{
|
||||
this.s3Settings = s3Settings;
|
||||
}
|
||||
|
||||
private string GetObjectStorageClass()
|
||||
{
|
||||
return S3Settings.UseReducedRedundancyStorage ? "REDUCED_REDUNDANCY" : "STANDARD";
|
||||
}
|
||||
|
||||
// Helper class to construct the S3 policy document (below)
|
||||
private class S3PolicyCondition : Dictionary<string, string>
|
||||
{
|
||||
public S3PolicyCondition(string key, string value)
|
||||
{
|
||||
Add(key, value);
|
||||
}
|
||||
}
|
||||
|
||||
private string GetPolicyDocument(string fileName, string objectKey)
|
||||
{
|
||||
var policyDocument = new
|
||||
{
|
||||
expiration = DateTime.UtcNow.AddDays(2).ToString("yyyy-MM-ddTHH:mm:ssZ"), // The policy is valid for 2 days
|
||||
conditions = new List<S3PolicyCondition> {
|
||||
new S3PolicyCondition("acl", "public-read"),
|
||||
new S3PolicyCondition("bucket", S3Settings.Bucket),
|
||||
new S3PolicyCondition("Content-Type", Helpers.GetMimeType(fileName)),
|
||||
new S3PolicyCondition("key", objectKey),
|
||||
new S3PolicyCondition("x-amz-storage-class", GetObjectStorageClass())
|
||||
}
|
||||
};
|
||||
|
||||
return JsonConvert.SerializeObject(policyDocument);
|
||||
return s3Settings.UseReducedRedundancyStorage ? "REDUCED_REDUNDANCY" : "STANDARD";
|
||||
}
|
||||
|
||||
public static AmazonS3Region GetCurrentRegion(AmazonS3Settings s3Settings)
|
||||
{
|
||||
return RegionEndpoints.SingleOrDefault(r => r.Identifier == s3Settings.Endpoint) ?? UnknownEndpoint;
|
||||
}
|
||||
|
||||
private string GetEndpoint()
|
||||
{
|
||||
return string.Format("{0}{1}", S3Settings.Endpoint, S3Settings.Bucket);
|
||||
{
|
||||
return URLHelpers.CombineURL("https://" + GetCurrentRegion(s3Settings).Hostname, s3Settings.Bucket);
|
||||
}
|
||||
|
||||
// http://codeonaboat.wordpress.com/2011/04/22/uploading-a-file-to-amazon-s3-using-an-asp-net-mvc-application-directly-from-the-users-browser/
|
||||
private string CreateSignature(string secretKey, byte[] policyBytes)
|
||||
private AWSCredentials GetCurrentCredentials()
|
||||
{
|
||||
ASCIIEncoding encoding = new ASCIIEncoding();
|
||||
string base64Policy = Convert.ToBase64String(policyBytes);
|
||||
byte[] secretKeyBytes = encoding.GetBytes(secretKey);
|
||||
|
||||
byte[] signatureBytes;
|
||||
using (HMACSHA1 hmacsha1 = new HMACSHA1(secretKeyBytes))
|
||||
{
|
||||
byte[] base64PolicyBytes = encoding.GetBytes(base64Policy);
|
||||
signatureBytes = hmacsha1.ComputeHash(base64PolicyBytes);
|
||||
}
|
||||
|
||||
return Convert.ToBase64String(signatureBytes);
|
||||
return new BasicAWSCredentials(s3Settings.AccessKeyID, s3Settings.SecretAccessKey);
|
||||
}
|
||||
|
||||
private string GetObjectKey(string fileName)
|
||||
{
|
||||
string objectPrefix = NameParser.Parse(NameParserType.FolderPath, S3Settings.ObjectPrefix.Trim('/'));
|
||||
var objectPrefix = NameParser.Parse(NameParserType.FolderPath, s3Settings.ObjectPrefix.Trim('/'));
|
||||
return URLHelpers.CombineURL(objectPrefix, fileName);
|
||||
}
|
||||
|
||||
|
@ -108,27 +99,23 @@ private string GetObjectURL(string objectName)
|
|||
objectName = objectName.Trim('/');
|
||||
objectName = URLHelpers.URLPathEncode(objectName);
|
||||
|
||||
string url = string.Empty;
|
||||
|
||||
if (S3Settings.UseCustomCNAME)
|
||||
if (s3Settings.UseCustomCNAME)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(S3Settings.CustomDomain))
|
||||
string url;
|
||||
|
||||
if (!string.IsNullOrEmpty(s3Settings.CustomDomain))
|
||||
{
|
||||
url = URLHelpers.CombineURL(S3Settings.CustomDomain, objectName);
|
||||
url = URLHelpers.CombineURL(s3Settings.CustomDomain, objectName);
|
||||
}
|
||||
else
|
||||
{
|
||||
url = URLHelpers.CombineURL(S3Settings.Bucket, objectName);
|
||||
url = URLHelpers.CombineURL(s3Settings.Bucket, objectName);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
url = URLHelpers.CombineURL(GetEndpoint(), objectName);
|
||||
|
||||
return URLHelpers.FixPrefix(url);
|
||||
}
|
||||
|
||||
url = URLHelpers.FixPrefix(url);
|
||||
|
||||
return url;
|
||||
return URLHelpers.CombineURL(GetEndpoint(), objectName);
|
||||
}
|
||||
|
||||
public string GetURL(string fileName)
|
||||
|
@ -136,41 +123,99 @@ public string GetURL(string fileName)
|
|||
return GetObjectURL(GetObjectKey(fileName));
|
||||
}
|
||||
|
||||
private Dictionary<string, string> GetParameters(string fileName, string objectKey)
|
||||
public string GetMd5Hash(Stream stream)
|
||||
{
|
||||
string policyDocument = GetPolicyDocument(fileName, objectKey);
|
||||
byte[] policyBytes = Encoding.ASCII.GetBytes(policyDocument);
|
||||
string signature = CreateSignature(S3Settings.SecretAccessKey, policyBytes);
|
||||
|
||||
Dictionary<string, string> parameters = new Dictionary<string, string>();
|
||||
parameters.Add("key", objectKey);
|
||||
parameters.Add("acl", "public-read");
|
||||
parameters.Add("content-type", Helpers.GetMimeType(fileName));
|
||||
parameters.Add("AWSAccessKeyId", S3Settings.AccessKeyID);
|
||||
parameters.Add("policy", Convert.ToBase64String(policyBytes));
|
||||
parameters.Add("signature", signature);
|
||||
parameters.Add("x-amz-storage-class", GetObjectStorageClass());
|
||||
return parameters;
|
||||
stream.Seek(0, SeekOrigin.Begin);
|
||||
using (var md5 = MD5.Create())
|
||||
{
|
||||
return string.Concat(md5.ComputeHash(stream).Select(b => b.ToString("x2")));
|
||||
}
|
||||
}
|
||||
|
||||
public override UploadResult Upload(Stream stream, string fileName)
|
||||
{
|
||||
if (string.IsNullOrEmpty(S3Settings.AccessKeyID)) throw new Exception("'Access Key' must not be empty.");
|
||||
if (string.IsNullOrEmpty(S3Settings.SecretAccessKey)) throw new Exception("'Secret Access Key' must not be empty.");
|
||||
if (string.IsNullOrEmpty(S3Settings.Endpoint)) throw new Exception("'Endpoint' must not be emoty.");
|
||||
if (string.IsNullOrEmpty(S3Settings.Bucket)) throw new Exception("'Bucket' must not be empty.");
|
||||
if (string.IsNullOrEmpty(s3Settings.AccessKeyID)) throw new Exception("'Access Key' must not be empty.");
|
||||
if (string.IsNullOrEmpty(s3Settings.SecretAccessKey)) throw new Exception("'Secret Access Key' must not be empty.");
|
||||
if (string.IsNullOrEmpty(s3Settings.Bucket)) throw new Exception("'Bucket' must not be empty.");
|
||||
if (GetCurrentRegion(s3Settings) == UnknownEndpoint) throw new Exception("Please select an endpoint.");
|
||||
|
||||
string objectKey = GetObjectKey(fileName);
|
||||
var region = GetCurrentRegion(s3Settings);
|
||||
|
||||
UploadResult uploadResult = UploadData(stream, GetEndpoint(), fileName, arguments: GetParameters(fileName, objectKey), responseType: ResponseType.Headers);
|
||||
var s3ClientConfig = new AmazonS3Config();
|
||||
|
||||
if (uploadResult.IsSuccess)
|
||||
if (region.AmazonRegion == null)
|
||||
{
|
||||
uploadResult.URL = GetObjectURL(objectKey);
|
||||
s3ClientConfig.ServiceURL = "https://" + region.Hostname;
|
||||
}
|
||||
else
|
||||
{
|
||||
s3ClientConfig.RegionEndpoint = region.AmazonRegion;
|
||||
}
|
||||
|
||||
using (var client = new AmazonS3Client(GetCurrentCredentials(), s3ClientConfig))
|
||||
{
|
||||
var putRequest = new GetPreSignedUrlRequest
|
||||
{
|
||||
BucketName = s3Settings.Bucket,
|
||||
Key = GetObjectKey(fileName),
|
||||
Verb = HttpVerb.PUT,
|
||||
Expires = DateTime.UtcNow.AddMinutes(5),
|
||||
ContentType = Helpers.GetMimeType(fileName)
|
||||
};
|
||||
|
||||
return uploadResult;
|
||||
var requestHeaders = new NameValueCollection();
|
||||
requestHeaders["x-amz-acl"] = "public-read";
|
||||
requestHeaders["x-amz-storage-class"] = GetObjectStorageClass();
|
||||
|
||||
putRequest.Headers["x-amz-acl"] = "public-read";
|
||||
putRequest.Headers["x-amz-storage-class"] = GetObjectStorageClass();
|
||||
|
||||
var responseHeaders = SendRequestStreamGetHeaders(client.GetPreSignedURL(putRequest), stream, Helpers.GetMimeType(fileName), requestHeaders, method: HttpMethod.PUT);
|
||||
var eTag = responseHeaders["ETag"].Replace("\"", "");
|
||||
|
||||
var uploadResult = new UploadResult();
|
||||
|
||||
if (GetMd5Hash(stream) == eTag)
|
||||
{
|
||||
uploadResult.IsSuccess = true;
|
||||
uploadResult.URL = GetObjectURL(putRequest.Key);
|
||||
}
|
||||
else
|
||||
{
|
||||
uploadResult.Errors = new List<string> { "Uploaded file is different." };
|
||||
}
|
||||
|
||||
return uploadResult;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class AmazonS3Region
|
||||
{
|
||||
public AmazonS3Region(string name)
|
||||
{
|
||||
Name = name;
|
||||
}
|
||||
|
||||
public AmazonS3Region(string name, string identifier, string hostname)
|
||||
{
|
||||
Name = name;
|
||||
Identifier = identifier;
|
||||
Hostname = hostname;
|
||||
}
|
||||
|
||||
public AmazonS3Region(RegionEndpoint region)
|
||||
{
|
||||
Name = region.DisplayName;
|
||||
Identifier = region.SystemName;
|
||||
AmazonRegion = region;
|
||||
Hostname = region.GetEndpointForService("s3").Hostname;
|
||||
}
|
||||
|
||||
public string Name { get; private set; }
|
||||
public string Identifier { get; private set; }
|
||||
public RegionEndpoint AmazonRegion { get; private set; }
|
||||
public string Hostname { get; private set; }
|
||||
}
|
||||
|
||||
public class AmazonS3Settings
|
||||
|
|
|
@ -1679,22 +1679,11 @@ private void InitializeComponent()
|
|||
//
|
||||
// cbAmazonS3Endpoint
|
||||
//
|
||||
this.cbAmazonS3Endpoint.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.cbAmazonS3Endpoint.FormattingEnabled = true;
|
||||
this.cbAmazonS3Endpoint.Items.AddRange(new object[] {
|
||||
resources.GetString("cbAmazonS3Endpoint.Items"),
|
||||
resources.GetString("cbAmazonS3Endpoint.Items1"),
|
||||
resources.GetString("cbAmazonS3Endpoint.Items2"),
|
||||
resources.GetString("cbAmazonS3Endpoint.Items3"),
|
||||
resources.GetString("cbAmazonS3Endpoint.Items9"),
|
||||
resources.GetString("cbAmazonS3Endpoint.Items4"),
|
||||
resources.GetString("cbAmazonS3Endpoint.Items5"),
|
||||
resources.GetString("cbAmazonS3Endpoint.Items6"),
|
||||
resources.GetString("cbAmazonS3Endpoint.Items7"),
|
||||
resources.GetString("cbAmazonS3Endpoint.Items8")});
|
||||
resources.ApplyResources(this.cbAmazonS3Endpoint, "cbAmazonS3Endpoint");
|
||||
this.cbAmazonS3Endpoint.Name = "cbAmazonS3Endpoint";
|
||||
this.cbAmazonS3Endpoint.SelectionChangeCommitted += new System.EventHandler(this.cbAmazonS3Endpoint_SelectionChangeCommitted);
|
||||
this.cbAmazonS3Endpoint.TextChanged += new System.EventHandler(this.cbAmazonS3Endpoint_TextChanged);
|
||||
//
|
||||
// lblAmazonS3BucketName
|
||||
//
|
||||
|
|
|
@ -23,6 +23,11 @@ You should have received a copy of the GNU General Public License
|
|||
|
||||
#endregion License Information (GPL v3)
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Windows.Forms;
|
||||
using CG.Web.MegaApiClient;
|
||||
using ShareX.HelpersLib;
|
||||
using ShareX.UploadersLib.FileUploaders;
|
||||
|
@ -30,11 +35,6 @@ You should have received a copy of the GNU General Public License
|
|||
using ShareX.UploadersLib.ImageUploaders;
|
||||
using ShareX.UploadersLib.Properties;
|
||||
using ShareX.UploadersLib.TextUploaders;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace ShareX.UploadersLib
|
||||
{
|
||||
|
@ -509,17 +509,20 @@ public void LoadSettings(UploadersConfig uploadersConfig)
|
|||
}
|
||||
}
|
||||
|
||||
// Amazon S3
|
||||
|
||||
// Amazon S3
|
||||
|
||||
txtAmazonS3AccessKey.Text = Config.AmazonS3Settings.AccessKeyID;
|
||||
txtAmazonS3SecretKey.Text = Config.AmazonS3Settings.SecretAccessKey;
|
||||
cbAmazonS3Endpoint.Text = Config.AmazonS3Settings.Endpoint;
|
||||
txtAmazonS3BucketName.Text = Config.AmazonS3Settings.Bucket;
|
||||
txtAmazonS3ObjectPrefix.Text = Config.AmazonS3Settings.ObjectPrefix;
|
||||
cbAmazonS3CustomCNAME.Checked = Config.AmazonS3Settings.UseCustomCNAME;
|
||||
txtAmazonS3CustomDomain.Enabled = Config.AmazonS3Settings.UseCustomCNAME;
|
||||
txtAmazonS3CustomDomain.Text = Config.AmazonS3Settings.CustomDomain;
|
||||
cbAmazonS3UseRRS.Checked = Config.AmazonS3Settings.UseReducedRedundancyStorage;
|
||||
cbAmazonS3UseRRS.Checked = Config.AmazonS3Settings.UseReducedRedundancyStorage;
|
||||
|
||||
cbAmazonS3Endpoint.Items.AddRange(AmazonS3.RegionEndpoints.ToArray());
|
||||
cbAmazonS3Endpoint.SelectedItem = AmazonS3.GetCurrentRegion(Config.AmazonS3Settings);
|
||||
cbAmazonS3Endpoint.DisplayMember = "Name";
|
||||
UpdateAmazonS3Status();
|
||||
|
||||
// ownCloud
|
||||
|
@ -1781,14 +1784,13 @@ private void txtAmazonS3SecretKey_TextChanged(object sender, EventArgs e)
|
|||
}
|
||||
|
||||
private void cbAmazonS3Endpoint_SelectionChangeCommitted(object sender, EventArgs e)
|
||||
{
|
||||
Config.AmazonS3Settings.Endpoint = cbAmazonS3Endpoint.Text;
|
||||
}
|
||||
|
||||
private void cbAmazonS3Endpoint_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
Config.AmazonS3Settings.Endpoint = cbAmazonS3Endpoint.Text;
|
||||
UpdateAmazonS3Status();
|
||||
{
|
||||
var region = cbAmazonS3Endpoint.SelectedItem as AmazonS3Region;
|
||||
if (region != null)
|
||||
{
|
||||
Config.AmazonS3Settings.Endpoint = region.Identifier;
|
||||
UpdateAmazonS3Status();
|
||||
}
|
||||
}
|
||||
|
||||
private void txtAmazonS3BucketName_TextChanged(object sender, EventArgs e)
|
||||
|
|
|
@ -68,6 +68,9 @@
|
|||
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="AWSSDK">
|
||||
<HintPath>..\packages\AWSSDK.2.3.32.0\lib\net35\AWSSDK.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="MegaApiClient, Version=1.0.4.0, Culture=neutral, PublicKeyToken=0480d311efbeb4e2, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\packages\MegaApiClient.1.0.4\lib\MegaApiClient.dll</HintPath>
|
||||
|
|
|
@ -251,6 +251,15 @@ protected string SendRequestStream(string url, Stream stream, string contentType
|
|||
{
|
||||
return ResponseToString(response);
|
||||
}
|
||||
}
|
||||
|
||||
protected NameValueCollection SendRequestStreamGetHeaders(string url, Stream stream, string contentType, NameValueCollection headers = null,
|
||||
CookieCollection cookies = null, HttpMethod method = HttpMethod.POST)
|
||||
{
|
||||
using (HttpWebResponse response = GetResponse(url, stream, null, contentType, headers, cookies, method))
|
||||
{
|
||||
return response.Headers;
|
||||
}
|
||||
}
|
||||
|
||||
private HttpWebResponse SendRequestMultiPart(string url, Dictionary<string, string> arguments, NameValueCollection headers = null,
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="AWSSDK" version="2.3.32.0" targetFramework="net40" />
|
||||
<package id="MegaApiClient" version="1.0.4" targetFramework="net40" />
|
||||
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net40" />
|
||||
<package id="SSH.NET" version="2014.4.6-beta1" targetFramework="net40" />
|
||||
|
|
Loading…
Reference in a new issue