Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-01 08:09:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix ca bundle path join issue

Browse Source 
CA bundle name start with '/' will break the os path join

Signed-off-by: DQ <dengq@vmware.com>
This commit is contained in:
DQ 2019-11-27 14:54:03 +08:00
parent 045e400547
commit 3aedae86b2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
make/photon/prepare/utils/configs.py
View File

@ -53,7 +53,10 @@ def validate(conf: dict, **kwargs):
# ca_bundle validate # ca_bundle validate
if conf.get('registry_custom_ca_bundle_path'): if conf.get('registry_custom_ca_bundle_path'):
registry_custom_ca_bundle_path = conf.get('registry_custom_ca_bundle_path') or '' registry_custom_ca_bundle_path = conf.get('registry_custom_ca_bundle_path') or ''
ca_bundle_host_path = os.path.join(host_root_dir, registry_custom_ca_bundle_path) if registry_custom_ca_bundle_path.startswith('/data/'):
ca_bundle_host_path = registry_custom_ca_bundle_path
else:
ca_bundle_host_path = os.path.join(host_root_dir, registry_custom_ca_bundle_path.lstrip('/'))
try: try:
uid = os.stat(ca_bundle_host_path).st_uid uid = os.stat(ca_bundle_host_path).st_uid
st_mode = os.stat(ca_bundle_host_path).st_mode st_mode = os.stat(ca_bundle_host_path).st_mode