Fixing SPN certificate login and data collection environment read

Author: markcowl

src/Common/Commands.Common/DataCollectionController.cs

@@ -26,23 +26,32 @@ public abstract class DataCollectionController
 
         static AzurePSDataCollectionProfile Initialize(IAzureSession session)
         {
-            AzurePSDataCollectionProfile result = new AzurePSDataCollectionProfile();
+            AzurePSDataCollectionProfile result = new AzurePSDataCollectionProfile(true);
             try
             {
-                var store = session.DataStore;
-                string dataPath = Path.Combine(session.ProfileDirectory, AzurePSDataCollectionProfile.DefaultFileName);
-                if (store.FileExists(dataPath))
+                var environmentValue = Environment.GetEnvironmentVariable(AzurePSDataCollectionProfile.EnvironmentVariableName);
+                bool enabled = true;
+                if (!string.IsNullOrWhiteSpace(environmentValue) && bool.TryParse(environmentValue, out enabled))
                 {
-                    string contents = store.ReadFileAsText(dataPath);
-                    var localResult = JsonConvert.DeserializeObject<AzurePSDataCollectionProfile>(contents);
-                    if (localResult != null && localResult.EnableAzureDataCollection.HasValue)
-                    {
-                        result = localResult;
-                    }
+                    result.EnableAzureDataCollection = enabled;
                 }
                 else
                 {
-                    WritePSDataCollectionProfile(session, new AzurePSDataCollectionProfile(true));
+                    var store = session.DataStore;
+                    string dataPath = Path.Combine(session.ProfileDirectory, AzurePSDataCollectionProfile.DefaultFileName);
+                    if (store.FileExists(dataPath))
+                    {
+                        string contents = store.ReadFileAsText(dataPath);
+                        var localResult = JsonConvert.DeserializeObject<AzurePSDataCollectionProfile>(contents);
+                        if (localResult != null && localResult.EnableAzureDataCollection.HasValue)
+                        {
+                            result = localResult;
+                        }
+                    }
+                    else
+                    {
+                        WritePSDataCollectionProfile(session, new AzurePSDataCollectionProfile(true));
+                    }
                 }
             }
             catch

src/ResourceManager/Profile/Commands.Profile.Test/SessionInitializationTests.cs

@@ -60,7 +60,35 @@ void ResetState()
             AzureSession.Instance.ARMContextSaveMode = ContextSaveMode.Process;
             AzureSession.Instance.AuthenticationFactory = new MockTokenAuthenticationFactory();
             AzureSession.Instance.TokenCache = new AuthenticationStoreTokenCache(new AzureTokenCache());
-            Environment.SetEnvironmentVariable("Azure_PS_Data_Collection", "false");
+            Environment.SetEnvironmentVariable("Azure_PS_Data_Collection", "");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void DataCollectionSettingPreventsFileWrite()
+        {
+            try
+            {
+                Environment.SetEnvironmentVariable("Azure_PS_Data_Collection", "true");
+                var store = SetupStore();
+                store.Setup(f => f.FileExists(It.IsAny<string>())).Returns(false);
+                store.Setup(f => f.WriteFile(It.IsAny<string>(), It.IsAny<string>())).Throws(new IOException("Cannot access file"));
+                store.Setup(f => f.WriteFile(It.IsAny<string>(), It.IsAny<byte[]>())).Throws(new IOException("Cannot access file"));
+                store.Setup(f => f.WriteFile(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Encoding>())).Throws(new IOException("Cannot access file"));
+                AzureSessionInitializer.CreateOrReplaceSession(store.Object);
+                var session = AzureSession.Instance;
+                Assert.NotNull(session);
+                Assert.Equal(ContextSaveMode.Process, session.ARMContextSaveMode);
+                Assert.NotNull(session.TokenCache);
+                Assert.Equal(typeof(AuthenticationStoreTokenCache), session.TokenCache.GetType());
+                Assert.NotNull(AzureRmProfileProvider.Instance);
+                Assert.Equal(typeof(ResourceManagerProfileProvider), AzureRmProfileProvider.Instance.GetType());
+                store.Verify(f => f.WriteFile(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
+            }
+            finally
+            {
+                ResetState();
+            }
         }
 
         [Fact]

src/ResourceManager/Profile/Commands.Profile/Account/AddAzureRmAccount.cs

@@ -192,6 +192,11 @@ public override void ExecuteCmdlet()
             {
                 azureAccount.Id = ApplicationId;
             }
+             
+            if (!string.IsNullOrWhiteSpace(CertificateThumbprint))
+            {
+                azureAccount.SetThumbprint(CertificateThumbprint);
+            }
 
             if (!string.IsNullOrEmpty(TenantId))
             {