ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-14 11:08:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Porting divergent code introduced in #2116 (#2121)

Browse Source 
Make the log sas url last as long as the job duration
This commit is contained in:
Cheick Keita
2022-07-05 11:35:42 -07:00
committed by GitHub
parent ab0b974eb1
commit 52b760b89a
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ApiService/ApiService/onefuzzlib/Containers.cs
View File

@ -23,7 +23,7 @@ public interface IContainers {
public Async.Task<bool> BlobExists(Container container, string name, StorageType storageType); public Async.Task<bool> BlobExists(Container container, string name, StorageType storageType);
public Async.Task<Uri> AddContainerSasUrl(Uri uri); public Async.Task<Uri> AddContainerSasUrl(Uri uri, TimeSpan? duration = null);
} }
@ -34,6 +34,8 @@ public class Containers : IContainers {
private ArmClient _armClient; private ArmClient _armClient;
private readonly IServiceConfig _config; private readonly IServiceConfig _config;
static TimeSpan CONTAINER_SAS_DEFAULT_DURATION = TimeSpan.FromDays(30);
public Containers(ILogTracer log, IStorage storage, ICreds creds, IServiceConfig config) { public Containers(ILogTracer log, IStorage storage, ICreds creds, IServiceConfig config) {
_log = log; _log = log;
_storage = storage; _storage = storage;
@ -160,16 +162,19 @@ public class Containers : IContainers {
return sas; return sas;
} }
public async Async.Task<Uri> AddContainerSasUrl(Uri uri) { public async Async.Task<Uri> AddContainerSasUrl(Uri uri, TimeSpan? duration = null) {
if (uri.Query.Contains("sig")) { if (uri.Query.Contains("sig")) {
return uri; return uri;
} }
var (startTime, endTime) = SasTimeWindow(duration ?? CONTAINER_SAS_DEFAULT_DURATION);
var blobUriBuilder = new BlobUriBuilder(uri); var blobUriBuilder = new BlobUriBuilder(uri);
var accountKey = await _storage.GetStorageAccountNameKeyByName(blobUriBuilder.AccountName); var accountKey = await _storage.GetStorageAccountNameKeyByName(blobUriBuilder.AccountName);
var sasBuilder = new BlobSasBuilder( var sasBuilder = new BlobSasBuilder(
BlobContainerSasPermissions.Read | BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Delete | BlobContainerSasPermissions.List, BlobContainerSasPermissions.Read | BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Delete | BlobContainerSasPermissions.List,
DateTimeOffset.UtcNow + TimeSpan.FromHours(1)) { endTime) {
BlobContainerName = blobUriBuilder.BlobContainerName, BlobContainerName = blobUriBuilder.BlobContainerName,
StartsOn = startTime
}; };
var sas = sasBuilder.ToSasQueryParameters(new StorageSharedKeyCredential(blobUriBuilder.AccountName, accountKey)).ToString(); var sas = sasBuilder.ToSasQueryParameters(new StorageSharedKeyCredential(blobUriBuilder.AccountName, accountKey)).ToString();
@ -180,7 +185,7 @@ public class Containers : IContainers {
public async Async.Task<Uri> GetContainerSasUrl(Container container, StorageType storageType, BlobContainerSasPermissions permissions, TimeSpan? duration = null) { public async Async.Task<Uri> GetContainerSasUrl(Container container, StorageType storageType, BlobContainerSasPermissions permissions, TimeSpan? duration = null) {
var client = await FindContainer(container, storageType) ?? throw new Exception($"unable to find container: {container.ContainerName} - {storageType}"); var client = await FindContainer(container, storageType) ?? throw new Exception($"unable to find container: {container.ContainerName} - {storageType}");
var (startTime, endTime) = SasTimeWindow(duration ?? TimeSpan.FromDays(30)); var (startTime, endTime) = SasTimeWindow(duration ?? CONTAINER_SAS_DEFAULT_DURATION);
var sasBuilder = new BlobSasBuilder(permissions, endTime) { var sasBuilder = new BlobSasBuilder(permissions, endTime) {
StartsOn = startTime, StartsOn = startTime,
BlobContainerName = container.ContainerName BlobContainerName = container.ContainerName