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

[ssh] improvement #25

Merged
merged 27 commits into from
Oct 22, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ad295ea
[ssh] improvement
XiaoliChan Sep 18, 2023
4b62a53
Merge remote-tracking branch 'upstream/main' into ssh-improv
XiaoliChan Oct 7, 2023
d21bf5e
[ssh] Marshall review I
XiaoliChan Oct 7, 2023
78de09b
[ssh] Neff review I
XiaoliChan Oct 7, 2023
cec042d
[SSH] fix private key with passphrase login
XiaoliChan Oct 7, 2023
c9af18d
[SSH] fix private key with passphrase login
XiaoliChan Oct 7, 2023
ea62e42
[SSH] improve login failed output
XiaoliChan Oct 7, 2023
95ccfca
[SSH] Logic fix
XiaoliChan Oct 7, 2023
84a41b7
[SSH] Remove useless package
XiaoliChan Oct 7, 2023
4eb2c08
Merge branch 'develop' into ssh-improv
Marshall-Hallenbeck Oct 12, 2023
0ef92f0
[ssh] update pyproject.toml
XiaoliChan Oct 13, 2023
0e4c545
Formating
NeffIsBack Oct 15, 2023
ac0fa8c
[ssh] conflict fix
XiaoliChan Oct 18, 2023
d2ed2aa
[ssh] conflict fix
XiaoliChan Oct 18, 2023
feac7f0
[ssh] Neff review I
XiaoliChan Oct 18, 2023
113b980
[ssh] Neff review: args condition
XiaoliChan Oct 18, 2023
6385cce
Formating, ruff linting and removal of unused code
NeffIsBack Oct 18, 2023
90ede7f
Merge branch 'develop' into ssh-improv
Marshall-Hallenbeck Oct 20, 2023
78ed508
[ssh] Marshall review I
XiaoliChan Oct 20, 2023
fa7c594
[ssh] Marshall review I
XiaoliChan Oct 20, 2023
4e1ff89
Merge remote-tracking branch 'upstream/develop' into ssh-improv
XiaoliChan Oct 21, 2023
6a5f76b
Remove all files created on the target
NeffIsBack Oct 21, 2023
35cdf41
[ssh] Neff review II
XiaoliChan Oct 21, 2023
425e83c
[ssh] disable look_for_keys in paramiko
XiaoliChan Oct 21, 2023
4153b80
Merge remote-tracking branch 'upstream/develop' into ssh-improv
XiaoliChan Oct 22, 2023
92f9c8c
Improve ssh key file output
NeffIsBack Oct 22, 2023
6a5ba76
Merge remote-tracking branch 'refs/remotes/xioali_nxc/ssh-improv' int…
NeffIsBack Oct 22, 2023
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
2 changes: 1 addition & 1 deletion nxc/protocols/ssh/proto_args.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def proto_args(parser, std_parser, module_parser):
cgroup = ssh_parser.add_argument_group("Command Execution", "Options for executing commands")
cgroup.add_argument("--codec", default="utf-8",
help="Set encoding used (codec) from the target's output (default "
"\"utf-8\"). If errors are detected, run chcp.com at the target, "
"'utf-8'). If errors are detected, run chcp.com at the target, "
"map the result with "
"https://docs.python.org/3/library/codecs.html#standard-encodings and then execute "
"again with --codec and the corresponding codec")
Expand Down
2 changes: 1 addition & 1 deletion nxc/protocols/winrm/proto_args.py
XiaoliChan marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def proto_args(parser, std_parser, module_parser):
cgroup = winrm_parser.add_argument_group("Command Execution", "Options for executing commands")
cgroup.add_argument("--codec", default="utf-8",
help="Set encoding used (codec) from the target's output (default "
"'utf-8'). If errors are detected, run chcp.com at the target, "
"\"utf-8\"). If errors are detected, run chcp.com at the target, "
"map the result with "
"https://docs.python.org/3/library/codecs.html#standard-encodings and then execute "
"again with --codec and the corresponding codec")
Expand Down