Skip to content
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.

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

Remove 32-bit references from Hadoop #1748

Merged
merged 6 commits into from
Feb 28, 2022

Conversation

shreyamalviya
Copy link
Contributor

What does this PR do?

Fixes a part of #1675

PR Checklist

  • Have you added an explanation of what your changes do and why you'd like to include them?
  • Is the TravisCI build passing?
  • Was the CHANGELOG.md updated to reflect the changes?
  • Was the documentation framework updated to reflect the changes?

Testing Checklist

  • Added relevant unit tests?
  • Have you successfully tested your changes locally? Elaborate:

    Tested by {Running the Monkey locally with relevant config/running Island/...}

  • If applicable, add screenshots or log transcripts of the feature working

Copy link
Collaborator

@mssalvatore mssalvatore left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you follow the chain of calls all the way down, download_monkey_exe() Eventually ends up calling monkey_island/cc/resources/monkey_download.py, which still has logic regarding 32-bit agents in it. We'll have to remove that in this PR as well.

if (not host.os.get("machine") and sys.maxsize < 2 ** 32) or host.os.get(
"machine", ""
).lower() == platform.machine().lower():
# if exe not found, and we have the same arch, use our exe
Copy link
Contributor

@VakarisZ VakarisZ Feb 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will have the same architecture, because we presume it's 64 bit. I don't think we need this check. Instead, we should check the host architecture prior to exploitation and on a higher level than individual exploiters. In other words, we should check fingerprinter results and if we know it's 32 bit we shouldn't even launch the exploiters

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking into it.

Copy link
Collaborator

@mssalvatore mssalvatore left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved pending a final test by @ilija-lazoroski

@mssalvatore mssalvatore merged commit 54715df into 1675-remove-32-bit-agents Feb 28, 2022
@mssalvatore mssalvatore deleted the 1675-remove-32bit-from-hadoop branch February 28, 2022 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants