Univention Bugzilla – Attachment 10187 Details for
Bug 50236
Remove filter hack from users/user
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch (git:fbest/50236-users-user-filter-rewrite-conjunction)
50236.patch (text/plain), 6.29 KB, created by
Florian Best
on 2019-09-20 19:22 CEST
(
hide
)
Description:
patch (git:fbest/50236-users-user-filter-rewrite-conjunction)
Filename:
MIME Type:
Creator:
Florian Best
Created:
2019-09-20 19:22 CEST
Size:
6.29 KB
patch
obsolete
>commit 0b1c08cfee17d59f802a690d94eccfa072e7944f >Author: Florian Best <best@univention.de> >Date: Fri Sep 20 19:14:27 2019 +0200 > > Bug #50236: fix handling of filter rewrite > >diff --git a/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py b/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py >index 1f43c088bc..2835a08cb9 100644 >--- a/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py >+++ b/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py >@@ -2304,61 +2304,45 @@ class object(univention.admin.handlers.simpleLdap): > elif filter.variable == 'disabled': > # substring match for userPassword is not possible > if filter.value == '1': >- filter.variable = '&(shadowExpire=1)(krb5KDCFlags:1.2.840.113556.1.4.803:=128)(|(sambaAcctFlags=[UD ])(sambaAcctFlags' >- filter.value = '[ULD ]))' >+ filter.transform_to_conjunction(univention.admin.filter.parse('(&(shadowExpire=1)(krb5KDCFlags:1.2.840.113556.1.4.803:=128)(|(sambaAcctFlags=[UD ])(sambaAcctFlags=[ULD ])))')) > elif filter.value == '0': >- filter.variable = '&(!(shadowExpire=1))(!(krb5KDCFlags:1.2.840.113556.1.4.803:=128))(!(|(sambaAcctFlags=[UD ])(sambaAcctFlags' >- filter.value = '[ULD ])))' >+ filter.transform_to_conjunction(univention.admin.filter.parse('(&(!(shadowExpire=1))(!(krb5KDCFlags:1.2.840.113556.1.4.803:=128))(!(|(sambaAcctFlags=[UD ])(sambaAcctFlags=[ULD ]))))')) > if filter.value == 'none': >- filter.variable = '&(!(shadowExpire=1))(!(krb5KDCFlags:1.2.840.113556.1.4.803:=128))(!(|(sambaAcctFlags=[UD ])(sambaAcctFlags' >- filter.value = '[ULD ])))' >+ filter.transform_to_conjunction(univention.admin.filter.parse('(&(!(shadowExpire=1))(!(krb5KDCFlags:1.2.840.113556.1.4.803:=128))(!(|(sambaAcctFlags=[UD ])(sambaAcctFlags=[ULD ]))))')) > elif filter.value == 'all': >- filter.variable = '&(shadowExpire=1)(krb5KDCFlags:1.2.840.113556.1.4.803:=128)(|(sambaAcctFlags=[UD ])(sambaAcctFlags' >- filter.value = '[ULD ]))' >+ filter.transform_to_conjunction(univention.admin.filter.parse('(&(shadowExpire=1)(krb5KDCFlags:1.2.840.113556.1.4.803:=128)(|(sambaAcctFlags=[UD ])(sambaAcctFlags=[ULD ])))')) > elif filter.value == 'posix': > filter.variable = 'shadowExpire' > filter.value = '1' > elif filter.value == 'kerberos': >- filter.variable = 'krb5KDCFlags:1.2.840.113556.1.4.803:' >- filter.value = '128' >+ filter.transform_to_conjunction(univention.admin.filter.parse('(&(krb5KDCFlags:1.2.840.113556.1.4.803:=128))')) > elif filter.value == 'windows': >- filter.variable = '|(sambaAcctFlags=[UD ])(sambaAcctFlags' >- filter.value = '=[ULD ])' >+ filter.transform_to_conjunction(univention.admin.filter.parse('(|(sambaAcctFlags=[UD ])(sambaAcctFlags==[ULD ]))')) > elif filter.value == 'windows_kerberos': >- filter.variable = '&(krb5KDCFlags:1.2.840.113556.1.4.803:=128)(|(sambaAcctFlags=[UD ])(sambaAcctFlags' >- filter.value = '=[ULD ]))' >+ filter.transform_to_conjunction(univention.admin.filter.parse('(&(krb5KDCFlags:1.2.840.113556.1.4.803:=128)(|(sambaAcctFlags=[UD ])(sambaAcctFlags==[ULD ])))')) > elif filter.value == 'windows_posix': >- filter.variable = '&(shadowExpire=1)(|(sambaAcctFlags=[UD ])(sambaAcctFlags' >- filter.value = '=[ULD ]))' >+ filter.transform_to_conjunction(univention.admin.filter.parse('(&(shadowExpire=1)(|(sambaAcctFlags=[UD ])(sambaAcctFlags==[ULD ])))')) > elif filter.value == 'posix_kerberos': >- filter.variable = '&(shadowExpire=1)(krb5KDCFlags' >- filter.value = '254)' >+ filter.transform_to_conjunction(univention.admin.filter.parse('(&(shadowExpire=1)(krb5KDCFlags=254))')) > elif filter.value == '*': > filter.variable = 'uid' > elif filter.variable == 'locked': > if filter.value == '1': >- filter.variable = '|(krb5KDCFlags:1.2.840.113556.1.4.803:=131072)(sambaAcctFlags=[UL ])(sambaAcctFlags' >- filter.value = '[ULD ])' >+ filter.transform_to_conjunction(univention.admin.filter.parse('(|(krb5KDCFlags:1.2.840.113556.1.4.803:=131072)(sambaAcctFlags=[UL ])(sambaAcctFlags=[ULD ]))')) > elif filter.value == '0': >- filter.variable = '&(!(krb5KDCFlags:1.2.840.113556.1.4.803:=131072))(!(sambaAcctFlags=[UL ]))(!(sambaAcctFlags' >- filter.value = '[ULD ]))' >+ filter.transform_to_conjunction(univention.admin.filter.parse('(&(!(krb5KDCFlags:1.2.840.113556.1.4.803:=131072))(!(sambaAcctFlags=[UL ]))(!(sambaAcctFlags=[ULD ])))')) > if filter.value in ['posix', 'windows', 'all', 'none']: > if filter.value == 'all': >- filter.variable = '|(sambaAcctFlags=[UL ])(sambaAcctFlags' >- filter.value = '[ULD ])' >- # filter.variable='|(sambaAcctFlags=[UL ])(sambaAcctFlags=[ULD ])(userPassword' >- # filter.value = '{crypt}!*)' >+ filter.transform_to_conjunction(univention.admin.filter.parse('(|(sambaAcctFlags=[UL ])(sambaAcctFlags=[ULD ]))')) >+ # filter.transform_to_conjunction(univention.admin.filter.parse('(|(sambaAcctFlags=[UL ])(sambaAcctFlags=[ULD ])(userPassword={crypt}!*))')) > if filter.value == 'windows': >- filter.variable = '|(sambaAcctFlags=[UL ])(sambaAcctFlags' >- filter.value = '[ULD ])' >+ filter.transform_to_conjunction(univention.admin.filter.parse('(|(sambaAcctFlags=[UL ])(sambaAcctFlags=[ULD ]))')) > # if filter.value == 'posix': > # filter.variable='userPassword' > # filter.value = '{crypt}!*' > if filter.value == 'none': >- # filter.variable='&(!(sambaAcctFlags=[UL ]))(!(sambaAcctFlags=[ULD ]))(!(userPassword' >- # filter.value = '{crypt}!*))' >- filter.variable = '&(!(sambaAcctFlags=[UL ]))(!(sambaAcctFlags' >- filter.value = '[ULD ]))' >+ # filter.transform_to_conjunction(univention.admin.filter.parse('(&(!(sambaAcctFlags=[UL ]))(!(sambaAcctFlags=[ULD ]))(!(userPassword={crypt}!*)))')) >+ filter.transform_to_conjunction(univention.admin.filter.parse('(&(!(sambaAcctFlags=[UL ]))(!(sambaAcctFlags=[ULD ])))')) > elif filter.value == '*': > filter.variable = 'uid' > else:
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
Actions:
View
|
Diff
Attachments on
bug 50236
:
10186
| 10187