Main hotupdate #664
Merged
Main hotupdate #664
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
…of Jackson causing certain classes of Smithprobe to be uninstalled)
…tom class loader, which leads to the inability to find so. (Rasp plugin copies so to the system directory in advance) 2. Use gson instead of the Jackson library;
…n Smithprobe to the jvm Java.library.path
# Conflicts: # rasp/jvm/JVMAgent/src/main/java/com/security/smithloader/SmithAgent.java # rasp/jvm/JVMAgent/src/main/java/com/security/smithloader/SmithLoader.java # rasp/jvm/JVMProbe/src/main/java/com/security/smith/SmithProbe.java # rasp/jvm/JVMProbe/src/main/java/com/security/smith/SmithProbeProxy.java # rasp/jvm/JVMProbe/src/main/java/com/security/smith/client/ClassUploadTransformer.java # rasp/jvm/JVMProbe/src/main/java/com/security/smith/client/Client.java # rasp/jvm/JVMProbe/src/main/java/com/security/smith/client/Message.java # rasp/jvm/JVMProbe/src/main/java/com/security/smith/client/MessageSerializer.java # rasp/jvm/JVMProbe/src/main/java/com/security/smith/client/message/ClassFilter.java # rasp/jvm/JVMProbe/src/main/java/com/security/smith/client/message/Heartbeat.java # rasp/librasp/src/jvm.rs # rasp/librasp/src/manager.rs
yoloyyh
approved these changes
Jul 25, 2024
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.
Merge remote-tracking branch 'remotes/origin/elkeid-rasp-guoyj'
Conflicts:
rasp/jvm/JVMAgent/src/main/java/com/security/smithloader/SmithAgent.java
rasp/jvm/JVMAgent/src/main/java/com/security/smithloader/SmithLoader.java
rasp/jvm/JVMProbe/src/main/java/com/security/smith/SmithProbe.java
rasp/jvm/JVMProbe/src/main/java/com/security/smith/SmithProbeProxy.java
rasp/jvm/JVMProbe/src/main/java/com/security/smith/client/ClassUploadTransformer.java
rasp/jvm/JVMProbe/src/main/java/com/security/smith/client/Client.java
rasp/jvm/JVMProbe/src/main/java/com/security/smith/client/Message.java
rasp/jvm/JVMProbe/src/main/java/com/security/smith/client/MessageSerializer.java
rasp/jvm/JVMProbe/src/main/java/com/security/smith/client/message/ClassFilter.java
rasp/jvm/JVMProbe/src/main/java/com/security/smith/client/message/Heartbeat.java
rasp/librasp/src/jvm.rs
rasp/librasp/src/manager.rs