Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Expand SSRF support in IAST to apache-httpclient-5 and apache-httpasyncclient-4 #7920

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
merged 17 commits into from
Dec 9, 2024
Merged

Expand SSRF support in IAST to apache-httpclient-5 and apache-httpasyncclient-4 #7920

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
09d100c
Draft status commit
Mariovido Nov 8, 2024
821f857
Remove comments and leave minimal changes
Mariovido Nov 8, 2024
453d57b
Remove AgentInstaller code
Mariovido Nov 8, 2024
b07f70f
Merge master
Mariovido Nov 8, 2024
e65bf5b
Undo move of apache core module
Mariovido Nov 11, 2024
c4bd2fb
Undo apache decorator
Mariovido Nov 11, 2024
b24df39
Remove unused variable in the ssrf controller
Mariovido Nov 11, 2024
c7ffba1
Simplify instrumentation
Mariovido Nov 13, 2024
29ea5f2
First working solution
Mariovido Nov 13, 2024
af7c2aa
Add support for host methods
Mariovido Nov 13, 2024
160c0ca
Added support for last methods
Mariovido Nov 13, 2024
03a95d6
Add test propagationUtils
Mariovido Nov 13, 2024
7c085ba
Add support for apache-httpasynclient
Mariovido Nov 14, 2024
faa2492
Merge branch 'master' into mario.vidal/expand_support_ssrf_apache
Mariovido Nov 14, 2024
7b2ee35
Minor changes
Mariovido Nov 14, 2024
5347dd7
Change argument to string
Mariovido Dec 9, 2024
d7ed872
Merge branch 'master' into mario.vidal/expand_support_ssrf_apache
Mariovido Dec 9, 2024
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
Prev Previous commit
Next Next commit
Remove AgentInstaller code
  • Loading branch information
@Mariovido
Mariovido committed Nov 8, 2024
commit 453d57b54f31efa4a9568b25c746e274d608ba35
53 changes: 0 additions & 53 deletions dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter;
import datadog.trace.util.AgentTaskScheduler;
import de.thetaphi.forbiddenapis.SuppressForbidden;
import java.io.File;
import java.lang.instrument.ClassFileTransformer;
import java.lang.instrument.Instrumentation;
import java.util.Collections;
Expand All @@ -43,7 +42,6 @@
import net.bytebuddy.dynamic.scaffold.MethodGraph;
import net.bytebuddy.matcher.LatentMatcher;
import net.bytebuddy.utility.JavaModule;
import net.bytebuddy.utility.nullability.MaybeNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -155,57 +153,6 @@ public static ClassFileTransformer installBytebuddyAgent(
.with(AgentStrategies.bufferStrategy())
.with(AgentStrategies.typeStrategy())
.with(new ClassLoadListener())
.with(
new AgentBuilder.Listener.Adapter() {
@Override
public void onTransformation(
TypeDescription typeDescription,
ClassLoader classLoader,
JavaModule module,
boolean loaded,
DynamicType dynamicType) {
try {
if (typeDescription
.getName()
.equals("org.apache.hc.core5.http.message.LineFormatter")) {
//
// Utils.getInstrumentation().retransformClasses(Class.forName("org.apache.hc.core5.http.message.BasicHttpRequest", true, classLoader));
}
dynamicType.saveIn(new File("/Users/mario.vidal/Documents/instrumentations"));
} catch (Throwable e) {
throw new RuntimeException(e);
}
}

@Override
public void onDiscovery(
String typeName,
@MaybeNull ClassLoader classLoader,
@MaybeNull JavaModule module,
boolean loaded) {
super.onDiscovery(typeName, classLoader, module, loaded);
}

@Override
public void onIgnored(
TypeDescription typeDescription,
@MaybeNull ClassLoader classLoader,
@MaybeNull JavaModule module,
boolean loaded) {
super.onIgnored(typeDescription, classLoader, module, loaded);
}

@Override
public void onError(
String typeName,
ClassLoader classLoader,
JavaModule module,
boolean loaded,
Throwable throwable) {
super.onError(typeName, classLoader, module, loaded, throwable);
}
})

// FIXME: we cannot enable it yet due to BB/JVM bug, see
// https://github.com/raphw/byte-buddy/issues/558
// .with(AgentBuilder.LambdaInstrumentationStrategy.ENABLED)
Expand Down