Modify code to reduce runtime when testing

The prior change to set default number of PBKDF2 rounds to 2000000
(2M) raised runtime in CI from 12 minutes to an hour.

This commit checks to see if we are invoked from a pytest test using:

    if ("pytest" in sys.modules and
        "PYTEST_CURRENT_TEST" in os.environ):

when no config object is present. I assume that the number of times we
have a full config object is less than with a missing config object.

See if this brings CI runtimes back down. It reduces runtimes on my
local box, but....

Code adapted from
https://stackoverflow.com/questions/25188119/test-if-code-is-executed-from-within-a-py-test-session/44595269#

Author: rouilj

roundup/password.py

@@ -29,7 +29,7 @@
 import roundup.anypy.random_ as random_
 
 from roundup.anypy.strings import us2s, b2s, s2b
-
+from roundup.exceptions import RoundupException
 
 try:
     with warnings.catch_warnings():
@@ -41,6 +41,8 @@
 _bempty = b""
 _bjoin = _bempty.join
 
+class ConfigNotSet(RoundupException):
+    pass
 
 def bchr(c):
     if bytes == str:
@@ -190,7 +192,37 @@ def encodePassword(plaintext, scheme, other=None, config=None):
             if config:
                 rounds = config.PASSWORD_PBKDF2_DEFAULT_ROUNDS
             else:
-                rounds = 2000000
+                import os
+                import sys
+                if ("pytest" in sys.modules and
+                    "PYTEST_CURRENT_TEST" in os.environ):
+                    # Set rounds to 1000 if no config is passed and
+                    # we are running within a pytest test. Using
+                    # actual 2M production values makes testing
+                    # increase from 12 minutes to 1 hour in CI.
+                    rounds = 1000
+                else:
+                    import logging
+                    # Log and abort.  Initialize rounds and log (which
+                    # will probably be ignored) with traceback in case
+                    # ConfigNotSet exception is removed in the
+                    # future.
+                    rounds = 2000000
+                    logger = logging.getLogger('roundup')
+                    if sys.version_info[0] > 2:
+                        logger.critical(
+                            "encodePassword called without config.",
+                            stack_info = True)
+                    else:
+                        import inspect, traceback
+                        where = inspect.currentframe()
+                        trace = traceback.format_stack(where)
+                        logger.critical(
+                            "encodePassword called without config. %s",
+                            trace[:-1]
+                        )
+                    raise ConfigNotSet("encodePassword called without config.")
+
         if rounds < 1000:
             raise PasswordValueError("invalid PBKDF2 hash (rounds too low)")
         raw_digest = pbkdf2(plaintext, raw_salt, rounds, 20)

test/test_security.py

@@ -432,4 +432,15 @@ def test_pbkdf2_migrate_rounds(self):
 
         self.assertEqual(p.needs_migration(config=self.db.config), True)
 
+    def test_encodePasswordNoConfig(self):
+        # should run cleanly as we are in a test.
+        #
+        p = roundup.password.encodePassword('sekrit', 'PBKDF2')
+
+        del(os.environ["PYTEST_CURRENT_TEST"])
+        self.assertNotIn("PYTEST_CURRENT_TEST", os.environ)
+
+        with self.assertRaises(roundup.password.ConfigNotSet) as ctx:
+            roundup.password.encodePassword('sekrit', 'PBKDF2')
+
 # vim: set filetype=python sts=4 sw=4 et si :