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

3198 snmp zoo instance #3237

Merged
merged 7 commits into from
Apr 24, 2023
Merged

3198 snmp zoo instance #3237

merged 7 commits into from
Apr 24, 2023

Conversation

cakekoa
Copy link
Contributor

@cakekoa cakekoa commented Apr 21, 2023

What does this PR do?

Fixes #3198.

  • Adds a script for building the SNMP image
  • Updates the terraform script to generate the SNMP instance

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?
  • Have you checked that you haven't introduced any duplicate code?

Testing Checklist

  • Added relevant unit tests?
  • Do all unit tests pass?
  • Do all end-to-end tests pass?
  • Any other testing performed?

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

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

@codecov
Copy link

codecov bot commented Apr 21, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.02 ⚠️

Comparison is base (02ebfa6) 73.13% compared to head (23ef556) 73.11%.

❗ Current head 23ef556 differs from pull request most recent head 484b5c5. Consider uploading reports for the commit 484b5c5 to get more accurate results

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #3237      +/-   ##
===========================================
- Coverage    73.13%   73.11%   -0.02%     
===========================================
  Files          467      467              
  Lines        13681    13675       -6     
===========================================
- Hits         10005     9998       -7     
- Misses        3676     3677       +1     

see 2 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

}
}

resource "google_compute_instance" "snmp-20" {
Copy link
Collaborator

Choose a reason for hiding this comment

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

We should put this in the europe-west1-b zone, as it has much higher quotas than europe-west3-a.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That sounds good. I can re-generate the instances on europe-west1. Our config currently defaults to europe-west3 -- I'll update it to point to europe-west1 by default.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Will pointing to europe-west1 by default have unintended consequences? The BB tests have a dictionary of regions to instances.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, I see what is going on. Yes, it will cause issues. We have our networks split into different regions -- do you know why we do this?

Our networks:

  • 10.2.0.* (tunneling2-main) europe-west3
  • 10.2.1.* (tunneling-main) europe-west3
  • 10.2.2.* (monkeyzoo-main) europe-west3
  • 10.2.3.* (monkeyzoo-main-1) europe-west1
  • 10.2.4.* (credential-reuse) europe-west1
  • 10.2.5.* (credential-reuse2) europe-west1

Copy link
Collaborator

Choose a reason for hiding this comment

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

The different network segments are to allow for different types of testing. But the different regions are are because, initially, everything was in west3, but we hit the CPU quota, so we started building things in west1. There hasn't been time to migrate everything to west1.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay. I can put the instance into europe-west1. To fit with our existing network conventions, I should change the IP to 10.2.3.20

@mssalvatore mssalvatore mentioned this pull request Apr 24, 2023
3 tasks
@cakekoa cakekoa force-pushed the 3198-snmp-zoo-instance branch 2 times, most recently from aba94b5 to 484b5c5 Compare April 24, 2023 17:56
@cakekoa cakekoa requested a review from mssalvatore April 24, 2023 18:18
@cakekoa cakekoa force-pushed the 3198-snmp-zoo-instance branch from 484b5c5 to c2cc9a5 Compare April 24, 2023 18:42
@cakekoa cakekoa merged commit 2542aa2 into develop Apr 24, 2023
@mssalvatore mssalvatore deleted the 3198-snmp-zoo-instance branch April 24, 2023 18:45
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.

SNMP Exploiter Research
2 participants