mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-09 12:35:48 +01:00
Code

Handle a callable in credentials._LazyPassword.__str__

Browse Source 
It is possible that the self._pwfunc() call returns a callable. For
instance, if the keyutils.osc.OscKernelKeyringBackend is configured
in the oscrc. Hence, check in credentials._LazyPassword.__str__
if the returned password is a callable and, if so, call it. Moreover,
a deprecation warning is printed. Eventually, this compat code will
be removed again.

This is a follow-up commit for commit
784d330f202c6e53d5adaeb1b48f93ef1a2e0ad6 ("Only prompt for a password
if the server asks for it") (actually, it is a regression that was
not caught during the review...).
This commit is contained in:
Marcus Huewe 2022-04-14 01:47:10 +02:00
parent ff45f107bb
commit 3262c05e35
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osc/credentials.py
View File

@ -40,9 +40,14 @@ class _LazyPassword(object):
def __str__(self): def __str__(self):
if self._password is None: if self._password is None:
self._password = self._pwfunc() password = self._pwfunc()
if self._password is None: if callable(password):
print('Warning: use of a deprecated credentials manager API.',
file=sys.stderr)
password = password()
if password is None:
raise oscerr.OscIOError(None, 'Unable to retrieve password') raise oscerr.OscIOError(None, 'Unable to retrieve password')
self._password = password
return self._password return self._password
def __len__(self): def __len__(self):