Skip to content

Commit 40a1e5b

Browse files
committed
feat(env): Migrate security libraries to environment component
1 parent bd892ea commit 40a1e5b

File tree

4 files changed

+17
-10
lines changed

4 files changed

+17
-10
lines changed

dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WafInitialization.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.datadog.appsec.util.StandardizedLogging;
44
import com.datadog.ddwaf.Waf;
5+
import datadog.environment.SystemProperties;
56
import java.io.File;
67
import java.io.IOException;
78
import java.util.Scanner;
@@ -13,7 +14,7 @@ public class WafInitialization {
1314

1415
private static boolean initWAF() {
1516
try {
16-
boolean simpleLoad = System.getProperty("POWERWAF_SIMPLE_LOAD") != null;
17+
boolean simpleLoad = SystemProperties.get("POWERWAF_SIMPLE_LOAD") != null;
1718
Waf.initialize(simpleLoad);
1819
} catch (Throwable e) {
1920
Logger logger = LoggerFactory.getLogger(WafInitialization.class);
@@ -26,7 +27,7 @@ private static boolean initWAF() {
2627
}
2728

2829
private static String getLibc() {
29-
String os = System.getProperty("os.name");
30+
String os = SystemProperties.get("os.name");
3031
if ("Linux".equals(os)) {
3132
File file = new File("/proc/self/maps");
3233
try (Scanner sc = new Scanner(file, "ISO-8859-1")) {

dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/AppSecVersion.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
package com.datadog.appsec.util;
22

3+
import datadog.environment.SystemProperties;
34
import java.io.BufferedReader;
45
import java.io.InputStreamReader;
56

67
public class AppSecVersion {
7-
public static final String JAVA_VERSION = System.getProperty("java.version", "unknown");
8-
public static final String JAVA_VM_NAME = System.getProperty("java.vm.name", "unknown");
9-
public static final String JAVA_VM_VENDOR = System.getProperty("java.vm.vendor", "unknown");
8+
public static final String JAVA_VERSION =
9+
SystemProperties.getOrDefault("java.version", "unknown");
10+
public static final String JAVA_VM_NAME =
11+
SystemProperties.getOrDefault("java.vm.name", "unknown");
12+
public static final String JAVA_VM_VENDOR =
13+
SystemProperties.getOrDefault("java.vm.vendor", "unknown");
1014
public static final String VERSION;
1115

1216
static {

dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/StandardizedLogging.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.datadog.appsec.event.data.Address;
66
import com.datadog.appsec.report.AppSecEvent;
77
import com.datadog.ddwaf.Waf;
8+
import datadog.environment.SystemProperties;
89
import org.slf4j.Logger;
910
import org.slf4j.Marker;
1011
import org.slf4j.MarkerFactory;
@@ -42,11 +43,11 @@ public static void libddwafCannotBeLoaded(Logger logger, String libc) {
4243
+ "AppSec could not start. No security activities will be collected. "
4344
+ "Please contact support at https://docs.datadoghq.com/help/ for help. "
4445
+ "Host information: operating_system: {}, libc: {}, arch: {}, runtime: {} {}",
45-
System.getProperty("os.name"),
46+
SystemProperties.get("os.name"),
4647
libc,
47-
System.getProperty("os.arch"),
48-
System.getProperty("java.vm.vendor"),
49-
System.getProperty("java.version"));
48+
SystemProperties.get("os.arch"),
49+
SystemProperties.get("java.vm.vendor"),
50+
SystemProperties.get("java.version"));
5051
}
5152

5253
// C4:

dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/ErpcTls.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.sun.jna.Pointer;
1111
import datadog.cws.erpc.Erpc;
1212
import datadog.cws.erpc.Request;
13+
import datadog.environment.SystemProperties;
1314
import datadog.trace.api.DD128bTraceId;
1415
import datadog.trace.api.DDTraceId;
1516

@@ -40,7 +41,7 @@ public interface CLibrary extends Library {
4041
}
4142

4243
static int getGettidSyscallId() {
43-
String arch = System.getProperty("os.arch");
44+
String arch = SystemProperties.get("os.arch");
4445
if (arch.equals("amd64")) {
4546
return 186; // 186 is the syscall ID for "gettid" on amd64
4647
} else if (arch.equals("arm64")) {

0 commit comments

Comments
 (0)