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

Allow to disable setting public ACL on S3 uploads

Browse source
This commit is contained in:
Charles Milette 2017-12-19 12:55:11 -05:00
parent 330f77d7bb
commit 303280a31a
No known key found for this signature in database
GPG key ID: 9BC74CC51CB137CE
5 changed files with 72 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -116,7 +116,10 @@ public override UploadResult Upload(Stream stream, string fileName)
NameValueCollection headers = new NameValueCollection();
headers["content-type"] = contentType;
headers["host"] = host;
headers["x-amz-acl"] = "public-read";
if (Settings.SetPublicACL)
{
headers["x-amz-acl"] = "public-read";
}
headers["x-amz-storage-class"] = Settings.StorageClass.ToString();
string signedHeaders = GetSignedHeaders(headers);

1
ShareX.UploadersLib/FileUploaders/AmazonS3Settings.cs
View file

@ -36,6 +36,7 @@ public class AmazonS3Settings
public string ObjectPrefix { get; set; }
public bool UseCustomCNAME { get; set; }
public string CustomDomain { get; set; }
public bool SetPublicACL { get; set; } = true;
public AmazonS3StorageClass StorageClass { get; set; }
}
}

10
ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs generated
View file

@ -623,6 +623,7 @@ private void InitializeComponent()
this.lblWidthHint = new System.Windows.Forms.Label();
this.ttlvMain = new ShareX.HelpersLib.TabToListView();
this.actRapidShareAccountType = new ShareX.UploadersLib.AccountTypeControl();
this.cbAmazonS3PublicACL = new System.Windows.Forms.CheckBox();
this.tpOtherUploaders.SuspendLayout();
this.tcOtherUploaders.SuspendLayout();
this.tpTwitter.SuspendLayout();
@ -2528,6 +2529,7 @@ private void InitializeComponent()
//
// tpAmazonS3
//
this.tpAmazonS3.Controls.Add(this.cbAmazonS3PublicACL);
this.tpAmazonS3.Controls.Add(this.btnAmazonS3StorageClassHelp);
this.tpAmazonS3.Controls.Add(this.lblAmazonS3StorageClass);
this.tpAmazonS3.Controls.Add(this.cbAmazonS3StorageClass);
@ -5072,6 +5074,13 @@ private void InitializeComponent()
this.actRapidShareAccountType.Name = "actRapidShareAccountType";
this.actRapidShareAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous;
//
// cbAmazonS3PublicACL
//
resources.ApplyResources(this.cbAmazonS3PublicACL, "cbAmazonS3PublicACL");
this.cbAmazonS3PublicACL.Name = "cbAmazonS3PublicACL";
this.cbAmazonS3PublicACL.UseVisualStyleBackColor = true;
this.cbAmazonS3PublicACL.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
//
// UploadersConfigForm
//
resources.ApplyResources(this, "$this");
@ -5838,5 +5847,6 @@ private void InitializeComponent()
private System.Windows.Forms.TextBox txtLithiioEmail;
private System.Windows.Forms.Label lblLithiioPassword;
private System.Windows.Forms.Label lblLithiioEmail;
private System.Windows.Forms.CheckBox cbAmazonS3PublicACL;
}
}

6
ShareX.UploadersLib/Forms/UploadersConfigForm.cs
View file

@ -587,6 +587,7 @@ public void LoadSettings()
txtAmazonS3CustomDomain.Text = Config.AmazonS3Settings.CustomDomain;
cbAmazonS3StorageClass.Items.AddRange(Helpers.GetLocalizedEnumDescriptions<AmazonS3StorageClass>());
cbAmazonS3StorageClass.SelectedIndex = (int)Config.AmazonS3Settings.StorageClass;
cbAmazonS3PublicACL.Checked = Config.AmazonS3Settings.SetPublicACL;
UpdateAmazonS3Status();
#endregion
@ -2265,6 +2266,11 @@ private void btnAmazonS3StorageClassHelp_Click(object sender, EventArgs e)
URLHelpers.OpenURL(Resources.UploadersConfigForm_AmazonS3StorageClassHelpURL);
}
private void checkBox1_CheckedChanged(object sender, EventArgs e)
{
Config.AmazonS3Settings.SetPublicACL = cbAmazonS3PublicACL.Checked;
}
#endregion Amazon S3
#region ownCloud

75
ShareX.UploadersLib/Forms/UploadersConfigForm.resx
View file

@ -171,7 +171,7 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;cbAmazonS3CustomCNAME.ZOrder" xml:space="preserve">
<value>13</value>
<value>14</value>
</data>
<data name="mbCustomUploaderDestinationType.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -6211,6 +6211,33 @@ store.book[0].title</value>
<data name="&gt;&gt;tpBox.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="cbAmazonS3PublicACL.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbAmazonS3PublicACL.Location" type="System.Drawing.Point, System.Drawing">
<value>153, 208</value>
</data>
<data name="cbAmazonS3PublicACL.Size" type="System.Drawing.Size, System.Drawing">
<value>127, 17</value>
</data>
<data name="cbAmazonS3PublicACL.TabIndex" type="System.Int32, mscorlib">
<value>25</value>
</data>
<data name="cbAmazonS3PublicACL.Text" xml:space="preserve">
<value>Set public ACL on file</value>
</data>
<data name="&gt;&gt;cbAmazonS3PublicACL.Name" xml:space="preserve">
<value>cbAmazonS3PublicACL</value>
</data>
<data name="&gt;&gt;cbAmazonS3PublicACL.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cbAmazonS3PublicACL.Parent" xml:space="preserve">
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;cbAmazonS3PublicACL.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="btnAmazonS3StorageClassHelp.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
@ -6236,7 +6263,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;btnAmazonS3StorageClassHelp.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</value>
</data>
<data name="lblAmazonS3StorageClass.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -6266,7 +6293,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;lblAmazonS3StorageClass.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="cbAmazonS3StorageClass.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 400</value>
@ -6287,7 +6314,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;cbAmazonS3StorageClass.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="cbAmazonS3UsePathStyle.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -6317,7 +6344,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;cbAmazonS3UsePathStyle.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="lblAmazonS3Endpoint.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -6347,7 +6374,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;lblAmazonS3Endpoint.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="txtAmazonS3Endpoint.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 176</value>
@ -6368,7 +6395,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;txtAmazonS3Endpoint.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="lblAmazonS3Region.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -6398,7 +6425,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;lblAmazonS3Region.ZOrder" xml:space="preserve">
<value>6</value>
<value>7</value>
</data>
<data name="txtAmazonS3Region.Location" type="System.Drawing.Point, System.Drawing">
<value>376, 176</value>
@ -6419,7 +6446,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;txtAmazonS3Region.ZOrder" xml:space="preserve">
<value>7</value>
<value>8</value>
</data>
<data name="txtAmazonS3CustomDomain.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 352</value>
@ -6440,7 +6467,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;txtAmazonS3CustomDomain.ZOrder" xml:space="preserve">
<value>8</value>
<value>9</value>
</data>
<data name="lblAmazonS3PathPreviewLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -6470,7 +6497,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;lblAmazonS3PathPreviewLabel.ZOrder" xml:space="preserve">
<value>9</value>
<value>10</value>
</data>
<data name="lblAmazonS3PathPreview.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -6500,7 +6527,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;lblAmazonS3PathPreview.ZOrder" xml:space="preserve">
<value>10</value>
<value>11</value>
</data>
<data name="btnAmazonS3BucketNameOpen.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -6527,7 +6554,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;btnAmazonS3BucketNameOpen.ZOrder" xml:space="preserve">
<value>11</value>
<value>12</value>
</data>
<data name="btnAmazonS3AccessKeyOpen.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -6554,7 +6581,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;btnAmazonS3AccessKeyOpen.ZOrder" xml:space="preserve">
<value>12</value>
<value>13</value>
</data>
<data name="cbAmazonS3Endpoints.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 128</value>
@ -6575,7 +6602,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;cbAmazonS3Endpoints.ZOrder" xml:space="preserve">
<value>14</value>
<value>15</value>
</data>
<data name="lblAmazonS3BucketName.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -6605,7 +6632,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;lblAmazonS3BucketName.ZOrder" xml:space="preserve">
<value>15</value>
<value>16</value>
</data>
<data name="txtAmazonS3BucketName.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 248</value>
@ -6626,7 +6653,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;txtAmazonS3BucketName.ZOrder" xml:space="preserve">
<value>16</value>
<value>17</value>
</data>
<data name="lblAmazonS3Endpoints.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -6656,7 +6683,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;lblAmazonS3Endpoints.ZOrder" xml:space="preserve">
<value>17</value>
<value>18</value>
</data>
<data name="txtAmazonS3ObjectPrefix.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 296</value>
@ -6677,7 +6704,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;txtAmazonS3ObjectPrefix.ZOrder" xml:space="preserve">
<value>18</value>
<value>19</value>
</data>
<data name="lblAmazonS3ObjectPrefix.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -6707,7 +6734,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;lblAmazonS3ObjectPrefix.ZOrder" xml:space="preserve">
<value>19</value>
<value>20</value>
</data>
<data name="txtAmazonS3SecretKey.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 80</value>
@ -6728,7 +6755,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;txtAmazonS3SecretKey.ZOrder" xml:space="preserve">
<value>20</value>
<value>21</value>
</data>
<data name="lblAmazonS3SecretKey.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -6758,7 +6785,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;lblAmazonS3SecretKey.ZOrder" xml:space="preserve">
<value>21</value>
<value>22</value>
</data>
<data name="lblAmazonS3AccessKey.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -6788,7 +6815,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;lblAmazonS3AccessKey.ZOrder" xml:space="preserve">
<value>22</value>
<value>23</value>
</data>
<data name="txtAmazonS3AccessKey.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 32</value>
@ -6809,7 +6836,7 @@ store.book[0].title</value>
<value>tpAmazonS3</value>
</data>
<data name="&gt;&gt;txtAmazonS3AccessKey.ZOrder" xml:space="preserve">
<value>23</value>
<value>24</value>
</data>
<data name="tpAmazonS3.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 40</value>