-
Notifications
You must be signed in to change notification settings - Fork 433
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
Report usage of unsupported display filter protocol #693
Open
weshouman
wants to merge
2
commits into
KimiNewt:master
Choose a base branch
from
weshouman:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,14 +7,16 @@ | |
import sys | ||
import logging | ||
import warnings | ||
import difflib | ||
|
||
from pyshark import ek_field_mapping | ||
from pyshark.packet.packet import Packet | ||
from pyshark.tshark.output_parser import tshark_ek | ||
from pyshark.tshark.output_parser import tshark_json | ||
from pyshark.tshark.output_parser import tshark_xml | ||
from pyshark.tshark.tshark import get_process_path, get_tshark_display_filter_flag, \ | ||
tshark_supports_json, TSharkVersionException, get_tshark_version, tshark_supports_duplicate_keys | ||
tshark_supports_json, TSharkVersionException, get_tshark_version, tshark_supports_duplicate_keys, \ | ||
TSharkProtocolNotSupportedException, tshark_supports_protocol, get_supported_protocols | ||
|
||
|
||
if sys.version_info < (3, 8): | ||
|
@@ -323,6 +325,17 @@ def _get_tshark_version(self): | |
self.__tshark_version = get_tshark_version(self.tshark_path) | ||
return self.__tshark_version | ||
|
||
def _suggest_protocol_name(self, input_protocol, tshark_path=None, suggestions=1): | ||
"""Suggests the correct protocol names based on the user's input. | ||
|
||
:param input_protocol: Protocol name to match. | ||
:param tshark_path: Custom path to the TShark executable. | ||
:param suggestions: Number of suggestions to return. | ||
:return: list: A list of suggested protocol names. | ||
""" | ||
protocols = get_supported_protocols(tshark_path) | ||
return difflib.get_close_matches(input_protocol.lower(), protocols, n=suggestions) | ||
|
||
async def _get_tshark_process(self, packet_count=None, stdin=None): | ||
"""Returns a new tshark process with previously-set parameters.""" | ||
self._verify_capture_parameters() | ||
|
@@ -344,6 +357,17 @@ async def _get_tshark_process(self, packet_count=None, stdin=None): | |
parameters = [self._get_tshark_path(), "-l", "-n", "-T", output_type] + \ | ||
self.get_parameters(packet_count=packet_count) + output_parameters | ||
|
||
if not tshark_supports_protocol(self._display_filter): | ||
suggestions = "or".join(self._suggest_protocol_name(self._display_filter)) | ||
if (suggestions == ""): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
raise TSharkProtocolNotSupportedException( | ||
f"Protocol {self._display_filter} is not supported by TShark. " + \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No need for the |
||
"Check if protocol is mistyped or it is not loaded to the correct plugins folder") | ||
else: | ||
raise TSharkProtocolNotSupportedException( | ||
f"Protocol {self._display_filter} is not supported by TShark. " + \ | ||
f"Did you mean {suggestions}, or the protocol is not loaded to the correct plugins folder") | ||
|
||
self._log.debug( | ||
"Creating TShark subprocess with parameters: " + " ".join(parameters)) | ||
self._log.debug("Executable: %s", parameters[0]) | ||
|
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TBH this seems like overkill to check it every time we get the process, since it'll only fail very rarely. Maybe we can check it on a crash to explain it?