CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-04 04:06:05 +13:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #682 from alanedwardes/S3Refactoring

Browse source 
Made Amazon S3 uploader more robust, additional error handling. Moved classes to their own files.
This commit is contained in:
Jaex 2015-05-14 01:57:42 +03:00
commit 18a9f85cfa
5 changed files with 79 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
ShareX.UploadersLib/FileUploaders/AmazonS3.cs
View file

@ -134,10 +134,17 @@ public string GetMd5Hash(Stream stream)
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.Bucket)) throw new Exception("'Bucket' must not be empty.");
if (GetCurrentRegion(s3Settings) == UnknownEndpoint) throw new Exception("Please select an endpoint.");
var validationErrors = new List<string>();
if (string.IsNullOrEmpty(s3Settings.AccessKeyID)) validationErrors.Add("'Access Key' must not be empty.");
if (string.IsNullOrEmpty(s3Settings.SecretAccessKey)) validationErrors.Add("'Secret Access Key' must not be empty.");
if (string.IsNullOrEmpty(s3Settings.Bucket)) validationErrors.Add("'Bucket' must not be empty.");
if (GetCurrentRegion(s3Settings) == UnknownEndpoint) validationErrors.Add("Please select an endpoint.");
if (validationErrors.Any())
{
return new UploadResult { Errors = validationErrors };
}
var region = GetCurrentRegion(s3Settings);
@ -171,62 +178,24 @@ public override UploadResult Upload(Stream stream, string fileName)
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)
if (responseHeaders.Count == 0)
{
uploadResult.IsSuccess = true;
uploadResult.URL = GetObjectURL(putRequest.Key);
}
else
{
uploadResult.Errors = new List<string> { "Uploaded file is different." };
return new UploadResult { Errors = new List<string> { "Upload to Amazon S3 failed. Check your access credentials." } };
}
return uploadResult;
var eTag = responseHeaders.Get("ETag");
if (eTag == null)
{
return new UploadResult { Errors = new List<string> { "Upload to Amazon S3 failed." } };
}
if (GetMd5Hash(stream) == eTag.Replace("\"", ""))
{
return new UploadResult { IsSuccess = true, URL = GetObjectURL(putRequest.Key) };
}
return new UploadResult { Errors = new List<string> { "Upload to Amazon S3 failed, uploaded data did not match." } };
}
}
}
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
{
public string AccessKeyID { get; set; }
public string SecretAccessKey { get; set; }
public string Endpoint { get; set; }
public string Bucket { get; set; }
public string ObjectPrefix { get; set; }
public bool UseCustomCNAME { get; set; }
public string CustomDomain { get; set; }
public bool UseReducedRedundancyStorage { get; set; }
}
}

32
ShareX.UploadersLib/FileUploaders/AmazonS3Region.cs Normal file
View file

@ -0,0 +1,32 @@
using Amazon;
namespace ShareX.UploadersLib.FileUploaders
{
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; }
}
}

14
ShareX.UploadersLib/FileUploaders/AmazonS3Settings.cs Normal file
View file

@ -0,0 +1,14 @@
namespace ShareX.UploadersLib.FileUploaders
{
public class AmazonS3Settings
{
public string AccessKeyID { get; set; }
public string SecretAccessKey { get; set; }
public string Endpoint { get; set; }
public string Bucket { get; set; }
public string ObjectPrefix { get; set; }
public bool UseCustomCNAME { get; set; }
public string CustomDomain { get; set; }
public bool UseReducedRedundancyStorage { get; set; }
}
}

2
ShareX.UploadersLib/ShareX.UploadersLib.csproj
View file

@ -103,6 +103,8 @@
<ItemGroup>
<Compile Include="APIKeys\APIKeys.cs" />
<Compile Include="APIKeys\APIKeysLocal.cs" />
<Compile Include="FileUploaders\AmazonS3Region.cs" />
<Compile Include="FileUploaders\AmazonS3Settings.cs" />
<Compile Include="FileUploaders\Box.cs" />
<Compile Include="FileUploaders\Lambda.cs" />
<Compile Include="FileUploaders\Copy.cs" />

7
ShareX.UploadersLib/Uploader.cs
View file

@ -258,7 +258,12 @@ protected NameValueCollection SendRequestStreamGetHeaders(string url, Stream str
{
using (HttpWebResponse response = GetResponse(url, stream, null, contentType, headers, cookies, method))
{
return response.Headers;
if (response != null)
{
return response.Headers;
}
return new NameValueCollection();
}
}