Mercurial > p > roundup > code
annotate roundup/version_check.py @ 7211:506c86823abb
Add config argument to more password.Password invocations.
The work done to allow password_pbkdf2_default_rounds to be overridden
for testing requires that calls to password.Password include a config
argument.
This was needed because using the real value more than quadrupled
testing runtime.
However there are still a few places where config was not being set
when Password was called. I think this fixes all of the ones that are
called from a function that have access to a db.config object.
The remaining ones all call Password(encrypted=x). This results in
Password.unpack() being called. If x is not a propertly formatted
password string ("{scheme}...", it calls encodePassword. It then
should end up raising the ConfigNotSet exception. This is
probably what we want as it means the shape of "x" is not correct.
I don't understand why Password.unpack() attempts to encrypt the value
of encrypted if it doesn't match the right form. According to codecov,
this encryption branch is being used, so somewhere x is of the wrong
form. Hmmm....
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Sat, 04 Mar 2023 00:17:26 -0500 |
| parents | 9223ed67af05 |
| children | f72381d300a4 |
| rev | line source |
|---|---|
|
449
141aacfdb34f
Centralised the python version check code, bumped version to 2.1.1
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1 #!/usr/bin/env python |
|
2005
fc52d57c6c3e
documentation cleanup
Richard Jones <richard@users.sourceforge.net>
parents:
1090
diff
changeset
|
2 |
|
5321
4566360871dc
Raises python requirement to 2.7.
Bernhard Reiter <bernhard@intevation.de>
parents:
4682
diff
changeset
|
3 # Roundup requires Python 2.7+ as mentioned in doc\installation.txt |
|
5376
64b05e24dbd8
Python 3 preparation: convert print to a function.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5321
diff
changeset
|
4 from __future__ import print_function |
|
6016
9223ed67af05
flake8 cleanup: move module import before statement.
John Rouillard <rouilj@ieee.org>
parents:
5376
diff
changeset
|
5 import sys |
|
449
141aacfdb34f
Centralised the python version check code, bumped version to 2.1.1
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
6 |
|
6016
9223ed67af05
flake8 cleanup: move module import before statement.
John Rouillard <rouilj@ieee.org>
parents:
5376
diff
changeset
|
7 VERSION_NEEDED = (2, 7) |
|
9223ed67af05
flake8 cleanup: move module import before statement.
John Rouillard <rouilj@ieee.org>
parents:
5376
diff
changeset
|
8 |
|
4682
0c2cad65ebba
version_check.py: Bump required Python version from 2.1.1+ to 2.5+
anatoly techtonik <techtonik@gmail.com>
parents:
4570
diff
changeset
|
9 if sys.version_info < VERSION_NEEDED: |
|
5376
64b05e24dbd8
Python 3 preparation: convert print to a function.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5321
diff
changeset
|
10 print("Content-Type: text/plain\n") |
|
64b05e24dbd8
Python 3 preparation: convert print to a function.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5321
diff
changeset
|
11 print("Roundup requires Python %s.%s or newer." % VERSION_NEEDED) |
|
449
141aacfdb34f
Centralised the python version check code, bumped version to 2.1.1
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
12 sys.exit(0) |
