mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Don't set delegation flag in client, we're using S4U2Proxy now
A forwardable ticket is still required but we no longer need to send the TGT to the IPA server. A new flag, --delegate, is available if the old behavior is required. Set the minimum n-v-r for mod_auth_kerb and krb5-server to pick up needed patches for S4U2Proxy to work. https://fedorahosted.org/freeipa/ticket/1098 https://fedorahosted.org/freeipa/ticket/2246
This commit is contained in:
committed by
Martin Kosek
parent
95b1848f19
commit
2da6d6e746
@@ -110,7 +110,7 @@ class Executioner(Backend):
|
||||
self.Backend.ldap2.connect(ccache=ccache)
|
||||
else:
|
||||
self.Backend.xmlclient.connect(verbose=(self.env.verbose >= 2),
|
||||
fallback=self.env.fallback)
|
||||
fallback=self.env.fallback, delegate=self.env.delegate)
|
||||
if client_ip is not None:
|
||||
setattr(context, "client_ip", client_ip)
|
||||
|
||||
|
||||
@@ -139,6 +139,7 @@ DEFAULT_CONFIG = (
|
||||
('prompt_all', False),
|
||||
('interactive', True),
|
||||
('fallback', True),
|
||||
('delegate', False),
|
||||
|
||||
# Enable certain optional plugins:
|
||||
('enable_ra', False),
|
||||
|
||||
@@ -530,6 +530,9 @@ class API(DictProxy):
|
||||
parser.add_option('-d', '--debug', action='store_true',
|
||||
help='Produce full debuging output',
|
||||
)
|
||||
parser.add_option('--delegate', action='store_true',
|
||||
help='Delegate the TGT to the IPA server',
|
||||
)
|
||||
parser.add_option('-v', '--verbose', action='count',
|
||||
help='Produce more verbose output. A second -v displays the XML-RPC request',
|
||||
)
|
||||
@@ -570,7 +573,7 @@ class API(DictProxy):
|
||||
pass
|
||||
overrides[str(key.strip())] = value.strip()
|
||||
for key in ('conf', 'debug', 'verbose', 'prompt_all', 'interactive',
|
||||
'fallback'):
|
||||
'fallback', 'delegate'):
|
||||
value = getattr(options, key, None)
|
||||
if value is not None:
|
||||
overrides[key] = value
|
||||
|
||||
@@ -232,6 +232,7 @@ class KerbTransport(SSLTransport):
|
||||
"""
|
||||
Handles Kerberos Negotiation authentication to an XML-RPC server.
|
||||
"""
|
||||
flags = kerberos.GSS_C_MUTUAL_FLAG | kerberos.GSS_C_SEQUENCE_FLAG
|
||||
|
||||
def _handle_exception(self, e, service=None):
|
||||
(major, minor) = ipautil.get_gsserror(e)
|
||||
@@ -257,10 +258,7 @@ class KerbTransport(SSLTransport):
|
||||
service = "HTTP@" + host.split(':')[0]
|
||||
|
||||
try:
|
||||
(rc, vc) = kerberos.authGSSClientInit(service,
|
||||
kerberos.GSS_C_DELEG_FLAG |
|
||||
kerberos.GSS_C_MUTUAL_FLAG |
|
||||
kerberos.GSS_C_SEQUENCE_FLAG)
|
||||
(rc, vc) = kerberos.authGSSClientInit(service, self.flags)
|
||||
except kerberos.GSSError, e:
|
||||
self._handle_exception(e)
|
||||
|
||||
@@ -284,6 +282,14 @@ class KerbTransport(SSLTransport):
|
||||
return (host, extra_headers, x509)
|
||||
|
||||
|
||||
class DelegatedKerbTransport(KerbTransport):
|
||||
"""
|
||||
Handles Kerberos Negotiation authentication and TGT delegation to an
|
||||
XML-RPC server.
|
||||
"""
|
||||
flags = kerberos.GSS_C_DELEG_FLAG | kerberos.GSS_C_MUTUAL_FLAG | \
|
||||
kerberos.GSS_C_SEQUENCE_FLAG
|
||||
|
||||
class xmlclient(Connectible):
|
||||
"""
|
||||
Forwarding backend plugin for XML-RPC client.
|
||||
@@ -303,7 +309,7 @@ class xmlclient(Connectible):
|
||||
"""
|
||||
if not hasattr(self.conn, '_ServerProxy__transport'):
|
||||
return None
|
||||
if isinstance(self.conn._ServerProxy__transport, KerbTransport):
|
||||
if type(self.conn._ServerProxy__transport) in (KerbTransport, DelegatedKerbTransport):
|
||||
scheme = "https"
|
||||
else:
|
||||
scheme = "http"
|
||||
@@ -337,14 +343,18 @@ class xmlclient(Connectible):
|
||||
|
||||
return servers
|
||||
|
||||
def create_connection(self, ccache=None, verbose=False, fallback=True):
|
||||
def create_connection(self, ccache=None, verbose=False, fallback=True,
|
||||
delegate=False):
|
||||
servers = self.get_url_list()
|
||||
serverproxy = None
|
||||
for server in servers:
|
||||
kw = dict(allow_none=True, encoding='UTF-8')
|
||||
kw['verbose'] = verbose
|
||||
if server.startswith('https://'):
|
||||
kw['transport'] = KerbTransport()
|
||||
if delegate:
|
||||
kw['transport'] = DelegatedKerbTransport()
|
||||
else:
|
||||
kw['transport'] = KerbTransport()
|
||||
else:
|
||||
kw['transport'] = LanguageAwareTransport()
|
||||
self.log.info('trying %s' % server)
|
||||
|
||||
Reference in New Issue
Block a user