Skip to content

Commit e5e5d7b

Browse files
authored
Merge pull request #836 from spolti/RHPAM-4147-blue
[blue][RHPAM-4147] - baseFilter(AUTH_LDAP_BASE_FILTER) is incompatibl…
2 parents 0f2cf93 + 60a7ad5 commit e5e5d7b

File tree

9 files changed

+127
-73
lines changed

9 files changed

+127
-73
lines changed

deploy/crds/kieapp.crd.yaml

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,14 @@ spec:
6464
the user search.
6565
type: string
6666
baseFilter:
67-
description: DAP search filter used to locate the context
68-
of the user to authenticate. The input username or userDN
69-
obtained from the login module callback is substituted into
70-
the filter anywhere a {0} expression is used. A common example
71-
for the search filter is (uid={0}).
67+
description: Legacy LDAP search filter used to locate the
68+
context of the user to authenticate. The input username
69+
or userDN obtained from the login module callback is substituted
70+
into the filter anywhere a {0} expression is used. A common
71+
example for the search filter is (uid={0}). For Elytron
72+
based subsystem this property should be configured only
73+
with the search filter parameter, without any search expression.
74+
Example (uid={0}) became just uid.
7275
type: string
7376
bindCredential:
7477
description: LDAP Credentials used for authentication
@@ -162,7 +165,7 @@ spec:
162165
obtained from the login module callback is substituted into
163166
the filter anywhere a {0} expression is used. The authenticated
164167
userDN is substituted into the filter anywhere a {1} is
165-
used. An example search filter that matches on the input
168+
used. An example search filter that , matches on the input
166169
username is (member={0}). An alternative that matches on
167170
the authenticated userDN is (member={1}).
168171
type: string
@@ -3035,11 +3038,15 @@ spec:
30353038
begin the user search.
30363039
type: string
30373040
baseFilter:
3038-
description: DAP search filter used to locate the context
3039-
of the user to authenticate. The input username or userDN
3040-
obtained from the login module callback is substituted
3041-
into the filter anywhere a {0} expression is used. A
3042-
common example for the search filter is (uid={0}).
3041+
description: Legacy LDAP search filter used to locate
3042+
the context of the user to authenticate. The input username
3043+
or userDN obtained from the login module callback is
3044+
substituted into the filter anywhere a {0} expression
3045+
is used. A common example for the search filter is (uid={0}).
3046+
For Elytron based subsystem this property should be
3047+
configured only with the search filter parameter, without
3048+
any search expression. Example (uid={0}) became just
3049+
uid.
30433050
type: string
30443051
bindCredential:
30453052
description: LDAP Credentials used for authentication
@@ -3138,7 +3145,7 @@ spec:
31383145
substituted into the filter anywhere a {0} expression
31393146
is used. The authenticated userDN is substituted into
31403147
the filter anywhere a {1} is used. An example search
3141-
filter that matches on the input username is (member={0}).
3148+
filter that , matches on the input username is (member={0}).
31423149
An alternative that matches on the authenticated userDN
31433150
is (member={1}).
31443151
type: string

deploy/olm-catalog/dev/8.0.1-1/manifests/bamoe-businessautomation-operator.clusterserviceversion.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
categories: Integration & Delivery
88
certified: "false"
99
containerImage: quay.io/kiegroup/kie-cloud-operator:8.0.1
10-
createdAt: "2022-10-20 14:43:44"
10+
createdAt: "2022-11-08 16:39:24"
1111
description: Deploys and manages IBM Business Automation Manager Open Editions
1212
environment.
1313
operators.openshift.io/infrastructure-features: '["Disconnected"]'
@@ -18,7 +18,7 @@ metadata:
1818
operator-bamoe-businessautomation: "true"
1919
operatorframework.io/arch.amd64: supported
2020
operatorframework.io/os.linux: supported
21-
name: bamoe-businessautomation-operator.8.0.1-1-dev-6sxfhtw4j6
21+
name: bamoe-businessautomation-operator.8.0.1-1-dev-bszd8n8ghk
2222
namespace: placeholder
2323
spec:
2424
apiservicedefinitions: {}
@@ -405,7 +405,7 @@ spec:
405405
- operator
406406
labels:
407407
alm-owner-bamoe-businessautomation: bamoe-businessautomation-operator
408-
operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-6sxfhtw4j6
408+
operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-bszd8n8ghk
409409
links:
410410
- name: Product Page
411411
url: https://ibm.com
@@ -421,5 +421,5 @@ spec:
421421
selector:
422422
matchLabels:
423423
alm-owner-bamoe-businessautomation: bamoe-businessautomation-operator
424-
operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-6sxfhtw4j6
425-
version: 8.0.1-1+6sxfhtw4j6
424+
operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-bszd8n8ghk
425+
version: 8.0.1-1+bszd8n8ghk

deploy/olm-catalog/dev/8.0.1-1/manifests/kieapp.crd.yaml

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,14 @@ spec:
6464
the user search.
6565
type: string
6666
baseFilter:
67-
description: DAP search filter used to locate the context
68-
of the user to authenticate. The input username or userDN
69-
obtained from the login module callback is substituted into
70-
the filter anywhere a {0} expression is used. A common example
71-
for the search filter is (uid={0}).
67+
description: Legacy LDAP search filter used to locate the
68+
context of the user to authenticate. The input username
69+
or userDN obtained from the login module callback is substituted
70+
into the filter anywhere a {0} expression is used. A common
71+
example for the search filter is (uid={0}). For Elytron
72+
based subsystem this property should be configured only
73+
with the search filter parameter, without any search expression.
74+
Example (uid={0}) became just uid.
7275
type: string
7376
bindCredential:
7477
description: LDAP Credentials used for authentication
@@ -162,7 +165,7 @@ spec:
162165
obtained from the login module callback is substituted into
163166
the filter anywhere a {0} expression is used. The authenticated
164167
userDN is substituted into the filter anywhere a {1} is
165-
used. An example search filter that matches on the input
168+
used. An example search filter that , matches on the input
166169
username is (member={0}). An alternative that matches on
167170
the authenticated userDN is (member={1}).
168171
type: string
@@ -3035,11 +3038,15 @@ spec:
30353038
begin the user search.
30363039
type: string
30373040
baseFilter:
3038-
description: DAP search filter used to locate the context
3039-
of the user to authenticate. The input username or userDN
3040-
obtained from the login module callback is substituted
3041-
into the filter anywhere a {0} expression is used. A
3042-
common example for the search filter is (uid={0}).
3041+
description: Legacy LDAP search filter used to locate
3042+
the context of the user to authenticate. The input username
3043+
or userDN obtained from the login module callback is
3044+
substituted into the filter anywhere a {0} expression
3045+
is used. A common example for the search filter is (uid={0}).
3046+
For Elytron based subsystem this property should be
3047+
configured only with the search filter parameter, without
3048+
any search expression. Example (uid={0}) became just
3049+
uid.
30433050
type: string
30443051
bindCredential:
30453052
description: LDAP Credentials used for authentication
@@ -3138,7 +3145,7 @@ spec:
31383145
substituted into the filter anywhere a {0} expression
31393146
is used. The authenticated userDN is substituted into
31403147
the filter anywhere a {1} is used. An example search
3141-
filter that matches on the input username is (member={0}).
3148+
filter that , matches on the input username is (member={0}).
31423149
An alternative that matches on the authenticated userDN
31433150
is (member={1}).
31443151
type: string

deploy/olm-catalog/prod/8.0.1-1/manifests/bamoe-businessautomation-operator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
categories: Integration & Delivery
88
certified: "true"
99
containerImage: registry.stage.redhat.io/ibm-bamoe/bamoe-rhel8-operator:8.0.1
10-
createdAt: "2022-10-20 14:43:44"
10+
createdAt: "2022-11-08 16:39:24"
1111
description: Deploys and manages IBM Business Automation Manager Open Editions
1212
environment.
1313
operators.openshift.io/infrastructure-features: '["Disconnected"]'

deploy/olm-catalog/prod/8.0.1-1/manifests/kieapp.crd.yaml

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,14 @@ spec:
6464
the user search.
6565
type: string
6666
baseFilter:
67-
description: DAP search filter used to locate the context
68-
of the user to authenticate. The input username or userDN
69-
obtained from the login module callback is substituted into
70-
the filter anywhere a {0} expression is used. A common example
71-
for the search filter is (uid={0}).
67+
description: Legacy LDAP search filter used to locate the
68+
context of the user to authenticate. The input username
69+
or userDN obtained from the login module callback is substituted
70+
into the filter anywhere a {0} expression is used. A common
71+
example for the search filter is (uid={0}). For Elytron
72+
based subsystem this property should be configured only
73+
with the search filter parameter, without any search expression.
74+
Example (uid={0}) became just uid.
7275
type: string
7376
bindCredential:
7477
description: LDAP Credentials used for authentication
@@ -162,7 +165,7 @@ spec:
162165
obtained from the login module callback is substituted into
163166
the filter anywhere a {0} expression is used. The authenticated
164167
userDN is substituted into the filter anywhere a {1} is
165-
used. An example search filter that matches on the input
168+
used. An example search filter that , matches on the input
166169
username is (member={0}). An alternative that matches on
167170
the authenticated userDN is (member={1}).
168171
type: string
@@ -3035,11 +3038,15 @@ spec:
30353038
begin the user search.
30363039
type: string
30373040
baseFilter:
3038-
description: DAP search filter used to locate the context
3039-
of the user to authenticate. The input username or userDN
3040-
obtained from the login module callback is substituted
3041-
into the filter anywhere a {0} expression is used. A
3042-
common example for the search filter is (uid={0}).
3041+
description: Legacy LDAP search filter used to locate
3042+
the context of the user to authenticate. The input username
3043+
or userDN obtained from the login module callback is
3044+
substituted into the filter anywhere a {0} expression
3045+
is used. A common example for the search filter is (uid={0}).
3046+
For Elytron based subsystem this property should be
3047+
configured only with the search filter parameter, without
3048+
any search expression. Example (uid={0}) became just
3049+
uid.
30433050
type: string
30443051
bindCredential:
30453052
description: LDAP Credentials used for authentication
@@ -3138,7 +3145,7 @@ spec:
31383145
substituted into the filter anywhere a {0} expression
31393146
is used. The authenticated userDN is substituted into
31403147
the filter anywhere a {1} is used. An example search
3141-
filter that matches on the input username is (member={0}).
3148+
filter that , matches on the input username is (member={0}).
31423149
An alternative that matches on the authenticated userDN
31433150
is (member={1}).
31443151
type: string

deploy/olm-catalog/test/8.0.1-1/manifests/bamoe-businessautomation-operator.clusterserviceversion.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
categories: Integration & Delivery
88
certified: "true"
99
containerImage: registry-proxy.engineering.redhat.com/rh-osbs/bamoe-8-rhpam-rhel8-operator:8.0.1
10-
createdAt: "2022-10-20 14:43:44"
10+
createdAt: "2022-11-08 16:39:24"
1111
description: Deploys and manages IBM Business Automation Manager Open Editions
1212
environment.
1313
operators.openshift.io/infrastructure-features: '["Disconnected"]'
@@ -18,7 +18,7 @@ metadata:
1818
operator-bamoe-businessautomation: "true"
1919
operatorframework.io/arch.amd64: supported
2020
operatorframework.io/os.linux: supported
21-
name: bamoe-businessautomation-operator.8.0.1-1-dev-7xj86rglwn
21+
name: bamoe-businessautomation-operator.8.0.1-1-dev-9cp9bt5qrb
2222
namespace: placeholder
2323
spec:
2424
apiservicedefinitions: {}
@@ -405,7 +405,7 @@ spec:
405405
- operator
406406
labels:
407407
alm-owner-bamoe-businessautomation: bamoe-businessautomation-operator
408-
operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-7xj86rglwn
408+
operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-9cp9bt5qrb
409409
links:
410410
- name: Product Page
411411
url: https://ibm.com
@@ -421,5 +421,5 @@ spec:
421421
selector:
422422
matchLabels:
423423
alm-owner-bamoe-businessautomation: bamoe-businessautomation-operator
424-
operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-7xj86rglwn
425-
version: 8.0.1-1+7xj86rglwn
424+
operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-9cp9bt5qrb
425+
version: 8.0.1-1+9cp9bt5qrb

deploy/olm-catalog/test/8.0.1-1/manifests/kieapp.crd.yaml

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,14 @@ spec:
6464
the user search.
6565
type: string
6666
baseFilter:
67-
description: DAP search filter used to locate the context
68-
of the user to authenticate. The input username or userDN
69-
obtained from the login module callback is substituted into
70-
the filter anywhere a {0} expression is used. A common example
71-
for the search filter is (uid={0}).
67+
description: Legacy LDAP search filter used to locate the
68+
context of the user to authenticate. The input username
69+
or userDN obtained from the login module callback is substituted
70+
into the filter anywhere a {0} expression is used. A common
71+
example for the search filter is (uid={0}). For Elytron
72+
based subsystem this property should be configured only
73+
with the search filter parameter, without any search expression.
74+
Example (uid={0}) became just uid.
7275
type: string
7376
bindCredential:
7477
description: LDAP Credentials used for authentication
@@ -162,7 +165,7 @@ spec:
162165
obtained from the login module callback is substituted into
163166
the filter anywhere a {0} expression is used. The authenticated
164167
userDN is substituted into the filter anywhere a {1} is
165-
used. An example search filter that matches on the input
168+
used. An example search filter that , matches on the input
166169
username is (member={0}). An alternative that matches on
167170
the authenticated userDN is (member={1}).
168171
type: string
@@ -3035,11 +3038,15 @@ spec:
30353038
begin the user search.
30363039
type: string
30373040
baseFilter:
3038-
description: DAP search filter used to locate the context
3039-
of the user to authenticate. The input username or userDN
3040-
obtained from the login module callback is substituted
3041-
into the filter anywhere a {0} expression is used. A
3042-
common example for the search filter is (uid={0}).
3041+
description: Legacy LDAP search filter used to locate
3042+
the context of the user to authenticate. The input username
3043+
or userDN obtained from the login module callback is
3044+
substituted into the filter anywhere a {0} expression
3045+
is used. A common example for the search filter is (uid={0}).
3046+
For Elytron based subsystem this property should be
3047+
configured only with the search filter parameter, without
3048+
any search expression. Example (uid={0}) became just
3049+
uid.
30433050
type: string
30443051
bindCredential:
30453052
description: LDAP Credentials used for authentication
@@ -3138,7 +3145,7 @@ spec:
31383145
substituted into the filter anywhere a {0} expression
31393146
is used. The authenticated userDN is substituted into
31403147
the filter anywhere a {1} is used. An example search
3141-
filter that matches on the input username is (member={0}).
3148+
filter that , matches on the input username is (member={0}).
31423149
An alternative that matches on the authenticated userDN
31433150
is (member={1}).
31443151
type: string

0 commit comments

Comments
 (0)