Merge ~cjwatson/launchpad:archive-auth-memcache-expire-time into launchpad:master

[Colin Watson]

Fix wsgi-archive-auth's expiry handling for pymemcache

I adjusted `MemcacheFixture` to apply the same type check that `pymemcache` does, in order to catch any other stragglers.

[Jürgen Gmach (jugmac00)]

LGTM - what do you think about adding a test which "proves" our fixture acts like the real thing and throws MemcacheIllegalInputError when you try to pass in a float?

review: Approve

[Colin Watson (cjwatson)]

Good idea - done.

diff --git a/lib/lp/services/memcache/testing.py b/lib/lp/services/memcache/testing.py
index 14b6ca5..307d92f 100644
--- a/lib/lp/services/memcache/testing.py
+++ b/lib/lp/services/memcache/testing.py
@@ -8,6 +8,7 @@ __all__ = [
 import time as _time
 
 import fixtures
+from pymemcache.exceptions import MemcacheIllegalInputError
 
 from lp.services.memcache.client import MemcacheClient
 from lp.services.memcache.interfaces import IMemcacheClient
@@ -36,8 +37,12 @@ class MemcacheFixture(fixtures.Fixture, MemcacheClient):
         # absolute epoch-seconds, and tells them apart using a magic
         # threshold.  See memcached/memcached.c:realtime.
         MONTH_IN_SECONDS = 60 * 60 * 24 * 30
-        if expire and expire <= MONTH_IN_SECONDS:
-            expire = _time.time() + expire
+        if expire:
+            if not isinstance(expire, int):
+                raise MemcacheIllegalInputError(
+                    "expire must be integer, got bad value: %r" % expire)
+            if expire <= MONTH_IN_SECONDS:
+                expire = int(_time.time()) + expire
         self._cache[key] = (val, expire)
         return 1
 
diff --git a/lib/lp/services/memcache/tests/test_testing.py b/lib/lp/services/memcache/tests/test_testing.py
new file mode 100644
index 0000000..9bff933
--- /dev/null
+++ b/lib/lp/services/memcache/tests/test_testing.py
@@ -0,0 +1,23 @@
+# Copyright 2021 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""MemcacheFixture tests."""
+
+from pymemcache.exceptions import MemcacheIllegalInputError
+
+from lp.services.memcache.testing import MemcacheFixture
+from lp.testing import TestCase
+from lp.testing.layers import BaseLayer
+
+
+class TestMemcacheFixture(TestCase):
+    layer = BaseLayer
+
+    def setUp(self):
+        super().setUp()
+        self.client = self.useFixture(MemcacheFixture())
+
+    def test_set_expire_requires_integer(self):
+        self.assertRaises(
+            MemcacheIllegalInputError,
+            self.client.set, "key", "value", expire=0.5)
diff --git a/lib/lp/soyuz/wsgi/archiveauth.py b/lib/lp/soyuz/wsgi/archiveauth.py
index dc0dece..b02c49b 100644
--- a/lib/lp/soyuz/wsgi/archiveauth.py
+++ b/lib/lp/soyuz/wsgi/archiveauth.py
@@ -92,7 +92,7 @@ def check_password(environ, user, password):
         proxy.checkArchiveAuthToken(archive_reference, user, password)
         # Cache positive responses for a minute to reduce database load.
         _memcache_client.set(
-            memcache_key, _crypt_sha256(password), time.time() + 60)
+            memcache_key, _crypt_sha256(password), int(time.time()) + 60)
         _log(environ, "%s@%s: Authorized.", user, archive_reference)
         return True
     except Fault as e: