Merge lp:~brian.curtin/ubuntuone-client/930398-windows-is_root into lp:ubuntuone-client

[Brian Curtin]

- Loosen the is_root check on Windows to allow Windows XP users, who commonly run with Administrator rights, to start U1 properly. (LP: #930398).

When running on XP, which is almost always run from an Administrator account, always return False on is_root. On versions after XP, i.e., the versions 6.0 and greater (Vista/7), return the real status of whether or not the user is an Administrator.

This adds a test for the XP behavior, mocking platform.version() to produce an XP version string.

[Brian Curtin (brian.curtin)]

While working on the installer, I've verified that this branch works on XP.

[Roberto Alsina (ralsina)]

Were all the cases of users reporting this on XP? If yes, then it's a +1 from me.

review: Needs Information

[Brian Curtin (brian.curtin)]

Last I heard, "most" of them were XP but a few were supposedly Win7. However, even if some are Win7, they would have to be explicitly running the app as admin in order for this to occur. It runs fine on my box until I start up a cmd with "Run as administrator", which we talked about before should not be allowed anyway.

I've tested this on my Win7 box and an XP VM and both behave properly. XP starts up fine, Win7 starts up fine, and Win7 explicitly running ubuntuone-syncdaemon as admin does gives the "do not run as root" error.

[Roberto Alsina (ralsina)]

Ok, let's merge it and then if users complain we give up and just return False.

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'tests/platform/windows/test_os_helper.py'
--- tests/platform/windows/test_os_helper.py	2012-01-10 18:09:30 +0000
+++ tests/platform/windows/test_os_helper.py	2012-03-06 19:12:19 +0000
@@ -20,6 +20,7 @@
 import os
 import shutil
 import sys
+import platform
 
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
@@ -478,3 +479,10 @@
         self.patch(os_helper.shell, 'IsUserAnAdmin', lambda: expected)
         actual = os_helper.is_root()
         self.assertEqual(expected, actual)
+
+    def test_is_root_on_xp(self):
+        """Test that os_helper.is_root always returns False on XP"""
+        expected = False
+        self.patch(platform, "version", "5.1.2600")
+        actual = os_helper.is_root()
+        self.assertEqual(expected, actual)

=== modified file 'ubuntuone/platform/windows/os_helper.py'
--- ubuntuone/platform/windows/os_helper.py	2012-01-10 18:09:30 +0000
+++ ubuntuone/platform/windows/os_helper.py	2012-03-06 19:12:19 +0000
@@ -23,6 +23,7 @@
 import stat
 import sys
 
+from platform import version
 from contextlib import contextmanager
 from functools import wraps
 
@@ -872,10 +873,13 @@
 
 def is_root():
     """Return if the user is running as root."""
-    # This solution works on Windows XP, Vista and 7
+    # On Windows XP (v5.1), always return False. Nearly all users run with
+    # Administrator access, so this would restrict too many users.
+    # On Vista (v6.0) and 7 (v6.1), return the real Administrator value.
     # The MSDN docs say this may go away in a later version, but look at what
     # the alternative is: http://bit.ly/rXbIwc
-    return shell.IsUserAnAdmin()
+    is_xp = version()[0] == "5"
+    return False if is_xp else shell.IsUserAnAdmin()
 
 
 @windowspath()