From e885fdff4d1bfee23bd41e6e64f64680ae643624 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Thu, 11 Aug 2016 11:52:05 +0300 Subject: [PATCH] service: add flag to allow S4U2Self Prerequisite for: https://fedorahosted.org/freeipa/ticket/5764 Reviewed-By: Stanislav Laznicka --- API.txt | 12 ++++++++---- VERSION | 4 ++-- ipaserver/plugins/service.py | 7 +++++++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/API.txt b/API.txt index 535d8ec9a4990395207e2455a09a8c1bdef5529a..5b83bfbd0b457b77e0522ab7d83abfae4df3ebe9 100644 --- a/API.txt +++ b/API.txt @@ -2260,7 +2260,7 @@ output: Output('summary', type=[, ]) output: Output('value', type=[]) output: Output('warning', type=[, , ]) command: host_add/1 -args: 1,24,3 +args: 1,25,3 arg: Str('fqdn', cli_name='hostname') option: Str('addattr*', cli_name='addattr') option: Flag('all', autofill=True, cli_name='all', default=False) @@ -2269,6 +2269,7 @@ option: Flag('force', autofill=True, default=False) option: Str('ip_address?') option: Str('ipaassignedidview?') option: Bool('ipakrbokasdelegate?', cli_name='ok_as_delegate') +option: Bool('ipakrboktoauthasdelegate?', cli_name='ok_to_auth_as_delegate') option: Bool('ipakrbrequirespreauth?', cli_name='requires_pre_auth') option: Str('ipasshpubkey*', cli_name='sshpubkey') option: Str('krbprincipalauthind*', cli_name='auth_ind') @@ -2437,7 +2438,7 @@ output: ListOfEntries('result') output: Output('summary', type=[, ]) output: Output('truncated', type=[]) command: host_mod/1 -args: 1,25,3 +args: 1,26,3 arg: Str('fqdn', cli_name='hostname') option: Str('addattr*', cli_name='addattr') option: Flag('all', autofill=True, cli_name='all', default=False) @@ -2445,6 +2446,7 @@ option: Str('delattr*', cli_name='delattr') option: Str('description?', autofill=False, cli_name='desc') option: Str('ipaassignedidview?', autofill=False) option: Bool('ipakrbokasdelegate?', autofill=False, cli_name='ok_as_delegate') +option: Bool('ipakrboktoauthasdelegate?', autofill=False, cli_name='ok_to_auth_as_delegate') option: Bool('ipakrbrequirespreauth?', autofill=False, cli_name='requires_pre_auth') option: Str('ipasshpubkey*', autofill=False, cli_name='sshpubkey') option: Str('krbprincipalauthind*', autofill=False, cli_name='auth_ind') @@ -4293,13 +4295,14 @@ output: Entry('result') output: Output('summary', type=[, ]) output: PrimaryKey('value') command: service_add/1 -args: 1,12,3 +args: 1,13,3 arg: Principal('krbcanonicalname', cli_name='canonical_principal') option: Str('addattr*', cli_name='addattr') option: Flag('all', autofill=True, cli_name='all', default=False) option: Flag('force', autofill=True, default=False) option: StrEnum('ipakrbauthzdata*', cli_name='pac_type', values=[u'MS-PAC', u'PAD', u'NONE']) option: Bool('ipakrbokasdelegate?', cli_name='ok_as_delegate') +option: Bool('ipakrboktoauthasdelegate?', cli_name='ok_to_auth_as_delegate') option: Bool('ipakrbrequirespreauth?', cli_name='requires_pre_auth') option: Str('krbprincipalauthind*', cli_name='auth_ind') option: Flag('no_members', autofill=True, default=False) @@ -4435,13 +4438,14 @@ output: ListOfEntries('result') output: Output('summary', type=[, ]) output: Output('truncated', type=[]) command: service_mod/1 -args: 1,14,3 +args: 1,15,3 arg: Principal('krbcanonicalname', cli_name='canonical_principal') option: Str('addattr*', cli_name='addattr') option: Flag('all', autofill=True, cli_name='all', default=False) option: Str('delattr*', cli_name='delattr') option: StrEnum('ipakrbauthzdata*', autofill=False, cli_name='pac_type', values=[u'MS-PAC', u'PAD', u'NONE']) option: Bool('ipakrbokasdelegate?', autofill=False, cli_name='ok_as_delegate') +option: Bool('ipakrboktoauthasdelegate?', autofill=False, cli_name='ok_to_auth_as_delegate') option: Bool('ipakrbrequirespreauth?', autofill=False, cli_name='requires_pre_auth') option: Str('krbprincipalauthind*', autofill=False, cli_name='auth_ind') option: Principal('krbprincipalname*', autofill=False, cli_name='principal') diff --git a/VERSION b/VERSION index ca489965050f32d2d8987dfd251ec2b2a0ba1768..a8b89ed305bcfdf2990a7400d005a68d734fa7e8 100644 --- a/VERSION +++ b/VERSION @@ -90,5 +90,5 @@ IPA_DATA_VERSION=20100614120000 # # ######################################################## IPA_API_VERSION_MAJOR=2 -IPA_API_VERSION_MINOR=211 -# Last change: mbabinsk: allow 'value' output param in commands without primary key +IPA_API_VERSION_MINOR=212 +# Last change: ab: service: add flag to allow S4U2Self diff --git a/ipaserver/plugins/service.py b/ipaserver/plugins/service.py index a44dcaa5e348d3deedda6c0b4f55760ad873cf49..04d1916fe989a8651bcc4d44f1914c460be1081c 100644 --- a/ipaserver/plugins/service.py +++ b/ipaserver/plugins/service.py @@ -171,11 +171,18 @@ ticket_flags_params = ( doc=_('Client credentials may be delegated to the service'), flags=['virtual_attribute', 'no_search'], ), + Bool('ipakrboktoauthasdelegate?', + cli_name='ok_to_auth_as_delegate', + label=_('Trusted to authenticate as user'), + doc=_('The service is allowed to authenticate on behalf of a client'), + flags=['virtual_attribute', 'no_search'], + ), ) _ticket_flags_map = { 'ipakrbrequirespreauth': 0x00000080, 'ipakrbokasdelegate': 0x00100000, + 'ipakrboktoauthasdelegate': 0x00200000, } _ticket_flags_default = _ticket_flags_map['ipakrbrequirespreauth'] -- 2.7.4