Skip to content

check_sftp: fixed validation for private-key arg #398

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.

Sign up for GitHub

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

Closed
wu3rstle wants to merge 6 commits into from
Closed

check_sftp: fixed validation for private-key arg #398

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
90d4408
check_sftp: fixed validation for private-key arg
wu3rstle Sep 30, 2021
c1d724a
check_sftp: corrected usage of private-key arg
wu3rstle Sep 30, 2021
45edd46
check_sftp: adjusted help message for private-key
wu3rstle Sep 30, 2021
44a13d6
ceck_sftp: corrected key file format
wu3rstle Sep 30, 2021
3bf6221
check_sftp: renamed private key argument
wu3rstle Sep 30, 2021
7a34263
check_sftp: adjusted whitespacing in help message
wu3rstle Sep 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions active_checks/check_sftp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@ def usage():
USAGE: check_sftp [OPTIONS] HOST

OPTIONS:
--host HOST SFTP server address
--user USER Username for sftp login
--secret SECRET Secret/Password for sftp login
--private-key KEY Private Key for sftp login
--port PORT Alternative port number (default is 22 for the connection)
--get-remote FILE Path to the file which to pull from SFTP server (e.g.
/tmp/testfile.txt)
--get-local PATH Path to store the pulled file locally (e.g. $OMD_ROOT/tmp/)
--put-local FILE Path to the file to push to the sftp server. See above for example
--put-remote PATH Path to save the pushed file (e.g. /tmp/)
--get-timestamp PATH Path to the file for getting the timestamp of this file
--timeout SECONDS Set timeout for connection (default is 10 seconds)
--verbose Output some more detailed information
-h, --help Show this help message and exit
--host HOST SFTP server address
--user USER Username for sftp login
--secret SECRET Secret/Password for sftp login
--private-key-file PATH Path to rsa private Key file for sftp login
--port PORT Alternative port number (default is 22 for the connection)
--get-remote FILE Path to the file which to pull from SFTP server (e.g.
/tmp/testfile.txt)
--get-local PATH Path to store the pulled file locally (e.g. $OMD_ROOT/tmp/)
--put-local FILE Path to the file to push to the sftp server. See above for example
--put-remote PATH Path to save the pushed file (e.g. /tmp/)
--get-timestamp PATH Path to the file for getting the timestamp of this file
--timeout SECONDS Set timeout for connection (default is 10 seconds)
--verbose Output some more detailed information
-h, --help Show this help message and exit
"""
)
sys.exit(1)
Expand All @@ -46,7 +46,7 @@ def connection(opt_key, opt_host, opt_user, opt_pass, opt_port, opt_timeout):
)
else:
client.connect(
opt_host, username=opt_user, pkey=opt_key, port=opt_port, timeout=opt_timeout
opt_host, username=opt_user, key_filename=opt_key, port=opt_port, timeout=opt_timeout
)
return client

Expand Down Expand Up @@ -136,7 +136,7 @@ def parse_arguments(sys_args):
"host=",
"user=",
"secret=",
"privat-key",
"private-key-file=",
"port=",
"get-remote=",
"get-local=",
Expand All @@ -163,8 +163,8 @@ def parse_arguments(sys_args):
opt_user = arg
elif opt in ["--secret"]:
opt_pass = arg
elif opt in ["--private-key"]:
opt_pass = arg
elif opt in ["--private-key-file"]:
opt_key = arg
elif opt in ["--port"]:
opt_port = int(arg)
elif opt in ["--timeout"]:
Expand Down