Skip to content

shortening s3 policy #904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 31, 2023
Merged

shortening s3 policy #904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac7af0d
shortening s3 policy
neildsouth Oct 31, 2023
1b0fcce
fix typo
neildsouth Oct 31, 2023
fbdebe2
merge in#
neildsouth Oct 31, 2023
82042a3
fixing up paths
neildsouth Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/TaskManager/TaskManager/PluginStrings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public static class PluginStrings

public const string Docker = "docker";

public static readonly IReadOnlyList<string> PlugsRequiresPermanentAccoutns = new List<string>() { Argo, Docker };
public static readonly IReadOnlyList<string> PlugsRequiresPermanentAccounts = new List<string>() { Argo, Docker };
}
}
#pragma warning restore SA1600 // Elements should be documented
24 changes: 22 additions & 2 deletions src/TaskManager/TaskManager/TaskManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ private async Task HandleDispatchTask(JsonMessage<TaskDispatchEvent> message)

try
{
if (PluginStrings.PlugsRequiresPermanentAccoutns.Contains(
if (PluginStrings.PlugsRequiresPermanentAccounts.Contains(
message.Body.TaskPluginType,
StringComparer.InvariantCultureIgnoreCase))
{
Expand Down Expand Up @@ -559,7 +559,13 @@ private async Task PopulateTemporaryStorageCredentials(params Messaging.Common.S

foreach (var storage in storages)
{
var credentials = await _storageService.CreateTemporaryCredentialsAsync(storage.Bucket, storage.RelativeRootPath, _options.Value.TaskManager.TemporaryStorageCredentialDurationSeconds, _cancellationToken).ConfigureAwait(false);
var credentials = await _storageService.CreateTemporaryCredentialsAsync(
storage.Bucket,
ShortenStoragePath(storage.RelativeRootPath),
_options.Value.TaskManager.TemporaryStorageCredentialDurationSeconds,
_cancellationToken)
.ConfigureAwait(false);

storage.Credentials = new Credentials
{
AccessKey = credentials.AccessKeyId,
Expand All @@ -569,6 +575,20 @@ private async Task PopulateTemporaryStorageCredentials(params Messaging.Common.S
}
}

// added because AWS s3 policy creation is by defualt limited to 2048 characters, which
// can easily be surpassed with long multipart path names.
private string ShortenStoragePath(string path)
{
var pathParts = path.Split('/', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
if (pathParts.Length <= 3)
{
return path;
}

var startsWith = path[0] == '/' ? "/" : string.Empty;
return $"{startsWith}{pathParts[0]}/{pathParts[1]}/{pathParts[2]}";
}

private void AcknowledgeMessage<T>(JsonMessage<T> message)
{
Guard.Against.NullService(_messageBrokerSubscriberService, nameof(IMessageBrokerSubscriberService));
Expand Down