huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set XmlRepository whem setting encryptor in DataProtection light-up (#117)

This commit is contained in:
Pavel Krymets 2017-11-01 10:14:50 -07:00 committed by GitHub
parent 2143ef49c2
commit c998d74e1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sample/AzureAppServicesHostingStartupSample/Startup.cs
View File

@ -1,6 +1,7 @@
using System; using System;
using System.Linq; using System.Linq;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
@ -12,6 +13,7 @@ namespace IISSample
{ {
public void ConfigureServices(IServiceCollection services) public void ConfigureServices(IServiceCollection services)
{ {
services.AddDataProtection();
} }
public void Configure(IApplicationBuilder app, ILoggerFactory loggerfactory) public void Configure(IApplicationBuilder app, ILoggerFactory loggerfactory)
@ -60,6 +62,13 @@ namespace IISSample
await context.Response.WriteAsync(key + ": " + value + Environment.NewLine); await context.Response.WriteAsync(key + ": " + value + Environment.NewLine);
} }
await context.Response.WriteAsync(Environment.NewLine); await context.Response.WriteAsync(Environment.NewLine);
var protectorProvider = context.RequestServices.GetService<IDataProtectionProvider>();
var protector = protectorProvider.CreateProtector("Purpose");
await context.Response.WriteAsync("Protected Query: " + protector.Protect(context.Request.QueryString.Value) + Environment.NewLine);
await context.Response.WriteAsync(Environment.NewLine);
}); });
} }

25
src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/AzureKeyVaultHostingStartup.cs
View File

@ -1,6 +1,8 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.IO;
using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Azure.KeyVault; using Microsoft.Azure.KeyVault;
@ -59,7 +61,28 @@ namespace Microsoft.AspNetCore.AzureKeyVault.HostingStartup
internal virtual void AddDataProtection(IServiceCollection serviceCollection, KeyVaultClient client, string protectionKey) internal virtual void AddDataProtection(IServiceCollection serviceCollection, KeyVaultClient client, string protectionKey)
{ {
serviceCollection.AddDataProtection().ProtectKeysWithAzureKeyVault(client, protectionKey); // Duplicates functionality from GetKeyStorageDirectoryForAzureWebSites in DataProtection
// to detect key storage location when running on Azure
// because you are not alowed to set IXmlEncryptor without setting IXmlRepository
// Check that we are running in Azure AppServices
var siteId = Environment.GetEnvironmentVariable("WEBSITE_INSTANCE_ID");
if (string.IsNullOrWhiteSpace(siteId))
{
return;
}
var home = Environment.GetEnvironmentVariable("HOME");
if (string.IsNullOrWhiteSpace(home))
{
return;
}
var keyLocation = new DirectoryInfo(Path.Combine(home, "ASP.NET", "DataProtection-Keys"));
serviceCollection.AddDataProtection()
.ProtectKeysWithAzureKeyVault(client, protectionKey)
.PersistKeysToFileSystem(keyLocation);
} }
internal virtual void AddConfiguration(IConfigurationBuilder configurationBuilder, KeyVaultClient client, string keyVault) internal virtual void AddConfiguration(IConfigurationBuilder configurationBuilder, KeyVaultClient client, string keyVault)