mirror of
https://github.com/ShareX/ShareX.git
synced 2024-06-28 11:10:23 +12:00
Remove current Amazon S3 implementation
This commit is contained in:
Jaex
parent
cd81629e32
commit
05400bf552
|
|
@ -1,226 +0,0 @@
|
|||
#region License Information (GPL v3)
|
||||
|
||||
/*
|
||||
ShareX - A program that allows you to take screenshots and share any file type
|
||||
Copyright (c) 2007-2017 ShareX Team
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
as published by the Free Software Foundation; either version 2
|
||||
of the License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
Optionally you can also view the license at <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#endregion License Information (GPL v3)
|
||||
|
||||
// Credits: https://github.com/alanedwardes
|
||||
|
||||
using Amazon;
|
||||
using Amazon.Runtime;
|
||||
using Amazon.S3;
|
||||
using Amazon.S3.Model;
|
||||
using ShareX.HelpersLib;
|
||||
using ShareX.UploadersLib.Properties;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Specialized;
|
||||
using System.Drawing;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Security.Cryptography;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace ShareX.UploadersLib.FileUploaders
|
||||
{
|
||||
public class AmazonS3FileUploaderService : FileUploaderService
|
||||
{
|
||||
public override FileDestination EnumValue { get; } = FileDestination.AmazonS3;
|
||||
|
||||
public override Icon ServiceIcon => Resources.AmazonS3;
|
||||
|
||||
public override bool CheckConfig(UploadersConfig config)
|
||||
{
|
||||
return config.AmazonS3Settings != null && !string.IsNullOrEmpty(config.AmazonS3Settings.AccessKeyID) &&
|
||||
!string.IsNullOrEmpty(config.AmazonS3Settings.SecretAccessKey) && !string.IsNullOrEmpty(config.AmazonS3Settings.Bucket) &&
|
||||
AmazonS3.GetCurrentRegion(config.AmazonS3Settings) != AmazonS3.UnknownEndpoint;
|
||||
}
|
||||
|
||||
public override GenericUploader CreateUploader(UploadersConfig config, TaskReferenceHelper taskInfo)
|
||||
{
|
||||
return new AmazonS3(config.AmazonS3Settings);
|
||||
}
|
||||
|
||||
public override TabPage GetUploadersConfigTabPage(UploadersConfigForm form) => form.tpAmazonS3;
|
||||
}
|
||||
|
||||
public sealed class AmazonS3 : FileUploader
|
||||
{
|
||||
public static readonly AmazonS3Region UnknownEndpoint = new AmazonS3Region("Unknown Endpoint");
|
||||
public static readonly AmazonS3Region DreamObjectsEndpoint = new AmazonS3Region("DreamObjects", "dreamobjects", "objects-us-west-1.dream.io");
|
||||
|
||||
private static IList<AmazonS3Region> regionEndpoints = new List<AmazonS3Region>();
|
||||
|
||||
public static IEnumerable<AmazonS3Region> RegionEndpoints
|
||||
{
|
||||
get
|
||||
{
|
||||
if (!regionEndpoints.Any())
|
||||
{
|
||||
regionEndpoints.Add(UnknownEndpoint);
|
||||
RegionEndpoint.EnumerableAllRegions.Select(r => new AmazonS3Region(r)).ForEach(regionEndpoints.Add);
|
||||
regionEndpoints.Add(DreamObjectsEndpoint);
|
||||
}
|
||||
|
||||
return regionEndpoints;
|
||||
}
|
||||
}
|
||||
|
||||
private AmazonS3Settings s3Settings { get; set; }
|
||||
|
||||
public AmazonS3(AmazonS3Settings s3Settings)
|
||||
{
|
||||
this.s3Settings = s3Settings;
|
||||
}
|
||||
|
||||
private string GetObjectStorageClass()
|
||||
{
|
||||
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 URLHelpers.ForcePrefix(URLHelpers.CombineURL(GetCurrentRegion(s3Settings).Hostname, s3Settings.Bucket));
|
||||
}
|
||||
|
||||
private AWSCredentials GetCurrentCredentials()
|
||||
{
|
||||
return new BasicAWSCredentials(s3Settings.AccessKeyID, s3Settings.SecretAccessKey);
|
||||
}
|
||||
|
||||
private string GetObjectKey(string fileName)
|
||||
{
|
||||
string objectPrefix = NameParser.Parse(NameParserType.FolderPath, s3Settings.ObjectPrefix.Trim('/'));
|
||||
return URLHelpers.CombineURL(objectPrefix, fileName);
|
||||
}
|
||||
|
||||
private string GetObjectURL(string objectName)
|
||||
{
|
||||
objectName = objectName.Trim('/');
|
||||
objectName = URLHelpers.URLPathEncode(objectName);
|
||||
|
||||
if (s3Settings.UseCustomCNAME)
|
||||
{
|
||||
string url;
|
||||
|
||||
if (!string.IsNullOrEmpty(s3Settings.CustomDomain))
|
||||
{
|
||||
url = URLHelpers.CombineURL(s3Settings.CustomDomain, objectName);
|
||||
}
|
||||
else
|
||||
{
|
||||
url = URLHelpers.CombineURL(s3Settings.Bucket, objectName);
|
||||
}
|
||||
|
||||
return URLHelpers.FixPrefix(url);
|
||||
}
|
||||
|
||||
return URLHelpers.CombineURL(GetEndpoint(), objectName);
|
||||
}
|
||||
|
||||
public string GetURL(string fileName)
|
||||
{
|
||||
return GetObjectURL(GetObjectKey(fileName));
|
||||
}
|
||||
|
||||
public string GetMd5Hash(Stream stream)
|
||||
{
|
||||
stream.Seek(0, SeekOrigin.Begin);
|
||||
using (MD5 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)) Errors.Add("'Access Key' must not be empty.");
|
||||
if (string.IsNullOrEmpty(s3Settings.SecretAccessKey)) Errors.Add("'Secret Access Key' must not be empty.");
|
||||
if (string.IsNullOrEmpty(s3Settings.Bucket)) Errors.Add("'Bucket' must not be empty.");
|
||||
if (GetCurrentRegion(s3Settings) == UnknownEndpoint) Errors.Add("Please select an endpoint.");
|
||||
|
||||
if (IsError)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
AmazonS3Region region = GetCurrentRegion(s3Settings);
|
||||
|
||||
AmazonS3Config s3ClientConfig = new AmazonS3Config();
|
||||
|
||||
if (region.AmazonRegion == null)
|
||||
{
|
||||
s3ClientConfig.ServiceURL = URLHelpers.ForcePrefix(region.Hostname);
|
||||
}
|
||||
else
|
||||
{
|
||||
s3ClientConfig.RegionEndpoint = region.AmazonRegion;
|
||||
}
|
||||
|
||||
using (AmazonS3Client client = new AmazonS3Client(GetCurrentCredentials(), s3ClientConfig))
|
||||
{
|
||||
GetPreSignedUrlRequest putRequest = new GetPreSignedUrlRequest
|
||||
{
|
||||
BucketName = s3Settings.Bucket,
|
||||
Key = GetObjectKey(fileName),
|
||||
Verb = HttpVerb.PUT,
|
||||
Expires = DateTime.UtcNow.AddMinutes(5),
|
||||
ContentType = Helpers.GetMimeType(fileName)
|
||||
};
|
||||
|
||||
NameValueCollection 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();
|
||||
|
||||
NameValueCollection responseHeaders = SendRequestGetHeaders(HttpMethod.PUT, client.GetPreSignedURL(putRequest), stream, Helpers.GetMimeType(fileName), null, requestHeaders);
|
||||
if (responseHeaders == null || responseHeaders.Count == 0)
|
||||
{
|
||||
Errors.Add("Upload to Amazon S3 failed. Check your access credentials.");
|
||||
return null;
|
||||
}
|
||||
|
||||
string eTag = responseHeaders.Get("ETag");
|
||||
if (eTag == null)
|
||||
{
|
||||
Errors.Add("Upload to Amazon S3 failed.");
|
||||
return null;
|
||||
}
|
||||
|
||||
if (GetMd5Hash(stream) == eTag.Replace("\"", ""))
|
||||
{
|
||||
return new UploadResult { IsSuccess = true, URL = GetObjectURL(putRequest.Key) };
|
||||
}
|
||||
|
||||
Errors.Add("Upload to Amazon S3 failed, uploaded data did not match.");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
#region License Information (GPL v3)
|
||||
|
||||
/*
|
||||
ShareX - A program that allows you to take screenshots and share any file type
|
||||
Copyright (c) 2007-2017 ShareX Team
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
as published by the Free Software Foundation; either version 2
|
||||
of the License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
Optionally you can also view the license at <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#endregion License Information (GPL v3)
|
||||
|
||||
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; }
|
||||
}
|
||||
}
|
||||
|
|
@ -523,8 +523,8 @@ public void LoadSettings()
|
|||
txtAmazonS3CustomDomain.Text = Config.AmazonS3Settings.CustomDomain;
|
||||
cbAmazonS3UseRRS.Checked = Config.AmazonS3Settings.UseReducedRedundancyStorage;
|
||||
|
||||
cbAmazonS3Endpoint.Items.AddRange(AmazonS3.RegionEndpoints.ToArray());
|
||||
cbAmazonS3Endpoint.SelectedItem = AmazonS3.GetCurrentRegion(Config.AmazonS3Settings);
|
||||
//cbAmazonS3Endpoint.Items.AddRange(AmazonS3.RegionEndpoints.ToArray());
|
||||
//cbAmazonS3Endpoint.SelectedItem = AmazonS3.GetCurrentRegion(Config.AmazonS3Settings);
|
||||
cbAmazonS3Endpoint.DisplayMember = "Name";
|
||||
UpdateAmazonS3Status();
|
||||
|
||||
|
|
@ -1977,12 +1977,12 @@ private void txtAmazonS3SecretKey_TextChanged(object sender, EventArgs e)
|
|||
|
||||
private void cbAmazonS3Endpoint_SelectionChangeCommitted(object sender, EventArgs e)
|
||||
{
|
||||
AmazonS3Region region = cbAmazonS3Endpoint.SelectedItem as AmazonS3Region;
|
||||
/*AmazonS3Region region = cbAmazonS3Endpoint.SelectedItem as AmazonS3Region;
|
||||
if (region != null)
|
||||
{
|
||||
Config.AmazonS3Settings.Endpoint = region.Identifier;
|
||||
UpdateAmazonS3Status();
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
private void txtAmazonS3BucketName_TextChanged(object sender, EventArgs e)
|
||||
|
|
|
|||
|
|
@ -528,7 +528,7 @@ private void UpdateDropboxStatus()
|
|||
|
||||
private void UpdateAmazonS3Status()
|
||||
{
|
||||
lblAmazonS3PathPreview.Text = new AmazonS3(Config.AmazonS3Settings).GetURL("Example.png");
|
||||
//lblAmazonS3PathPreview.Text = new AmazonS3(Config.AmazonS3Settings).GetURL("Example.png");
|
||||
}
|
||||
|
||||
#endregion Amazon S3
|
||||
|
|
|
|||
|
|
@ -78,14 +78,6 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\AWSSDK.Core.3.3.8.1\lib\net35\AWSSDK.Core.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="AWSSDK.S3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\AWSSDK.S3.3.3.5.6\lib\net35\AWSSDK.S3.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="MegaApiClient, Version=1.3.1.269, Culture=neutral, PublicKeyToken=0480d311efbeb4e2, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\MegaApiClient.1.3.1\lib\net40\MegaApiClient.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
|
|
@ -122,7 +114,6 @@
|
|||
<Compile Include="BaseServices\IGenericUploaderService.cs" />
|
||||
<Compile Include="BaseServices\IUploaderService.cs" />
|
||||
<Compile Include="BaseUploaders\GenericUploader.cs" />
|
||||
<Compile Include="FileUploaders\AmazonS3Region.cs" />
|
||||
<Compile Include="FileUploaders\AmazonS3Settings.cs" />
|
||||
<Compile Include="FileUploaders\AzureStorage.cs" />
|
||||
<Compile Include="FileUploaders\AzureStorageSettings.cs" />
|
||||
|
|
@ -137,7 +128,6 @@
|
|||
<Compile Include="FileUploaders\Copy.cs" />
|
||||
<Compile Include="FileUploaders\Email.cs" />
|
||||
<Compile Include="FileUploaders\Ge_tt.cs" />
|
||||
<Compile Include="FileUploaders\AmazonS3.cs" />
|
||||
<Compile Include="FileUploaders\GoogleDrive.cs" />
|
||||
<Compile Include="FileUploaders\Jira.cs" />
|
||||
<Compile Include="FileUploaders\Hostr.cs" />
|
||||
|
|
@ -887,9 +877,6 @@
|
|||
<None Include="Favicons\Plik.ico" />
|
||||
<Content Include="Favicons\Uplea.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Analyzer Include="..\packages\AWSSDK.S3.3.3.5.6\analyzers\dotnet\cs\AWSSDK.S3.CodeAnalysis.dll" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="AWSSDK.Core" version="3.3.8.1" targetFramework="net40" />
|
||||
<package id="AWSSDK.S3" version="3.3.5.6" targetFramework="net40" />
|
||||
<package id="MegaApiClient" version="1.3.1" targetFramework="net40" />
|
||||
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
|
||||
<package id="SSH.NET" version="2014.4.6-beta2" targetFramework="net40" />
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 14
|
||||
VisualStudioVersion = 14.0.25420.1
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.26228.4
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShareX", "ShareX\ShareX.csproj", "{C5AE4585-E9EC-4FA3-B75A-E1210635ACB6}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
|
|
|
|||
Loading…
Reference in a new issue