notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend/drive] Add configuration option to set ACLs on files uploaded to object storage

Browse source
This commit is contained in:
Laura Hausmann 2024-04-22 21:29:49 +02:00
parent 953b317738
commit 1ce28ee005
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
3 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Iceshrimp.Backend/Core/Configuration/Config.cs
View file

@ -133,5 +133,6 @@ public sealed class Config
public string? Bucket { get; init; } public string? Bucket { get; init; }
public string? Prefix { get; init; } public string? Prefix { get; init; }
public string? AccessUrl { get; init; } public string? AccessUrl { get; init; }
public string? SetAcl { get; init; }
} }
} }

21
Iceshrimp.Backend/Core/Services/ObjectStorageService.cs
View file

@ -18,6 +18,10 @@ public class ObjectStorageService(IOptions<Config.StorageSection> config, HttpCl
private readonly string? _prefix = config.Value.ObjectStorage?.Prefix?.Trim('/'); private readonly string? _prefix = config.Value.ObjectStorage?.Prefix?.Trim('/');
private readonly IReadOnlyDictionary<string, string>? _acl = config.Value.ObjectStorage?.SetAcl != null
? new Dictionary<string, string> { { "x-amz-acl", config.Value.ObjectStorage.SetAcl } }.AsReadOnly()
: null;
private static S3Bucket? GetBucketSafely(IOptions<Config.StorageSection> config) private static S3Bucket? GetBucketSafely(IOptions<Config.StorageSection> config)
{ {
if (config.Value.Mode != Enums.FileStorage.Local) return GetBucket(config); if (config.Value.Mode != Enums.FileStorage.Local) return GetBucket(config);
@ -71,24 +75,13 @@ public class ObjectStorageService(IOptions<Config.StorageSection> config, HttpCl
throw new Exception("Failed to verify access url (content mismatch)"); throw new Exception("Failed to verify access url (content mismatch)");
} }
public async Task UploadFileAsync(string filename, byte[] data) private Task UploadFileAsync(string filename, byte[] data) => UploadFileAsync(filename, new MemoryStream(data));
{
if (_bucket == null) throw new Exception("Refusing to upload to object storage with invalid configuration");
await _bucket.PutAsync(new Blob(GetFilenameWithPrefix(filename), data));
}
public async Task UploadFileAsync(string filename, Stream data) public async Task UploadFileAsync(string filename, Stream data)
{ {
if (_bucket == null) throw new Exception("Refusing to upload to object storage with invalid configuration"); if (_bucket == null) throw new Exception("Refusing to upload to object storage with invalid configuration");
await _bucket.PutAsync(new Blob(GetFilenameWithPrefix(filename), data)); var blob = new Blob(GetFilenameWithPrefix(filename), data, _acl ?? BlobProperties.Empty);
} await _bucket.PutAsync(blob);
public async Task<string> UploadFileAsync(byte[] data)
{
if (_bucket == null) throw new Exception("Refusing to upload to object storage with invalid configuration");
var filename = Guid.NewGuid().ToString().ToLowerInvariant();
await _bucket.PutAsync(new Blob(GetFilenameWithPrefix(filename), data));
return filename;
} }
public Uri GetFilePublicUrl(string filename) public Uri GetFilePublicUrl(string filename)

1
Iceshrimp.Backend/configuration.ini
View file

@ -83,6 +83,7 @@ Path = /path/to/media/location
;;Bucket = <yourBucketName> ;;Bucket = <yourBucketName>
;;Prefix = ;;Prefix =
;;AccessUrl = https://endpoint.example.org/<yourBucketName> ;;AccessUrl = https://endpoint.example.org/<yourBucketName>
;;SetAcl = public-read
[Logging:LogLevel] [Logging:LogLevel]
Default = Information Default = Information