summaryrefslogtreecommitdiffstats
path: root/filter_plugins
diff options
context:
space:
mode:
Diffstat (limited to 'filter_plugins')
-rw-r--r--filter_plugins/oo_filters.py3
-rw-r--r--filter_plugins/openshift_master.py6
2 files changed, 7 insertions, 2 deletions
diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py
index 557a684dc..b57bc0afa 100644
--- a/filter_plugins/oo_filters.py
+++ b/filter_plugins/oo_filters.py
@@ -39,7 +39,6 @@ class FilterModule(object):
the value.
If the key isn't present, None is returned.
-
Ex: data = {'a': {'b': {'c': 5}}}
attribute = "a.b.c"
returns 5
@@ -57,6 +56,7 @@ class FilterModule(object):
return ptr
+
@staticmethod
def oo_flatten(data):
""" This filter plugin will flatten a list of lists
@@ -146,6 +146,7 @@ class FilterModule(object):
retval = [FilterModule.get_attr(d, attribute) for d in data]
retval = [val for val in retval if val != None]
+
return retval
@staticmethod
diff --git a/filter_plugins/openshift_master.py b/filter_plugins/openshift_master.py
index 048cd04c7..d196d6c1f 100644
--- a/filter_plugins/openshift_master.py
+++ b/filter_plugins/openshift_master.py
@@ -237,7 +237,11 @@ class RequestHeaderIdentityProvider(IdentityProviderBase):
self._required += [['headers']]
self._optional += [['challengeURL', 'challenge_url'],
['loginURL', 'login_url'],
- ['clientCA', 'client_ca']]
+ ['clientCA', 'client_ca'],
+ ['clientCommonNames', 'client_common_names'],
+ ['emailHeaders', 'email_headers'],
+ ['nameHeaders', 'name_headers'],
+ ['preferredUsernameHeaders', 'preferred_username_headers']]
def validate(self):
''' validate this idp instance '''