修复解决 CVE-2023-26148 #443
Merged
修复解决 CVE-2023-26148 #443
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
ithewei
reviewed
Oct 16, 2023
| @@ -489,7 +489,22 @@ void HttpMessage::DumpHeaders(std::string& str) { | |||
| // %s: %s\r\n | |||
| str += header.first; | |||
| str += ": "; | |||
| str += header.second; | |||
There was a problem hiding this comment.
这样改更简单：
str += hv::replaceAll(header.second, "\r\n", "\\r\\n");
There was a problem hiding this comment.
感谢检视。
经过验证，如果命令中存在单个\r或者单个\n，也可能存在相同的问题。如果使用replaceall，需要写成如下部分：
std::string tmp_str = hv::replaceAll(header.second, "\r", "\\r");
str += tmp_str (header.second, "\n", "\\n");
感觉这样的写法应该会比较浪费性能。同时此类场景应该是比较少了，所以原有的写法中，提前判断是否存在\r\n，可以减少正常场景下的性能损失。
|
(Hoping this traverses the language barrier..) Are you aware of the existence of CVE-2023-26147 too? https://nvd.nist.gov/vuln/detail/CVE-2023-26147 It looks like the same thing, but in response headers. Are you confident that this addresses addresses that issue too? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
#442
尝试通过修改HttpMessage.cpp中的业务逻辑，将Header中的\r\n转义成\r\n，即可解决漏洞中描述的问题。