Skip to content

Fix for M1(+) binary executions outside of docker #2000

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
commjoen merged 4 commits into from
May 7, 2025
Merged

Fix for M1(+) binary executions outside of docker #2000

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6715a49
adding xattr option to make testing go smooth
commjoen May 7, 2025
26e1bae
adding xattr option to make testing go smooth
commjoen May 7, 2025
2bd2c7b
remove tmp file
commjoen May 7, 2025
b72ec2b
Add suppression as we do command verifications
commjoen May 7, 2025
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
35 changes: 35 additions & 0 deletions .../java/org/owasp/wrongsecrets/challenges/docker/binaryexecution/BinaryExecutionHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,44 @@ private File createTempExecutable(String fileName) throws IOException {
log.info("setting the file {} executable failed... rest can be ignored", execFile.getPath());
}
FileUtils.copyFile(challengeFile, execFile);
if (useArm() && !useLinux() && !useWindows()) {
// we have an aarch macos
log.info(
"We are on Mac os with ARM let's use xattr -d com.apple.quarantine on {}",
execFile.getPath());
xattrMacOSExecFile(execFile);
}
return execFile;
}

@SuppressFBWarnings(
value = "COMMAND_INJECTION",
justification = "We check for various injection methods and counter those")
private static void xattrMacOSExecFile(File execFile) {
try {
if (!(execFile != null
&& execFile.exists()
&& !Strings.isNullOrEmpty(execFile.getPath())
&& execFile.getPath().contains("wrongsecrets"))) {
log.info("The execfile is not properly setup, returning");
return;
}
ProcessBuilder ps =
new ProcessBuilder("/usr/bin/xattr", "-d", "com.apple.quarantine", execFile.getPath());
ps.redirectErrorStream(true);
Process pr = ps.start();
try (BufferedReader in =
new BufferedReader(new InputStreamReader(pr.getInputStream(), StandardCharsets.UTF_8))) {
String result = in.readLine();
log.info("result of xatr operation: " + result);
} catch (IOException e) {
log.warn("error while reading executable file", e);
}
} catch (IOException e) {
log.warn("error while reading executable file", e);
}
}

private void deleteFile(File execFile) {
if (!execFile.delete()) {
log.info("Deleting the file {} failed...", execFile.getPath());
Expand Down
Loading