This repository has been archived by the owner on Jun 6, 2024. It is now read-only.
Fix bug: arbitrary file read in log manager & remove block io ops #5101
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Fix: #5119 |
Gerhut
suggested changes
Nov 23, 2020
abuccts
reviewed
Nov 23, 2020
Comment on lines
30
to
37
| local function is_path_under_log_folder(log_path) | ||
| local real_path = path.abspath(log_path) | ||
|
|
||
| if not string.match(real_path, "^/usr/local/pai/logs/.*") then | ||
| return false | ||
| end | ||
| return true | ||
| end |
| ngx.log(ngx.ERR, log_path.." not exists") | ||
| ngx.status = ngx.HTTP_NOT_FOUND | ||
| return ngx.exit(ngx.HTTP_OK) | ||
| end | ||
|
|
||
| local logs | ||
| if (tail_mode == "true") then | ||
| logs = io.popen("tail -c 16k "..log_path) | ||
| ngx.req.set_uri(log_path) |
There was a problem hiding this comment.
There was a problem hiding this comment.
We can not fix this issue. Just check the url to make sure it's validate
| local path_prefix = "/api/v1/logs/" | ||
|
|
||
| local ret = {} | ||
|
|
||
| if not is_dir(path) then | ||
| if not util.is_path_under_log_folder(log_dir) or not path.isdir(log_dir) then |
There was a problem hiding this comment.
could you unify the name folder and dir, and differ from path?
| @@ -43,19 +42,19 @@ end | |||
|
|
|||
| local log_query_param = "?username="..username.."&framework-name="..framework_name.. | |||
| "&pod-uid="..pod_uid.."&taskrole="..taskrole.."&token="..token | |||
| local path = "/usr/local/pai/logs/"..username.."/".. framework_name.."/".. taskrole.."/"..pod_uid.."/" | |||
| local log_dir = "/usr/local/pai/logs/"..username.."/".. framework_name.."/".. taskrole.."/"..pod_uid.."/" | |||
| local path_prefix = "/api/v1/logs/" | |||
| internal; | ||
| add_header Accept-Ranges bytes; | ||
|
|
||
| root /; |
There was a problem hiding this comment.
could this service serve /usr/local/pai/logs/ directory only, and remove this prefix when processing?
Binyang2014
changed the title
Binyang2014
force-pushed
the
binyli/security-log
branch
from
576296e to
0137d65
Compare
Gerhut
reviewed
Nov 27, 2020
Gerhut
approved these changes
Nov 27, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.