yaakov/Shamir
1
0
Fork 0
mirror of https://github.com/yaakov-h/Shamir.git synced 2025-01-18 16:56:33 +00:00
Code Issues Projects Releases Wiki Activity

Simplify SAS command to generate full URL, only add SAS if needed.

Browse source
This commit is contained in:
Yaakov 2021-09-26 14:07:50 +10:00
parent 71a2030a05
commit 4d35fee21e
2 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/console/Commands/Cdn/StorageSasCommand.cs → src/console/Commands/Cdn/StorageGetUrlCommand.cs
View file

@ -3,13 +3,14 @@ using System.Diagnostics;
using System.Threading.Tasks; using System.Threading.Tasks;
using Azure.Storage; using Azure.Storage;
using Azure.Storage.Blobs; using Azure.Storage.Blobs;
using Azure.Storage.Blobs.Models;
using Azure.Storage.Sas; using Azure.Storage.Sas;
using CommandLine; using CommandLine;
using Microsoft.Azure.Storage; using Microsoft.Azure.Storage;
namespace Shamir.Console namespace Shamir.Console
{ {
public class StorageSasOptions public class StorageGetUrlOptions
{ {
[Option("connection-string", Required = false, HelpText = "Azure Storage connection string for the Storage Account backing the CDN.")] [Option("connection-string", Required = false, HelpText = "Azure Storage connection string for the Storage Account backing the CDN.")]
public string? ConnectionString { get; set; } public string? ConnectionString { get; set; }
@ -24,13 +25,13 @@ namespace Shamir.Console
public string? Path { get; set; } public string? Path { get; set; }
} }
public sealed class StorageSasCommand : ParsedArgumentsCommand<StorageSasOptions> public sealed class StorageGetUrlCommand : ParsedArgumentsCommand<StorageGetUrlOptions>
{ {
public override string Name => "sas"; public override string Name => "get-url";
public override string Description => "Generate a SAS token for a file in Storage."; public override string Description => "Get the URL for a file in Storage, with a SAS token if required.";
public override ValueTask<int> ExecuteAsync(IServiceProvider serviceProvider, StorageSasOptions options) public override async ValueTask<int> ExecuteAsync(IServiceProvider serviceProvider, StorageGetUrlOptions options)
{ {
var connectionString = options.ConnectionString ?? Environment.GetEnvironmentVariable("AZURE_CONNECTION_STRING"); var connectionString = options.ConnectionString ?? Environment.GetEnvironmentVariable("AZURE_CONNECTION_STRING");
var account = CloudStorageAccount.Parse(connectionString); var account = CloudStorageAccount.Parse(connectionString);
@ -42,8 +43,17 @@ namespace Shamir.Console
? (options.Path[..delimiterIndex], options.Path[(delimiterIndex + 1)..]) ? (options.Path[..delimiterIndex], options.Path[(delimiterIndex + 1)..])
: (options.Path, string.Empty); : (options.Path, string.Empty);
var client = new BlobServiceClient(connectionString); var uri = new UriBuilder
{
Scheme = "https",
Host = options.HostName ?? account.BlobStorageUri.PrimaryUri.Host,
Path = options.Path,
};
var client = new BlobServiceClient(connectionString);
var containerPolicy = await client.GetBlobContainerClient(containerName).GetAccessPolicyAsync();
if (containerPolicy.Value.BlobPublicAccess == PublicAccessType.None)
{
var builder = new BlobSasBuilder(BlobSasPermissions.Read, DateTimeOffset.UtcNow.AddDays(options.ValidityPeriodDays)); var builder = new BlobSasBuilder(BlobSasPermissions.Read, DateTimeOffset.UtcNow.AddDays(options.ValidityPeriodDays));
builder.BlobContainerName = containerName; builder.BlobContainerName = containerName;
builder.BlobName = path; builder.BlobName = path;
@ -52,17 +62,13 @@ namespace Shamir.Console
var key = new StorageSharedKeyCredential(account.Credentials.AccountName, account.Credentials.ExportBase64EncodedKey()); var key = new StorageSharedKeyCredential(account.Credentials.AccountName, account.Credentials.ExportBase64EncodedKey());
var parameters = builder.ToSasQueryParameters(key); var parameters = builder.ToSasQueryParameters(key);
var uri = new UriBuilder
{ uri.Query = parameters.ToString();
Scheme = "https", }
Host = options.HostName ?? account.BlobStorageUri.PrimaryUri.Host,
Path = options.Path,
Query = parameters.ToString(),
};
System.Console.WriteLine(uri.Uri.AbsoluteUri); System.Console.WriteLine(uri.Uri.AbsoluteUri);
return ValueTask.FromResult(0); return 0;
} }
} }
} }

2
src/console/Program.cs
View file

@ -30,7 +30,7 @@ namespace Shamir.Console
ImmutableArray.Create<ICommand>( ImmutableArray.Create<ICommand>(
new StorageLsCommand(), new StorageLsCommand(),
new StorageCopyCommand(), new StorageCopyCommand(),
new StorageSasCommand() new StorageGetUrlCommand()
)) ))
), ),
ImmutableArray<ICommand>.Empty ImmutableArray<ICommand>.Empty