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

Skip registry checks on non-Windows platforms

This commit is contained in:
Levi B 2015-03-18 10:42:09 -07:00
parent ca840d3711
commit fd08325918
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Microsoft.AspNet.DataProtection/DataProtectionServices.cs
View File

@ -10,6 +10,7 @@ using Microsoft.AspNet.DataProtection.Cng;
using Microsoft.AspNet.DataProtection.KeyManagement; using Microsoft.AspNet.DataProtection.KeyManagement;
using Microsoft.AspNet.DataProtection.Repositories; using Microsoft.AspNet.DataProtection.Repositories;
using Microsoft.Framework.Logging; using Microsoft.Framework.Logging;
using Microsoft.Win32;
namespace Microsoft.Framework.DependencyInjection namespace Microsoft.Framework.DependencyInjection
{ {
@ -79,27 +80,20 @@ namespace Microsoft.Framework.DependencyInjection
else else
{ {
// Use profile isn't available - can we use the HKLM registry? // Use profile isn't available - can we use the HKLM registry?
var regKeyStorageKey = RegistryXmlRepository.DefaultRegistryKey; RegistryKey regKeyStorageKey = null;
if (regKeyStorageKey != null)
{
if (OSVersionUtil.IsWindows()) if (OSVersionUtil.IsWindows())
{
regKeyStorageKey = RegistryXmlRepository.DefaultRegistryKey;
}
if (regKeyStorageKey != null)
{ {
// If the user profile isn't available, we can protect using DPAPI (to machine). // If the user profile isn't available, we can protect using DPAPI (to machine).
keyEncryptorDescriptor = DataProtectionServiceDescriptors.IXmlEncryptor_Dpapi(protectToMachine: true); keyEncryptorDescriptor = DataProtectionServiceDescriptors.IXmlEncryptor_Dpapi(protectToMachine: true);
}
keyRepositoryDescriptor = DataProtectionServiceDescriptors.IXmlRepository_Registry(regKeyStorageKey);
if (log.IsInformationLevelEnabled()) if (log.IsInformationLevelEnabled())
{
if (keyEncryptorDescriptor != null)
{ {
log.LogInformationF($"User profile not available. Using '{regKeyStorageKey.Name}' as key repository and Windows DPAPI to encrypt keys at rest."); log.LogInformationF($"User profile not available. Using '{regKeyStorageKey.Name}' as key repository and Windows DPAPI to encrypt keys at rest.");
} }
else
{
log.LogInformationF($"User profile not available. Using '{regKeyStorageKey.Name}' as key repository; keys will not be encrypted at rest.");
}
}
} }
else else
{ {
@ -135,6 +129,8 @@ namespace Microsoft.Framework.DependencyInjection
// Read and apply policy from the registry, overriding any other defaults. // Read and apply policy from the registry, overriding any other defaults.
bool encryptorConfigurationReadFromRegistry = false; bool encryptorConfigurationReadFromRegistry = false;
if (OSVersionUtil.IsWindows())
{
foreach (var descriptor in RegistryPolicyResolver.ResolveDefaultPolicy()) foreach (var descriptor in RegistryPolicyResolver.ResolveDefaultPolicy())
{ {
yield return descriptor; yield return descriptor;
@ -143,6 +139,7 @@ namespace Microsoft.Framework.DependencyInjection
encryptorConfigurationReadFromRegistry = true; encryptorConfigurationReadFromRegistry = true;
} }
} }
}
// Finally, provide a fallback encryptor configuration if one wasn't already specified. // Finally, provide a fallback encryptor configuration if one wasn't already specified.
if (!encryptorConfigurationReadFromRegistry) if (!encryptorConfigurationReadFromRegistry)