Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(docker): avoid host mountinfo false positives (#616)

TiMb3276b65ab73
diff --git a/src/main/java/io/github/hectorvent/floci/core/common/docker/ContainerDetector.java b/src/main/java/io/github/hectorvent/floci/core/common/docker/ContainerDetector.java
index fc2e5ce1ad..f5405d27c4 100644
--- a/src/main/java/io/github/hectorvent/floci/core/common/docker/ContainerDetector.java
+++ b/src/main/java/io/github/hectorvent/floci/core/common/docker/ContainerDetector.java
@@ -20,7 +20,7 @@ import java.util.Locale;
* <li>Presence of {@code /run/.containerenv} (Podman)</li>
* <li>The {@code container} environment variable set by some runtimes (e.g. Podman sets it to {@code "podman"})</li>
* <li>{@code /proc/1/cgroup} containing {@code docker}, {@code kubepods}, or {@code libpod} (cgroup v1)</li>
- * <li>{@code /proc/self/mountinfo} containing {@code /docker/} or {@code /libpod-} overlay paths (cgroup v2 / Podman)</li>
+ * <li>{@code /proc/self/mountinfo} root mount containing {@code /docker/} or {@code /libpod-} overlay paths (cgroup v2 / Podman)</li>
* <li>On Windows: the {@code CONTAINER} or {@code DOTNET_RUNNING_IN_CONTAINER} environment variable</li>
* </ol>
*/
@@ -33,6 +33,10 @@ public class ContainerDetector {
private static final String PODMAN_ENV_MARKER = "/run/.containerenv";
private static final String CGROUP_V1_FILE = "/proc/1/cgroup";
private static final String MOUNTINFO_FILE = "/proc/self/mountinfo";
+ private static final String[] CGROUP_MARKERS = {"docker", "kubepods", "libpod", "moby",
+ "containerd", "cri-containerd"};
+ private static final String[] MOUNTINFO_MARKERS = {"/docker/", "/libpod-", "/moby/",
+ "/containerd/", "/cri-containerd-"};
private volatile Boolean cachedResult;
@@ -102,13 +106,22 @@ public class ContainerDetector {
}
private boolean hasCgroupV1Markers() {
- return fileContainsAny(CGROUP_V1_FILE, "docker", "kubepods", "libpod", "moby",
- "containerd", "cri-containerd");
+ return fileContainsAny(CGROUP_V1_FILE, CGROUP_MARKERS);
}
private boolean hasMountInfoMarkers() {
- return fileContainsAny(MOUNTINFO_FILE, "/docker/", "/libpod-", "/moby/",
- "/containerd/", "/cri-containerd-");
+ if (!fileExists(MOUNTINFO_FILE)) {
+ return false;
+ }
+ try {
+ Path path = Path.of(MOUNTINFO_FILE);
+ String content = readFileContent(path);
+ return content.lines()
+ .anyMatch(line -> isRootMountInfoLine(line) && containsAny(line, MOUNTINFO_MARKERS));
+ } catch (IOException e) {
+ LOG.debugv("Could not read {0}: {1}", MOUNTINFO_FILE, e.getMessage());
+ }
+ return false;
}
private boolean fileContainsAny(String filePath, String... markers) {
@@ -118,18 +131,28 @@ public class ContainerDetector {
try {
Path path = Path.of(filePath);
String content = readFileContent(path);
- String lower = content.toLowerCase(Locale.ROOT);
- for (String marker : markers) {
- if (lower.contains(marker.toLowerCase(Locale.ROOT))) {
- return true;
- }
- }
+ return containsAny(content, markers);
} catch (IOException e) {
LOG.debugv("Could not read {0}: {1}", filePath, e.getMessage());
}
return false;
}
+ private boolean isRootMountInfoLine(String line) {
+ String[] fields = line.split(" ");
+ return fields.length > 4 && "/".equals(fields[4]);
+ }
+
+ private boolean containsAny(String content, String... markers) {
+ String lower = content.toLowerCase(Locale.ROOT);
+ for (String marker : markers) {
+ if (lower.contains(marker.toLowerCase(Locale.ROOT))) {
+ return true;
+ }
+ }
+ return false;
+ }
+
// --- Following methods are not private to be able to override them in test ---
boolean fileExists(String path) {
@@ -144,4 +167,3 @@ public class ContainerDetector {
return Files.readString(path);
}
}
-
diff --git a/src/test/java/io/github/hectorvent/floci/core/common/docker/ContainerDetectorTest.java b/src/test/java/io/github/hectorvent/floci/core/common/docker/ContainerDetectorTest.java
index 2c95c2ba6c..607bbbabd7 100644
--- a/src/test/java/io/github/hectorvent/floci/core/common/docker/ContainerDetectorTest.java
+++ b/src/test/java/io/github/hectorvent/floci/core/common/docker/ContainerDetectorTest.java
@@ -149,6 +149,18 @@ class ContainerDetectorTest {
assertTrue(d.isRunningInContainer());
}
+ @Test
+ void hostDockerMountsDoNotDetectAsContainer() {
+ ContainerDetector d = detector(false, false, null,
+ """
+ 1505 1423 252:1 / / rw,relatime - ext4 /dev/mapper/root rw
+ 1514 1511 0:4 net:[4026533347] /run/docker/netns/abc rw - nsfs nsfs rw
+ 1538 1505 0:67 / /var/lib/docker/rootfs/abc rw - overlay overlay rw,lowerdir=/var/lib/containerd/snapshots/1/fs
+ """,
+ null, null, null);
+ assertFalse(d.isRunningInContainer());
+ }
+
@Test
void detectedViaMountInfoMoby() {
ContainerDetector d = detector(false, false, null,
@@ -182,4 +194,3 @@ class ContainerDetectorTest {
}
}
-
diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3EventBridgeIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3EventBridgeIntegrationTest.java
index 8d2195a9e0..991440ff5f 100644
--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3EventBridgeIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3EventBridgeIntegrationTest.java
@@ -1,9 +1,7 @@
package io.github.hectorvent.floci.services.s3;
+import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;
import io.quarkus.test.junit.QuarkusTest;
-import io.restassured.RestAssured;
-import io.restassured.config.EncoderConfig;
-import io.restassured.http.ContentType;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
@@ -25,9 +23,7 @@ class S3EventBridgeIntegrationTest {
@BeforeAll
static void configureRestAssured() {
- RestAssured.config = RestAssured.config().encoderConfig(
- EncoderConfig.encoderConfig()
- .encodeContentTypeAs(EB_CONTENT_TYPE, ContentType.TEXT));
+ RestAssuredJsonUtils.configureAwsContentTypes();
}
@Test