mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-27 07:06:13 +01:00
Code

Merge branch 'config_select_password_store' of https://github.com/marcus-h/osc

Browse Source 
Add support for changing the password store via "osc config" + a small
bugfix in the "osc config -d <apiurl> pass" codepath.
This commit is contained in:
Marcus Huewe 2021-07-21 10:31:47 +02:00
commit 6b83134377
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osc/commandline.py
View File

@ -9207,6 +9207,11 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if len(args) != 1: if len(args) != 1:
raise oscerr.WrongArgs('--change-password only needs the apiurl') raise oscerr.WrongArgs('--change-password only needs the apiurl')
args = [args[0], 'pass'] args = [args[0], 'pass']
elif opts.select_password_store:
if len(args) != 1:
raise oscerr.WrongArgs('--select-password-store only needs the apiurl')
args = [args[0], 'pass']
if len(args) < 2 and not (opts.dump or opts.dump_full): if len(args) < 2 and not (opts.dump or opts.dump_full):
raise oscerr.WrongArgs('Too few arguments') raise oscerr.WrongArgs('Too few arguments')
elif opts.dump or opts.dump_full: elif opts.dump or opts.dump_full:

9
osc/conf.py
View File

@ -726,6 +726,13 @@ def config_set_option(section, opt, val=None, delete=False, update=True, creds_m
if section == 'general' and not opt in general_opts or \ if section == 'general' and not opt in general_opts or \
section != 'general' and not opt in api_host_options: section != 'general' and not opt in api_host_options:
raise oscerr.ConfigError('unknown config option \'%s\'' % opt, config['conffile']) raise oscerr.ConfigError('unknown config option \'%s\'' % opt, config['conffile'])
if not val and not delete and opt == 'pass' and creds_mgr_descr is not None:
# change password store
creds_mgr = _get_credentials_manager(section, cp)
user = _extract_user_compat(cp, section, creds_mgr)
val = creds_mgr.get_password(section, user)
run = False run = False
if val: if val:
if opt == 'pass': if opt == 'pass':
@ -755,7 +762,7 @@ def config_set_option(section, opt, val=None, delete=False, update=True, creds_m
elif delete and (cp.has_option(section, opt) or opt == 'pass'): elif delete and (cp.has_option(section, opt) or opt == 'pass'):
if opt == 'pass': if opt == 'pass':
creds_mgr = _get_credentials_manager(section, cp) creds_mgr = _get_credentials_manager(section, cp)
user = _extract_user_compar(cp, section, creds_mgr) user = _extract_user_compat(cp, section, creds_mgr)
creds_mgr.delete_password(section, user) creds_mgr.delete_password(section, user)
else: else:
cp.remove_option(section, opt) cp.remove_option(section, opt)