Remove dead client CA code

The client CA is only needed to for authentication on the server side,
not for authentication on the client side. Therefore remove it from all
client login code.
This commit is contained in:
Till Maas 2015-02-17 19:16:47 +01:00 committed by Mike McLean
parent c54ea3312a
commit ffcf1a30eb
15 changed files with 19 additions and 36 deletions

View file

@ -211,7 +211,7 @@ def get_options():
'poll_interval': 5,
'krbservice': 'host',
'cert': '~/.koji/client.crt',
'ca': '~/.koji/clientca.crt',
'ca': '', # FIXME: remove in next major release
'serverca': '~/.koji/serverca.crt',
'authtype': None
}
@ -265,7 +265,7 @@ def get_options():
for name, value in defaults.iteritems():
if getattr(options, name, None) is None:
setattr(options, name, value)
dir_opts = ('topdir', 'cert', 'ca', 'serverca')
dir_opts = ('topdir', 'cert', 'serverca')
for name in dir_opts:
# expand paths here, so we don't have to worry about it later
value = os.path.expanduser(getattr(options, name))
@ -6831,7 +6831,7 @@ def activate_session(session):
pass
elif options.authtype == "ssl" or os.path.isfile(options.cert) and options.authtype is None:
# authenticate using SSL client cert
session.ssl_login(options.cert, options.ca, options.serverca, proxyuser=options.runas)
session.ssl_login(options.cert, None, options.serverca, proxyuser=options.runas)
elif options.authtype == "password" or options.user and options.authtype is None:
# authenticate using user/password
session.login()

View file

@ -24,8 +24,5 @@
;client certificate
;cert = ~/.koji/client.crt
;certificate of the CA that issued the client certificate
;ca = ~/.koji/clientca.crt
;certificate of the CA that issued the HTTP server certificate
;serverca = ~/.koji/serverca.crt