Feature/k8s #228
Closed
Feature/k8s #228
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s pod scan enabled by config add telemetry processing for k8s Fixes to usage of traceroute
Exported k8s island logic to service
Add invisible edges between k8s node and hosted pods, add support and generalization of edges to support it various minor design improvements on island
# Conflicts: # monkey/monkey_island/cc/services/node.py # monkey/monkey_island/cc/services/report.py # monkey/monkey_island/cc/ui/src/components/map/MapOptions.js # monkey/monkey_island/cc/ui/src/components/pages/ReportPage.js
Add recommendation for k8s issue Show pods and not pod ips on pane
# Conflicts: # monkey/monkey_island/cc/services/report.py
danielguardicore
suggested changes
Dec 24, 2018
| """ | ||
| if isinstance(unicode_input, dict): | ||
| return {byteify(key): byteify(value) for key, value in six.iteritems(unicode_input)} | ||
| elif isinstance(unicode_input, list): |
There was a problem hiding this comment.
What about tuples?
| return [byteify(element) for element in unicode_input] | ||
| elif isinstance(unicode_input, unicode): | ||
| return byteify_str(unicode_input) | ||
| else: |
There was a problem hiding this comment.
When can this happen? Shouldn't we throw a ValueException or something?
| "MSSQLFingerprint", | ||
| "ElasticFinger" | ||
| "ElasticFinger", | ||
| "K8sKubeletRoFinger" |
There was a problem hiding this comment.
Suggested change
| "K8sKubeletRoFinger" | |
| "K8sKubeletRoFinger", |
| from infection_monkey.network.info import local_ips, get_free_tcp_port | ||
| from infection_monkey.network.mssql_fingerprint import MSSQLFinger | ||
| from infection_monkey.network.mssql_fingerprint import MSSQLFinger | ||
| from infection_monkey.network.k8s_kubelet_ro_fingerprint import K8sKubeletRoFinger |
There was a problem hiding this comment.
Add newline?
Suggested change
| from infection_monkey.network.k8s_kubelet_ro_fingerprint import K8sKubeletRoFinger | |
| from infection_monkey.network.k8s_kubelet_ro_fingerprint import K8sKubeletRoFinger | |
| @staticmethod | ||
| def parse_port_item(port): | ||
| return port['protocol'].lower() + '-' + str(port['containerPort']) | ||
|
|
There was a problem hiding this comment.
Too many blank lines
| return 'black'; | ||
| } | ||
|
|
||
| function edgeGroupToOpacity(group) { |
There was a problem hiding this comment.
Can we add documentation somewhere why the edges are clear?
| :param scan_type: A hostscanner class, will be instanced and used to scan for new machines | ||
| :param max_find: Max number of victims to find regardless of ranges | ||
| :param stop_callback: A callback to check at any point if we should stop scanning | ||
| :param system_info: system_info returned from system_info_collector |
There was a problem hiding this comment.
I don't understand why this is here.
We collect system info in monkey.py before we initialize the network scanner. We can pass it there.
| raise Exception("Cannot find local IP address for the machine") | ||
|
|
||
| LOG.info("Found local IP addresses of the machine: %r", self._ip_addresses) | ||
| # for fixed range, only scan once. |
There was a problem hiding this comment.
Dead comment after removing the rest?
|
|
||
| return None | ||
|
|
||
| def generate_ranges(self, system_info): |
There was a problem hiding this comment.
I like this, now we have an order for the scans.
| :return: yields network range | ||
| """ | ||
| old_range_strs = set() | ||
| range_strs = set() |
There was a problem hiding this comment.
Can be defined lower down?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Feature / Fixes
Have you added an explanation of what your changes do and why you'd like to include them?
Have you successfully tested your changes locally?
Example screenshot/log transcript of the feature working
Changes