Skip to content

Commit 9b326df

Browse files
idseefeldidseefeld
authored
Merge pull request #116 from idseefeld/develop
Fix for Shared Access Signature (SAS) Authorisation
2 parents b4ad41e + e1b9684 commit 9b326df

File tree

7 files changed

+33
-15
lines changed

7 files changed

+33
-15
lines changed

‎src/UmbracoFileSystemProviders.Azure.Installer/UmbracoFileSystemProviders.Azure.Installer.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,9 @@
260260
<None Include="config\imageprocessor\cache.config" />
261261
<None Include="config\imageprocessor\processing.config" />
262262
<None Include="config\imageprocessor\security.config" />
263-
<None Include="packages.config" />
263+
<None Include="packages.config">
264+
<SubType>Designer</SubType>
265+
</None>
264266
<AdditionalFiles Include="stylecop.json" />
265267
</ItemGroup>
266268
<ItemGroup>
@@ -278,9 +280,8 @@
278280
</ProjectReference>
279281
</ItemGroup>
280282
<ItemGroup>
281-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
282-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
283-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
283+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
284+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
284285
</ItemGroup>
285286
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
286287
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/UmbracoFileSystemProviders.Azure.Installer/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<package id="MySql.Data" version="6.6.5" targetFramework="net45" />
3030
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
3131
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
32-
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net45" developmentDependency="true" />
32+
<package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net45" developmentDependency="true" />
3333
<package id="System.ComponentModel.EventBasedAsync" version="4.0.11" targetFramework="net45" />
3434
<package id="System.Dynamic.Runtime" version="4.0.0" targetFramework="net45" />
3535
<package id="System.Linq.Queryable" version="4.0.0" targetFramework="net45" />

‎src/UmbracoFileSystemProviders.Azure.Tests/UmbracoFileSystemProviders.Azure.Tests.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,12 +269,11 @@
269269
</ProjectReference>
270270
</ItemGroup>
271271
<ItemGroup>
272-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
273-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
274-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
272+
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
275273
</ItemGroup>
276274
<ItemGroup>
277-
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
275+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
276+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
278277
</ItemGroup>
279278
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
280279
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/UmbracoFileSystemProviders.Azure.Tests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<package id="NUnit" version="3.6.1" targetFramework="net45" />
3131
<package id="NUnit3TestAdapter" version="3.7.0" targetFramework="net45" />
3232
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
33-
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net45" developmentDependency="true" />
33+
<package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net45" developmentDependency="true" />
3434
<package id="System.ComponentModel.EventBasedAsync" version="4.0.11" targetFramework="net45" />
3535
<package id="System.Dynamic.Runtime" version="4.0.0" targetFramework="net45" />
3636
<package id="System.Linq.Queryable" version="4.0.0" targetFramework="net45" />

‎src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -615,8 +615,25 @@ private static CloudBlobContainer CreateContainer(CloudBlobClient cloudBlobClien
615615
}
616616

617617
CloudBlobContainer container = cloudBlobClient.GetContainerReference(containerName.ToLowerInvariant());
618+
if (cloudBlobClient.Credentials.IsSAS)
619+
{
620+
// Shared access signatures (SAS) have some limitations compared to shared access keys
621+
// read more on: https://docs.microsoft.com/en-us/azure/storage/common/storage-dotnet-shared-access-signature-part-1
622+
string[] sasTokenProperties = cloudBlobClient.Credentials.SASToken.Split("&".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
623+
bool isAccountSas = sasTokenProperties.Where(k => k.ToLowerInvariant().StartsWith("si=")).FirstOrDefault() == null;
624+
if (isAccountSas)
625+
{
626+
container.CreateIfNotExists();
627+
628+
// permissions can't be set!
629+
}
630+
631+
return container;
632+
}
633+
618634
container.CreateIfNotExists();
619635
container.SetPermissions(new BlobContainerPermissions { PublicAccess = accessType });
636+
620637
return container;
621638
}
622639

‎src/UmbracoFileSystemProviders.Azure/UmbracoFileSystemProviders.Azure.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,13 +257,14 @@
257257
</ItemGroup>
258258
<ItemGroup>
259259
<None Include="app.config" />
260-
<None Include="packages.config" />
260+
<None Include="packages.config">
261+
<SubType>Designer</SubType>
262+
</None>
261263
<AdditionalFiles Include="stylecop.json" />
262264
</ItemGroup>
263265
<ItemGroup>
264-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
265-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
266-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
266+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
267+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
267268
</ItemGroup>
268269
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
269270
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

‎src/UmbracoFileSystemProviders.Azure/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<package id="MySql.Data" version="6.6.5" targetFramework="net45" />
2828
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2929
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
30-
<package id="StyleCop.Analyzers" version="1.1.0-beta001" targetFramework="net45" developmentDependency="true" />
30+
<package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net45" developmentDependency="true" />
3131
<package id="System.ComponentModel.EventBasedAsync" version="4.0.11" targetFramework="net45" />
3232
<package id="System.Dynamic.Runtime" version="4.0.0" targetFramework="net45" />
3333
<package id="System.Linq.Queryable" version="4.0.0" targetFramework="net45" />

0 commit comments

Comments
 (0)