diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-29 11:25:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-29 11:25:11 -0400 |
| commit | 76344e68b32059d23e649a8bfc7a6b6bdafc84b7 (patch) | |
| tree | 09a7a2ffc58dde54c21e7e9fd17f16f8e73e7af9 | |
| parent | 5e32de3e8e9b302dbc9f4ba26985380197ac4171 (diff) | |
| parent | 1371fdf611fbdc7982d6b1cfa881ce35855ccfbb (diff) | |
| download | openshift-76344e68b32059d23e649a8bfc7a6b6bdafc84b7.tar.gz openshift-76344e68b32059d23e649a8bfc7a6b6bdafc84b7.tar.bz2 openshift-76344e68b32059d23e649a8bfc7a6b6bdafc84b7.tar.xz openshift-76344e68b32059d23e649a8bfc7a6b6bdafc84b7.zip | |
Merge pull request #4887 from zgalor/fix_oc_route_certificate_validation
Only validate certificates that are passed to oc_route
| -rw-r--r-- | roles/lib_openshift/library/oc_route.py | 7 | ||||
| -rw-r--r-- | roles/lib_openshift/src/class/oc_route.py | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/roles/lib_openshift/library/oc_route.py b/roles/lib_openshift/library/oc_route.py index d6db75e1e..8f8e46e1e 100644 --- a/roles/lib_openshift/library/oc_route.py +++ b/roles/lib_openshift/library/oc_route.py @@ -1665,9 +1665,6 @@ class OCRoute(OpenShiftCLI): @staticmethod def get_cert_data(path, content): '''get the data for a particular value''' - if not path and not content: - return None - rval = None if path and os.path.exists(path) and os.access(path, os.R_OK): rval = open(path).read() @@ -1706,14 +1703,14 @@ class OCRoute(OpenShiftCLI): if params['tls_termination'] and params['tls_termination'].lower() != 'passthrough': # E501 for key, option in files.items(): - if key == 'destcacert' and params['tls_termination'] != 'reencrypt': + if not option['path'] and not option['content']: continue option['value'] = OCRoute.get_cert_data(option['path'], option['content']) # E501 if not option['value']: return {'failed': True, - 'msg': 'Verify that you pass a value for %s' % key} + 'msg': 'Verify that you pass a correct value for %s' % key} rconfig = RouteConfig(params['name'], params['namespace'], diff --git a/roles/lib_openshift/src/class/oc_route.py b/roles/lib_openshift/src/class/oc_route.py index 3935525f1..3a1bd732f 100644 --- a/roles/lib_openshift/src/class/oc_route.py +++ b/roles/lib_openshift/src/class/oc_route.py @@ -68,9 +68,6 @@ class OCRoute(OpenShiftCLI): @staticmethod def get_cert_data(path, content): '''get the data for a particular value''' - if not path and not content: - return None - rval = None if path and os.path.exists(path) and os.access(path, os.R_OK): rval = open(path).read() @@ -109,14 +106,14 @@ class OCRoute(OpenShiftCLI): if params['tls_termination'] and params['tls_termination'].lower() != 'passthrough': # E501 for key, option in files.items(): - if key == 'destcacert' and params['tls_termination'] != 'reencrypt': + if not option['path'] and not option['content']: continue option['value'] = OCRoute.get_cert_data(option['path'], option['content']) # E501 if not option['value']: return {'failed': True, - 'msg': 'Verify that you pass a value for %s' % key} + 'msg': 'Verify that you pass a correct value for %s' % key} rconfig = RouteConfig(params['name'], params['namespace'], |