From 067e09d978e648a6f04d0ab35c19b66ce2f49add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20Grani=C3=A9?= Date: Wed, 7 Jun 2023 09:27:15 +0000 Subject: [PATCH 1/3] Do not need sestatus --- .../podman/service/SecurityContextService.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/nl/lexemmens/podman/service/SecurityContextService.java b/src/main/java/nl/lexemmens/podman/service/SecurityContextService.java index db15e6be..4ef941ba 100644 --- a/src/main/java/nl/lexemmens/podman/service/SecurityContextService.java +++ b/src/main/java/nl/lexemmens/podman/service/SecurityContextService.java @@ -67,13 +67,18 @@ private boolean isSELinuxEnabled() throws MojoExecutionException { * Memory protection checking: actual (secure) * Max kernel policy version: 33 */ - Optional seLinuxStatus = seStatusCommand.execute() - .stream() - .filter(line -> line.contains("SELinux status")) - .map(this::extractSeLinuxStatus) - .findFirst(); + try { + Optional seLinuxStatus = seStatusCommand.execute() + .stream() + .filter(line -> line.contains("SELinux status")) + .map(this::extractSeLinuxStatus) + .findFirst(); - return seLinuxStatus.map(seLinuxStatusString -> seLinuxStatusString.equals("enabled")).orElse(false); + return seLinuxStatus.map(seLinuxStatusString -> seLinuxStatusString.equals("enabled")).orElse(false); + } catch (MojoExecutionException mee) { + log.debug(mee.getMessage()); + } + return false; } private String extractSeLinuxStatus(String line) { From 1d79375be8b6b94d7cbe81b43fc12e9b3768c1fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20Grani=C3=A9?= Date: Thu, 6 Jul 2023 12:41:02 +0200 Subject: [PATCH 2/3] Update src/main/java/nl/lexemmens/podman/service/SecurityContextService.java Co-authored-by: Lex Emmens <58597412+lexemmens@users.noreply.github.com> --- .../nl/lexemmens/podman/service/SecurityContextService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/nl/lexemmens/podman/service/SecurityContextService.java b/src/main/java/nl/lexemmens/podman/service/SecurityContextService.java index 4ef941ba..cfde0f66 100644 --- a/src/main/java/nl/lexemmens/podman/service/SecurityContextService.java +++ b/src/main/java/nl/lexemmens/podman/service/SecurityContextService.java @@ -76,7 +76,7 @@ private boolean isSELinuxEnabled() throws MojoExecutionException { return seLinuxStatus.map(seLinuxStatusString -> seLinuxStatusString.equals("enabled")).orElse(false); } catch (MojoExecutionException mee) { - log.debug(mee.getMessage()); + log.debug("SELinux is not installed or not available", mee.getMessage()); } return false; } From cc8af849b652a8e3e91d2bc4cd67d0e99a55a8d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20Grani=C3=A9?= Date: Fri, 7 Jul 2023 07:27:17 +0000 Subject: [PATCH 3/3] Fix compile --- .../nl/lexemmens/podman/service/SecurityContextService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/nl/lexemmens/podman/service/SecurityContextService.java b/src/main/java/nl/lexemmens/podman/service/SecurityContextService.java index cfde0f66..f112b03f 100644 --- a/src/main/java/nl/lexemmens/podman/service/SecurityContextService.java +++ b/src/main/java/nl/lexemmens/podman/service/SecurityContextService.java @@ -76,7 +76,7 @@ private boolean isSELinuxEnabled() throws MojoExecutionException { return seLinuxStatus.map(seLinuxStatusString -> seLinuxStatusString.equals("enabled")).orElse(false); } catch (MojoExecutionException mee) { - log.debug("SELinux is not installed or not available", mee.getMessage()); + log.debug("SELinux is not installed or not available", mee); } return false; }