Skip to content

[INT] fix vault v1 and no namespace bug #575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chengshifan merged 1 commit into from
Nov 22, 2023
+4 −4
Merged

[INT] fix vault v1 and no namespace bug #575

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/api/handlers/job_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,24 +286,24 @@ def get_secret(name):
if not namespace:
namespace = ''
if version == 'v1':
url += '/v1/' + namespace + '/' + secret_path
url += '/v1/' + namespace + '/' + secret_path if namespace else '/v1/' + secret_path
elif version == 'v2':
paths = secret_path.split('/')
url += '/v1/' + namespace + '/' + paths[0] + '/data/' + '/'.join(paths[1:])
url += '/v1/' + namespace + '/' + paths[0] + '/data/' + '/'.join(paths[1:]) if namespace else '/v1/' + paths[0] + '/data/' + '/'.join(paths[1:])
# choose validate way
validate_res = get_auth_type(result)
if validate_res == 'token':
logger.info('validate way is token')
elif validate_res == 'appRole':
app_role = {'role_id': role_id, 'secret_id': secret_id}
json_data = json.dumps(app_role)
app_role_url = result[0] + '/v1/' + namespace + '/auth/approle/login'
app_role_url = result[0] + '/v1/' + namespace + '/auth/approle/login' if namespace else result[0] + '/v1/auth/approle/login'
res = requests.post(url=app_role_url, data=json_data, verify=False)
if res.status_code == 200:
json_res = json.loads(res.content)
token = json_res['auth']['client_token']
else:
abort(400, "Getting value from vault error: url is '%s', validate way is appRole; API response: '%s'" % (url, res.text))
abort(400, "Getting value from vault error: url is '%s', validate way is appRole; API response: '%s'" % (app_role_url, res.text))
else:
abort(400, "Validate way is '%s' ! result is '%s' " % (validate_res, result))

Expand Down