-
Notifications
You must be signed in to change notification settings - Fork 347
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
T5661: Add show show ssh dynamic-protection attacker and show log ssh… #2369
Merged
+118
−53
Merged
Changes from all commits
Commits
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
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
This file was deleted.
Oops, something went wrong.
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 |
---|---|---|
@@ -0,0 +1,100 @@ | ||
#!/usr/bin/env python3 | ||
# | ||
# Copyright 2017-2023 VyOS maintainers and contributors <[email protected]> | ||
# | ||
# This library is free software; you can redistribute it and/or | ||
# modify it under the terms of the GNU Lesser General Public | ||
# License as published by the Free Software Foundation; either | ||
# version 2.1 of the License, or (at your option) any later version. | ||
# | ||
# This library is distributed in the hope that it will be useful, | ||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
# Lesser General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU Lesser General Public | ||
# License along with this library. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
import json | ||
import sys | ||
import glob | ||
import vyos.opmode | ||
from vyos.utils.process import cmd | ||
from vyos.configquery import ConfigTreeQuery | ||
from tabulate import tabulate | ||
|
||
def show_fingerprints(raw: bool, ascii: bool): | ||
config = ConfigTreeQuery() | ||
if not config.exists("service ssh"): | ||
raise vyos.opmode.UnconfiguredSubsystem("SSH server is not enabled.") | ||
|
||
publickeys = glob.glob("/etc/ssh/*.pub") | ||
|
||
if publickeys: | ||
keys = [] | ||
for keyfile in publickeys: | ||
try: | ||
if ascii: | ||
keydata = cmd("ssh-keygen -l -v -E sha256 -f " + keyfile).splitlines() | ||
else: | ||
keydata = cmd("ssh-keygen -l -E sha256 -f " + keyfile).splitlines() | ||
type = keydata[0].split(None)[-1].strip("()") | ||
key_size = keydata[0].split(None)[0] | ||
fingerprint = keydata[0].split(None)[1] | ||
comment = keydata[0].split(None)[2:-1][0] | ||
if ascii: | ||
ascii_art = "\n".join(keydata[1:]) | ||
keys.append({"type": type, "key_size": key_size, "fingerprint": fingerprint, "comment": comment, "ascii_art": ascii_art}) | ||
else: | ||
keys.append({"type": type, "key_size": key_size, "fingerprint": fingerprint, "comment": comment}) | ||
except: | ||
# Ignore invalid public keys | ||
pass | ||
if raw: | ||
return keys | ||
else: | ||
headers = {"type": "Type", "key_size": "Key Size", "fingerprint": "Fingerprint", "comment": "Comment", "ascii_art": "ASCII Art"} | ||
output = "SSH server public key fingerprints:\n\n" + tabulate(keys, headers=headers, tablefmt="simple") | ||
return output | ||
else: | ||
if raw: | ||
return [] | ||
else: | ||
return "No SSH server public keys are found." | ||
|
||
def show_dynamic_protection(raw: bool): | ||
config = ConfigTreeQuery() | ||
if not config.exists("service ssh dynamic-protection"): | ||
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. See above, we have an exception specially for this case. |
||
raise vyos.opmode.UnconfiguredSubsystem("SSH server dynamic-protection is not enabled.") | ||
|
||
attackers = [] | ||
try: | ||
# IPv4 | ||
attackers = attackers + json.loads(cmd("sudo nft -j list set ip sshguard attackers"))["nftables"][1]["set"]["elem"] | ||
except: | ||
pass | ||
try: | ||
# IPv6 | ||
attackers = attackers + json.loads(cmd("sudo nft -j list set ip6 sshguard attackers"))["nftables"][1]["set"]["elem"] | ||
except: | ||
pass | ||
if attackers: | ||
if raw: | ||
return attackers | ||
else: | ||
output = "Blocked attackers:\n" + "\n".join(attackers) | ||
return output | ||
else: | ||
if raw: | ||
return [] | ||
else: | ||
return "No blocked attackers." | ||
|
||
if __name__ == '__main__': | ||
try: | ||
res = vyos.opmode.run(sys.modules[__name__]) | ||
if res: | ||
print(res) | ||
except (ValueError, vyos.opmode.Error) as e: | ||
print(e) | ||
sys.exit(1) |
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.
There's a dedicated exception for this case.