Merge pull request #282 from markcowl/cpersistclean

AzureStack modules and Context Persistence implementation

Author: markcowl

.gitignore

@@ -1,6 +1,7 @@
 # Azure PowerShell specific
 src/Publish/
 src/Package/
+src/Stack/
 
 obj
 TestResults
@@ -12,6 +13,7 @@ msbuild.log
 # app.config is not useful for PowerShell.
 # please do not commit any app.config files.
 app.config
+!src/ResourceManager/Profile/Commands.Profile.Test/App.config
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 

NuGet.config

@@ -1,9 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
     <add key="local-feed" value="tools/LocalFeed" />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" /> 
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
   </packageSources>
+  <disabledPackageSources>
+    <add key="dotnet-core" value="true" />
+    <add key="powershell-core" value="true" />
+  </disabledPackageSources>
 </configuration>

build.proj

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
 
-  <?define productName="Microsoft Azure PowerShell - August 2017" ?>
+  <?define productName="Microsoft Azure PowerShell - September 2017" ?>
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="4.3.1" ?>
+  <?define version="4.3.2" ?>
 
   <Product Id="*"
            Name="$(var.productName)"

setup/azurecmd.wxs

@@ -104,11 +104,22 @@ public static class Property
         /// </summary>
         AccessToken = "AccessToken",
 
+        /// <summary>
+        /// Access token for AD Graph service.
+        /// </summary>
+        GraphAccessToken = "GraphAccessToken",
+
+        /// <summary>
+        /// Access token for KeyVault service.
+        /// </summary>
+        KeyVaultAccessToken = "KeyVault",
+
         /// <summary>
         /// Thumbprint for associated certificate
         /// </summary>
         CertificateThumbprint = "CertificateThumbprint";
 
+
         }
     }
 }

src/Common/Commands.Common.Authentication.Abstractions/AzureAccount.cs

@@ -17,6 +17,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Diagnostics;
+using System.Collections.Concurrent;
 
 namespace Microsoft.Azure.Commands.Common.Authentication
 {
@@ -28,6 +29,8 @@ public abstract class AzureSession : IAzureSession
         static IAzureSession _instance;
         static bool _initialized = false;
         static ReaderWriterLockSlim sessionLock = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
+        private IDictionary<ComponentKey, object> _componentRegistry = new ConcurrentDictionary<ComponentKey, object>(new ComponentKeyComparer());
+
         /// <summary>
         /// Gets or sets Azure client factory.
         /// </summary>
@@ -63,6 +66,11 @@ public abstract class AzureSession : IAzureSession
         /// </summary>
         public string ProfileFile { get; set; }
 
+        /// <summary>
+        /// Gets or sets the context container file for azure resource manager
+        /// </summary>
+        public string ResourceManagerContextFile { get; set; }
+
         /// <summary>
         /// Gets or sets file name for the migration backup.
         /// </summary>
@@ -126,6 +134,10 @@ public static IAzureSession Instance
 
         public abstract SourceLevels AuthenticationTraceSourceLevel { get; set; }
 
+        public string TokenCacheDirectory { get; set; }
+
+        public string ARMContextSaveMode { get; set; }
+
         /// <summary>
         /// Initialize the AzureSession, avoid contention at startup
         /// </summary>
@@ -138,10 +150,10 @@ public static void Initialize(Func<IAzureSession> instanceCreator, bool overwrit
                 sessionLock.EnterWriteLock();
                 try
                 {
-                    if (!_initialized || overwrite)
+                    if (overwrite || !_initialized)
                     {
-                        _initialized = true;
                         _instance = instanceCreator();
+                        _initialized = true;
                     }
                 }
                 finally
@@ -167,5 +179,167 @@ public static void Initialize(Func<IAzureSession> instanceCreator)
         {
             Initialize(instanceCreator, false);
         }
+
+        public static void Modify(Action<IAzureSession> modifier)
+        {
+            try
+            {
+                sessionLock.EnterWriteLock();
+                try
+                {
+                    modifier(_instance);
+                }
+                finally
+                {
+                    sessionLock.ExitWriteLock();
+                }
+            }
+            catch (LockRecursionException lockException)
+            {
+                throw new InvalidOperationException(Abstractions.Properties.Resources.SessionLockWriteRecursion, lockException);
+            }
+            catch (ObjectDisposedException disposedException)
+            {
+                throw new InvalidOperationException(Abstractions.Properties.Resources.SessionLockWriteDisposed, disposedException);
+            }
+        }
+
+        public bool TryGetComponent<T>(string componentName, out T component) where T : class
+        {
+            var key = new ComponentKey(componentName, typeof(T));
+            component = null;
+            if (_componentRegistry.ContainsKey(key))
+            {
+                component = _componentRegistry[key] as T;
+            }
+
+            return component != null;
+        }
+
+        public void RegisterComponent<T>(string componentName, Func<T> componentInitializer) where T : class
+        {
+            RegisterComponent(componentName, componentInitializer, false); ;
+        }
+
+        public void RegisterComponent<T>(string componentName, Func<T> componentInitializer, bool overwrite) where T : class
+        {
+            ChangeRegistry(
+                () =>
+                {
+                    var key = new ComponentKey(componentName, typeof(T));
+                    if (!_componentRegistry.ContainsKey(key) || overwrite)
+                    {
+                        _componentRegistry[key] = componentInitializer();
+                    }
+                });
+        }
+
+        public void UnregisterComponent<T>(string componentName) where T : class
+        {
+            ChangeRegistry(
+                () =>
+                {
+                    var key = new ComponentKey(componentName, typeof(T));
+                    if (_componentRegistry.ContainsKey(key))
+                    {
+                        _componentRegistry.Remove(key);
+                    }
+                });
+        }
+
+        public void ClearComponents()
+        {
+            ChangeRegistry(_componentRegistry.Clear);
+        }
+
+        void ChangeRegistry(Action changeAction)
+        {
+                    changeAction();
+        }
+
+        private class ComponentKey : IComparable<ComponentKey>, IEquatable<ComponentKey>
+        {
+            public string Name { get; private set; }
+
+            public string Type { get; private set; }
+
+            public ComponentKey(string name, Type type)
+            {
+                if (name == null)
+                {
+                    throw new ArgumentNullException(nameof(name));
+                }
+
+                if (type == null)
+                {
+                    throw new ArgumentNullException(nameof(type));
+                }
+
+                Name = name;
+                Type = type.FullName;
+            }
+
+            public override int GetHashCode()
+            {
+                return ToString().GetHashCode();
+            }
+
+            public override string ToString()
+            {
+                return string.Format($"{Name}-{Type}");
+            }
+
+            public override bool Equals(object obj)
+            {
+                var other = obj as ComponentKey;
+                return other != null
+                    && this.Equals(other);
+            }
+
+            public int CompareTo(ComponentKey other)
+            {
+                if (other == null)
+                {
+                    return 1;
+                }
+
+                var stringCompare = this.Name.ToLowerInvariant().CompareTo(other.Name.ToLowerInvariant());
+                return (stringCompare != 0 ? stringCompare : this.Type.CompareTo(other.Type));
+            }
+
+            public bool Equals(ComponentKey other)
+            {
+                return other != null
+                    && string.Equals(this.Name, other.Name, StringComparison.OrdinalIgnoreCase)
+                    && string.Equals(this.Type, other.Type, StringComparison.OrdinalIgnoreCase);
+            }
+        }
+
+        private class ComponentKeyComparer : IComparer<ComponentKey>, IEqualityComparer<ComponentKey>
+        {
+            public int Compare(ComponentKey x, ComponentKey y)
+            {
+                if (x == null)
+                {
+                    throw new ArgumentNullException(nameof(x));
+                }
+                if (y == null)
+                {
+                    throw new ArgumentNullException(nameof(y));
+                }
+
+                return x.CompareTo(y);
+            }
+
+            public bool Equals(ComponentKey x, ComponentKey y)
+            {
+                return x != null && y != null && x.Equals(y);
+            }
+
+            public int GetHashCode(ComponentKey obj)
+            {
+                return obj.GetHashCode();
+            }
+        }
     }
 }

src/Common/Commands.Common.Authentication.Abstractions/AzureSession.cs

@@ -58,7 +58,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.8\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.9\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -103,6 +103,7 @@
     <Compile Include="AzureAccount.cs" />
     <Compile Include="AzureRmProfileProvider.cs" />
     <Compile Include="AzureSMProfileProvider.cs" />
+    <Compile Include="ContextSaveMode.cs" />
     <Compile Include="Extensions\AzureAccountExtensions.cs" />
     <Compile Include="AzureEnvironmentConstants.cs" />
     <Compile Include="Extensions\AzureContextExtensions.cs" />
@@ -118,6 +119,7 @@
     <Compile Include="Interfaces\IAccessToken.cs" />
     <Compile Include="Interfaces\IExtensibleSettings.cs" />
     <Compile Include="Interfaces\IExtensibleModel.cs" />
+    <Compile Include="Interfaces\IFileProvider.cs" />
     <Compile Include="Interfaces\IHyakAuthenticationFactory.cs" />
     <Compile Include="Interfaces\IAzureSession.cs" />
     <Compile Include="Interfaces\IAuthenticationFactory.cs" />

src/Common/Commands.Common.Authentication.Abstractions/Commands.Common.Authentication.Abstractions.csproj

@@ -0,0 +1,24 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions
+{
+    /// <summary>
+    /// Constants for use with the autosave mode for the context
+    /// </summary>
+    public static class ContextSaveMode
+    {
+        public const string Process = "Process", CurrentUser = "CurrentUser";
+    }
+}

src/Common/Commands.Common.Authentication.Abstractions/ContextSaveMode.cs

@@ -188,7 +188,7 @@ public static void RemoveSubscription(this IAzureAccount account, Guid id)
         /// <param name="other">The account to copy from (source)</param>
         public static void CopyFrom(this IAzureAccount account, IAzureAccount source)
         {
-            if (source != null)
+            if (account != null && source != null)
             {
                 account.Credential = source.Credential;
                 account.Id = source.Id;

src/Common/Commands.Common.Authentication.Abstractions/Extensions/AzureAccountExtensions.cs

@@ -366,7 +366,7 @@ public static string GetPublishSettingsFileUrlWithRealm(this IAzureEnvironment e
 
         public static void CopyFrom(this IAzureEnvironment environment, IAzureEnvironment other)
         {
-            if (other != null)
+            if (environment != null && other != null)
             {
                 environment.Name = other.Name;
                 environment.OnPremise = other.OnPremise;

src/Common/Commands.Common.Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs

@@ -148,7 +148,7 @@ public static void SetTenant(this IAzureSubscription subscription, string tenant
         /// <param name="other"></param>
         public static void CopyFrom(this IAzureSubscription subscription, IAzureSubscription other)
         {
-            if (other != null)
+            if (subscription != null && other != null)
             {
                 subscription.Id = other.Id;
                 subscription.Name = other.Name;

src/Common/Commands.Common.Authentication.Abstractions/Extensions/AzureSubscriptionExtensions.cs

@@ -35,7 +35,7 @@ public static Guid GetId(this IAzureTenant tenant)
         /// <param name="other"></param>
         public static void CopyFrom(this IAzureTenant tenant, IAzureTenant other)
         {
-            if (other != null)
+            if (tenant != null && other != null)
             {
                 tenant.Id = other.Id;
                 tenant.Directory = other.Directory;

src/Common/Commands.Common.Authentication.Abstractions/Extensions/AzureTenantExtensions.cs

@@ -107,7 +107,7 @@ public static bool IsPropertySet(this IExtensibleModel model, string propertyKey
         /// <param name="source"></param>
         public static void CopyPropertiesFrom(this IExtensibleModel model, IExtensibleModel source)
         {
-            if (source != null)
+            if (model != null && source != null)
             {
                 foreach (var item in source.ExtendedProperties)
                 {

src/Common/Commands.Common.Authentication.Abstractions/Extensions/ModelExtensions.cs

@@ -79,5 +79,12 @@ IAccessToken Authenticate(
         /// <param name="targetEndpoint">The named endpoint the AutoRest client will target</param>
         /// <returns>AutoRest client crentials targeting the given context and endpoint</returns>
         ServiceClientCredentials GetServiceClientCredentials(IAzureContext context, string targetEndpoint);
+
+        /// <summary>
+        /// Remove any stored credentials for the given user
+        /// </summary>
+        /// <param name="account">The account to remove credentials for</param>
+        /// <param name="tokenCache">The TokenCache to remove credentials from</param>
+        void RemoveUser(IAzureAccount account, IAzureTokenCache tokenCache);
     }
 }