Merge lp:~alecu/ubuntuone-client/timestamp-autofix-1-6 into lp:ubuntuone-client/stable-1-6

[Alejandro J. Cura]

Do a HEAD request on the server to get accurate timestamp (LP: #692597)

Do a HEAD request on the server to get accurate timestamp (LP: #692597)

This branch depends on:
 * lp:~alecu/ubuntuone-storage-protocol/timestamp-autofix-1-6
 * lp:~alecu/ubuntu-sso-client/timestamp-autofix-1-2

To build it on linux, point autogen to the dependent branches, like this:
./autogen.sh --with-protocol=$HOME/canonical/ubuntuone-storage-protocol/timestamp-autofix-1-6/ --with-sso=$HOME/canonical/ubuntu-sso-client/timestamp-autofix-1-2/

[Diego Sarmentero (diegosarmentero)]

Text conflict in bin/ubuntuone-syncdaemon
Text conflict in configure.ac
Text conflict in libsyncdaemon/syncdaemon-authentication.c
Conflict adding files to nautilus. Created directory.
Conflict because nautilus is not versioned, but has versioned children. Versioned directory.
Contents conflict in nautilus/utils.c
Text conflict in tests/platform/linux/eventlog/test_zg_listener.py
Text conflict in tests/platform/linux/test_dbus.py
Text conflict in tests/platform/test_tools.py
Text conflict in tests/status/test_aggregator.py
Text conflict in tests/syncdaemon/test_action_queue.py
Text conflict in tests/syncdaemon/test_config.py
Text conflict in tests/syncdaemon/test_fsm.py
Text conflict in tests/syncdaemon/test_localrescan.py
Text conflict in ubuntuone/syncdaemon/action_queue.py
Text conflict in ubuntuone/syncdaemon/tritcask.py
16 conflicts encountered.

review: Needs Fixing

[Diego Sarmentero (diegosarmentero)]

review: Abstain

[Natalia Bidart (nataliabidart)]

Looks very good, all tests green, tested IRL.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~alecu/ubuntuone-client/timestamp-autofix-1-6 into lp:ubuntuone-client/stable-1-6 failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.17
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
c...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~alecu/ubuntuone-client/timestamp-autofix-1-6 into lp:ubuntuone-client/stable-1-6 failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.17
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
c...

[dobey (dobey)]

I'm just going to set this to rejected now, as Ubuntu 11.04 is now EOL, which this version of Ubuntu One was targeted for.

Unmerged revisions

974. By Alejandro J. Cura on 2011-12-13

fix u1trial parameters

973. By Alejandro J. Cura on 2011-11-18

Do a HEAD request on the server to get accurate timestamp (LP: #692597)

=== modified file 'Makefile.am'
--- Makefile.am	2011-02-11 19:47:15 +0000
+++ Makefile.am	2011-12-13 16:36:24 +0000
@@ -53,7 +53,7 @@
 test: logging.conf $(clientdefs_DATA) Makefile
 	echo "$(PYTHONPATH)"
 	if test "x$(builddir)" == "x$(srcdir)"; then \
-		PYTHONPATH="$(PYTHONPATH)" u1trial tests -p tests/platform/windows; \
+		PYTHONPATH="$(PYTHONPATH)" u1trial -p tests/platform/windows tests; \
 	fi
 	rm -rf _trial_temp
 

=== modified file 'tests/syncdaemon/test_action_queue.py'
--- tests/syncdaemon/test_action_queue.py	2011-04-26 11:20:49 +0000
+++ tests/syncdaemon/test_action_queue.py	2011-12-13 16:36:24 +0000
@@ -2587,6 +2587,8 @@
                 '{"is_public": true, "public_url": "http://example.com"}')
 
         from ubuntuone.syncdaemon import action_queue
+        self.patch(action_queue.timestamp_checker, "get_faithful_time",
+                   lambda: 1)
         action_queue.urlopen = check
         try:
             res = self.command._change_public_access_http()
@@ -2596,6 +2598,22 @@
         self.assertEqual(
             {'is_public': True, 'public_url': 'http://example.com'}, res)
 
+    def test_change_public_access_http_uses_timestamp(self):
+        """The timestamp is used for oauth signing."""
+        fake_timestamp = 12345678
+
+        def fake_urlopen(request):
+            """A fake urlopen."""
+            auth = request.headers["Authorization"]
+            expected = 'oauth_timestamp="%d"' % fake_timestamp
+            self.assertIn(expected, auth)
+            return StringIO("[]")
+
+        self.patch(action_queue.timestamp_checker, "get_faithful_time",
+                   lambda: fake_timestamp)
+        self.patch(action_queue, "urlopen", fake_urlopen)
+        self.command._change_public_access_http()
+
     def test_handle_success_push_event(self):
         """Test AQ_CHANGE_PUBLIC_ACCESS_OK is pushed on success."""
         response = {'is_public': True, 'public_url': 'http://example.com'}
@@ -2689,6 +2707,8 @@
                 '"http://example.com"}]' % (nodekey, nodekey_2, volume_id))
 
         from ubuntuone.syncdaemon import action_queue
+        self.patch(action_queue.timestamp_checker, "get_faithful_time",
+                   lambda: 1)
         action_queue.urlopen = check
         try:
             res = self.command._get_public_files_http()
@@ -2700,6 +2720,22 @@
                            'volume_id': str(volume_id),
                            'public_url': 'http://example.com'}], res)
 
+    def test_get_public_files_http_uses_timestamp(self):
+        """The timestamp is used for oauth signing."""
+        fake_timestamp = 12345678
+
+        def fake_urlopen(request):
+            """A fake urlopen."""
+            auth = request.headers["Authorization"]
+            expected = 'oauth_timestamp="%d"' % fake_timestamp
+            self.assertIn(expected, auth)
+            return StringIO("[]")
+
+        self.patch(action_queue.timestamp_checker, "get_faithful_time",
+                   lambda: fake_timestamp)
+        self.patch(action_queue, "urlopen", fake_urlopen)
+        self.command._get_public_files_http()
+
     def test_handle_success_push_event(self):
         """Test AQ_PUBLIC_FILES_LIST_OK is pushed on success."""
         response = [{'node_id': uuid.uuid4(), 'volume_id':None,
@@ -3614,23 +3650,18 @@
         """Init."""
         yield super(CreateShareTestCase, self).setUp()
         self.request_queue = RequestQueue(action_queue=self.action_queue)
-        self.orig_create_share_http = CreateShare._create_share_http
-
-    @defer.inlineCallbacks
-    def tearDown(self):
-        yield super(CreateShareTestCase, self).tearDown()
-        CreateShare._create_share_http = self.orig_create_share_http
 
     @defer.inlineCallbacks
     def test_access_level_modify_http(self):
         """Test proper handling of the access level in the http case."""
         # replace _create_share_http with a fake, just to check the args
         d = defer.Deferred()
-        def check_create_http(self, node_id, user, name, read_only, deferred):
+
+        def check_create_http(self, node_id, user, name, read_only):
             """Fire the deferred with the args."""
             d.callback((node_id, user, name, read_only))
-            deferred.callback(None)
-        CreateShare._create_share_http = check_create_http
+
+        self.patch(CreateShare, "_create_share_http", check_create_http)
         command = CreateShare(self.request_queue, 'node_id',
                                    '[e-mail]', 'share_name',
                                    'Modify', 'marker', 'path')
@@ -3648,11 +3679,12 @@
         """Test proper handling of the access level in the http case."""
         # replace _create_share_http with a fake, just to check the args
         d = defer.Deferred()
-        def check_create_http(self, node_id, user, name, read_only, deferred):
+
+        def check_create_http(self, node_id, user, name, read_only):
             """Fire the deferred with the args."""
             d.callback((node_id, user, name, read_only))
-            deferred.callback(None)
-        CreateShare._create_share_http = check_create_http
+
+        self.patch(CreateShare, "_create_share_http", check_create_http)
         command = CreateShare(self.request_queue, 'node_id',
                                    '[e-mail]', 'share_name',
                                    'View', 'marker', 'path')
@@ -3664,6 +3696,27 @@
         self.assertEqual('share_name', name)
         self.assertTrue(read_only)
 
+    @defer.inlineCallbacks
+    def test_create_share_http_uses_timestamp(self):
+        """The timestamp is used for oauth signing."""
+        fake_timestamp = 12345678
+
+        def fake_urlopen(request):
+            """A fake urlopen."""
+            auth = request.headers["Authorization"]
+            expected = 'oauth_timestamp="%d"' % fake_timestamp
+            self.assertIn(expected, auth)
+
+        self.patch(action_queue.timestamp_checker, "get_faithful_time",
+                   lambda: fake_timestamp)
+        self.patch(action_queue, "urlopen", fake_urlopen)
+        self.user_connect()
+        command = CreateShare(self.request_queue, 'node_id',
+                                   '[e-mail]', 'share_name',
+                                   'View', 'marker', 'path')
+        self.assertTrue(command.use_http, 'CreateShare should be in http mode')
+        yield command._run()
+
     def test_possible_markers(self):
         """Test that it returns the correct values."""
         cmd = CreateShare(self.request_queue, 'node_id', '[e-mail]',

=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2011-04-26 11:20:49 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2011-12-13 16:36:24 +0000
@@ -49,6 +49,7 @@
 from twisted.python.failure import Failure, DefaultException
 
 from oauth import oauth
+from ubuntu_sso.utils import timestamp_checker
 from ubuntuone.storageprotocol import protocol_pb2, content_hash
 from ubuntuone.storageprotocol import errors as protocol_errors
 from ubuntuone.storageprotocol.client import (
@@ -1703,14 +1704,17 @@
         if share_to and re.match(EREGEX, share_to):
             self.use_http = True
 
-    def _create_share_http(self, node_id, user, name, read_only, deferred):
+    def _create_share_http(self, node_id, user, name, read_only):
         """Create a share using the HTTP Web API method."""
 
         url = "https://one.ubuntu.com/files/api/offer_share/"
         method = oauth.OAuthSignatureMethod_PLAINTEXT()
+        timestamp = timestamp_checker.get_faithful_time()
+        parameters = {"oauth_timestamp": timestamp}
         request = oauth.OAuthRequest.from_consumer_and_token(
             http_url=url,
             http_method="POST",
+            parameters=parameters,
             oauth_consumer=self.action_queue.consumer,
             token=self.action_queue.token)
         request.sign_request(method, self.action_queue.consumer,
@@ -1722,24 +1726,15 @@
         pdata = urlencode(data)
         headers = request.to_header()
         req = Request(url, pdata, headers)
-        try:
-            urlopen(req)
-        except HTTPError, e:
-            reactor.callFromThread(deferred.errback, Failure(e))
-
-        reactor.callFromThread(deferred.callback, None)
+        urlopen(req)
 
     def _run(self):
         """Do the actual running."""
         if self.use_http:
             # External user, do the HTTP REST method
-            deferred = defer.Deferred()
-            d = threads.deferToThread(self._create_share_http,
+            return threads.deferToThread(self._create_share_http,
                                       self.node_id, self.share_to,
-                                      self.name, self.access_level != 'Modify',
-                                      deferred)
-            d.addErrback(deferred.errback)
-            return deferred
+                                      self.name, self.access_level != 'Modify')
         else:
             return self.action_queue.client.create_share(self.node_id,
                                                          self.share_to,
@@ -2054,9 +2049,12 @@
 
         url = "https://one.ubuntu.com/files/api/set_public/%s" % (node_key,)
         method = oauth.OAuthSignatureMethod_PLAINTEXT()
+        timestamp = timestamp_checker.get_faithful_time()
+        parameters = {"oauth_timestamp": timestamp}
         request = oauth.OAuthRequest.from_consumer_and_token(
             http_url=url,
             http_method="POST",
+            parameters=parameters,
             oauth_consumer=self.action_queue.consumer,
             token=self.action_queue.token)
         request.sign_request(method, self.action_queue.consumer,
@@ -2106,9 +2104,12 @@
         """Get public files list using the HTTP Web API method."""
 
         method = oauth.OAuthSignatureMethod_PLAINTEXT()
+        timestamp = timestamp_checker.get_faithful_time()
+        parameters = {"oauth_timestamp": timestamp}
         request = oauth.OAuthRequest.from_consumer_and_token(
             http_url=self._url,
             http_method="GET",
+            parameters=parameters,
             oauth_consumer=self.action_queue.consumer,
             token=self.action_queue.token)
         request.sign_request(method, self.action_queue.consumer,