Merge pull request #2631 from stephentoub/net_add_user_error

Fix TestUserCredentialsPropertiesOnWindows without admin privileges

Author: stephentoub

src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests/Interop.cs

@@ -93,7 +93,7 @@ public struct SID_AND_ATTRIBUTES
         [DllImport("advapi32.dll")]
         internal static extern bool GetTokenInformation(SafeProcessHandle TokenHandle, uint TokenInformationClass, IntPtr TokenInformation, int TokenInformationLength, ref int ReturnLength);
 
-        internal static bool NetUserAdd(string username, string password)
+        internal static void NetUserAdd(string username, string password)
         {
             USER_INFO_1 userInfo = new USER_INFO_1();
             userInfo.usri1_name = username;
@@ -103,12 +103,12 @@ internal static bool NetUserAdd(string username, string password)
             uint parm_err;
             uint result = NetUserAdd(null, 1, ref userInfo, out parm_err);
 
-            if (result != 0)
+            if (result != 0) // NERR_Success
             {
-                throw new Win32Exception();
+                // most likely result == ERROR_ACCESS_DENIED 
+                // due to running without elevated privileges
+                throw new Win32Exception((int)result);
             }
-
-            return true;
         }
 
         internal static bool ProcessTokenToSid(SafeProcessHandle token, out SecurityIdentifier sid)

src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests/ProcessStartInfoTests.cs

@@ -230,47 +230,53 @@ public void TestCreateNoWindowProperty(bool value)
         public void TestUserCredentialsPropertiesOnWindows()
         {
             string username = "test", password = "PassWord123!!";
-            
-            if (Interop.NetUserAdd(username, password))
+            try
+            {
+                Interop.NetUserAdd(username, password);
+            }
+            catch (Exception exc)
             {
-                Process p = CreateProcessInfinite();
+                Console.Error.WriteLine("TestUserCredentialsPropertiesOnWindows: NetUserAdd failed: {0}", exc.Message);
+                return; // test is irrelevant if we can't add a user
+            }
+
+            Process p = CreateProcessInfinite();
 
-                p.StartInfo.LoadUserProfile = true;
-                p.StartInfo.UserName = username;
-                p.StartInfo.Password = GetSecureString(password);
+            p.StartInfo.LoadUserProfile = true;
+            p.StartInfo.UserName = username;
+            p.StartInfo.Password = GetSecureString(password);
 
-                SafeProcessHandle handle = null;
-                try
+            SafeProcessHandle handle = null;
+            try
+            {
+                p.Start();
+                if (Interop.OpenProcessToken(p.SafeHandle, 0x8u, out handle))
                 {
-                    p.Start();
-                    if (Interop.OpenProcessToken(p.SafeHandle, 0x8u, out handle))
+                    SecurityIdentifier sid;
+                    if (Interop.ProcessTokenToSid(handle, out sid))
                     {
-                        SecurityIdentifier sid;
-                        if (Interop.ProcessTokenToSid(handle, out sid))
-                        {
-                            string actualUserName = sid.Translate(typeof(NTAccount)).ToString();
-                            int indexOfDomain = actualUserName.IndexOf('\\');
-                            if (indexOfDomain != -1)
-                                actualUserName = actualUserName.Substring(indexOfDomain + 1);
-
-                            bool isProfileLoaded = GetNamesOfUserProfiles().Any(profile => profile.Equals(username));
-
-                            Assert.Equal(username, actualUserName);
-                            Assert.True(isProfileLoaded);
-                        }
+                        string actualUserName = sid.Translate(typeof(NTAccount)).ToString();
+                        int indexOfDomain = actualUserName.IndexOf('\\');
+                        if (indexOfDomain != -1)
+                            actualUserName = actualUserName.Substring(indexOfDomain + 1);
+
+                        bool isProfileLoaded = GetNamesOfUserProfiles().Any(profile => profile.Equals(username));
+
+                        Assert.Equal(username, actualUserName);
+                        Assert.True(isProfileLoaded);
                     }
                 }
-                finally
-                {
-                    if (handle != null)
-                        handle.Dispose();
+            }
+            finally
+            {
+                if (handle != null)
+                    handle.Dispose();
 
-                    if (!p.HasExited)
-                        p.Kill();
+                if (!p.HasExited)
+                    p.Kill();
 
-                    Interop.NetUserDel(null, username);
-                    Assert.True(p.WaitForExit(WaitInMS));
-                }
+                Interop.NetUserDel(null, username);
+                Assert.True(p.WaitForExit(WaitInMS));
             }
         }