Commit Graph

567 Commits (fb8c4bcdcd44d9825b049d896b22f359193869a3)

Author SHA1 Message Date
Xiaoli Chan 9bbab6b47d [winrm] clean
Signed-off-by: Xiaoli Chan <2209553467@qq.com>
2023-11-06 04:09:56 +08:00
Xiaoli Chan 415cd1afa0 [winrm] Fix local auth
Signed-off-by: Xiaoli Chan <2209553467@qq.com>
2023-11-06 04:08:57 +08:00
Xiaoli Chan 112c172403 [winrm] ruff
Signed-off-by: Xiaoli Chan <2209553467@qq.com>
2023-11-06 03:35:42 +08:00
Xiaoli Chan 2b4ea74922 [winrm] fix mpgn test issues
Signed-off-by: Xiaoli Chan <2209553467@qq.com>
2023-11-06 03:32:06 +08:00
Xiaoli Chan d80abb4be9 [winrm] improve enum
Signed-off-by: Xiaoli Chan <2209553467@qq.com>
2023-11-06 03:24:35 +08:00
Xiaoli Chan 234987b97e [winrm] improve logger
Signed-off-by: Xiaoli Chan <2209553467@qq.com>
2023-11-06 02:26:25 +08:00
Xiaoli Chan 8059a6b159 [winrm] self review
Signed-off-by: Xiaoli Chan <2209553467@qq.com>
2023-11-06 02:12:12 +08:00
Xiaoli Chan 892a411ea3 [winrm] more make sense
Signed-off-by: Xiaoli Chan <2209553467@qq.com>
2023-11-06 02:07:06 +08:00
Xiaoli Chan e85fe3c4f2 [winrm] marshall review
Signed-off-by: Xiaoli Chan <2209553467@qq.com>
2023-11-06 02:03:20 +08:00
Xiaoli Chan e1a4da1cea [winrm] ruff
Signed-off-by: Xiaoli Chan <2209553467@qq.com>
2023-11-06 01:53:04 +08:00
Xiaoli Chan 6e562cdfa6 [winrm] ruff
Signed-off-by: Xiaoli Chan <2209553467@qq.com>
2023-11-06 01:50:37 +08:00
Xiaoli Chan 9b475c32ed [winrm] marshall review
Signed-off-by: Xiaoli Chan <2209553467@qq.com>
2023-11-06 01:45:25 +08:00
Xiaoli Chan c38deee8d8 [winrm] conflict fix
Signed-off-by: Xiaoli Chan <2209553467@qq.com>
2023-11-06 01:04:17 +08:00
XiaoliChan 2bf2c30e01 [winrm] ruff
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-11-04 23:19:52 +08:00
XiaoliChan 40f30af119 [winrm] controversial: revert kerberos implement
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-11-04 23:13:27 +08:00
XiaoliChan 88f7ab3a6f Merge remote-tracking branch 'upstream/develop' into winrm-improv 2023-11-04 22:55:30 +08:00
Alexander Neff 96ad5721f5 Functionalyze bloodhound connector, improve handling bloodhound connection without a domain 2023-11-03 20:24:43 -04:00
Alexander Neff d5631cfa60 Move logging output above adding user to bloodhound 2023-11-03 20:23:15 -04:00
Alexander Neff 4f7264312f Merge branch 'develop' into neff-bh-pc 2023-11-03 17:25:45 -04:00
Alexander Neff 3b466a3c9e Merge branch 'develop' into neff-neo4j 2023-11-03 16:58:01 -04:00
Marshall Hallenbeck 1156bd4655
Merge branch 'develop' into winrm-improv 2023-11-03 14:14:38 -04:00
Marshall Hallenbeck b4bd5d6c83
Merge branch 'develop' into connection-miss-port 2023-11-03 12:31:09 -04:00
zblurx 2c1f30a276 fix ruff alerts 2023-11-01 19:47:38 +01:00
zblurx 4853942fee
Merge branch 'develop' into s4u
Signed-off-by: zblurx <68540460+zblurx@users.noreply.github.com>
2023-11-01 19:18:25 +01:00
XiaoliChan 3f91715d31 [winrm] marshall: review I
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-11-01 13:44:32 +08:00
XiaoliChan 74a33e27b0 Merge remote-tracking branch 'upstream/develop' into connection-miss-port 2023-11-01 13:10:29 +08:00
Alexander Neff 47eed50292 Autoformat and fixing some line breaks 2023-10-31 16:48:23 -04:00
Marshall Hallenbeck 47e062493e
Merge branch 'develop' into winrm-improv
Signed-off-by: Marshall Hallenbeck <Marshall.Hallenbeck@gmail.com>
2023-10-31 13:18:11 -04:00
Marshall Hallenbeck 6d962107b9
Merge branch 'develop' into patch1
Signed-off-by: Marshall Hallenbeck <Marshall.Hallenbeck@gmail.com>
2023-10-31 11:27:25 -04:00
XiaoliChan 470d861cf7 [winrm] aeskey support
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-31 22:26:12 +08:00
Alexander Neff 03f3155835 Fix arg hasattr delegate check 2023-10-31 10:24:15 -04:00
XiaoliChan ddb7cf2065 [connection.py] update logger
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-31 21:45:12 +08:00
XiaoliChan e2bc4bdd97 [winrm] platform check when doing kerberos auth
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-31 21:43:36 +08:00
Alex 079c224f17 Fix import error on windows 2023-10-31 14:29:15 +01:00
Surav Shrestha 671afcc039 fix typos in nxc/modules/user_desc.py 2023-10-31 17:20:29 +05:45
Surav Shrestha 6386231e4f fix typos in nxc/modules/teams_localdb.py 2023-10-31 17:20:29 +05:45
Surav Shrestha e993b205d0 fix typos in nxc/modules/schtask_as.py 2023-10-31 17:20:29 +05:45
Surav Shrestha 568cf72860 fix typos in nxc/modules/scan-network.py 2023-10-31 17:20:29 +05:45
Surav Shrestha 2bcb04fcd3 fix typos in nxc/modules/ldap-checker.py 2023-10-31 17:17:26 +05:45
Surav Shrestha 9fa09da8a9 fix typos in nxc/modules/keepass_trigger.py 2023-10-31 17:17:26 +05:45
Surav Shrestha b8476fce4f fix typos in nxc/modules/example_module.py 2023-10-31 17:17:26 +05:45
Surav Shrestha f3e032c4e5 fix typos in nxc/modules/daclread.py 2023-10-31 17:17:26 +05:45
XiaoliChan 9fbe8d5bec [winrm] ruff
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-31 16:25:21 +08:00
XiaoliChan 6f8186479a [winrm] format import
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-31 15:56:50 +08:00
XiaoliChan 312c3d7b68 [winrm] kerberos login implement
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-31 15:55:08 +08:00
Marshall Hallenbeck 4128515a96
Merge branch 'develop' into connection-miss-port
Signed-off-by: Marshall Hallenbeck <Marshall.Hallenbeck@gmail.com>
2023-10-30 22:34:25 -04:00
Marshall Hallenbeck ddd9bcce72
Merge branch 'develop' into neff-bh-pc
Signed-off-by: Marshall Hallenbeck <Marshall.Hallenbeck@gmail.com>
2023-10-30 22:31:16 -04:00
Marshall Hallenbeck 9f81653a6e
Merge branch 'develop' into winrm-improv
Signed-off-by: Marshall Hallenbeck <Marshall.Hallenbeck@gmail.com>
2023-10-30 22:29:41 -04:00
Alex a08458e478
Merge branch 'develop' into neff-neo4j
Signed-off-by: Alex <61382599+NeffIsBack@users.noreply.github.com>
2023-10-30 13:39:50 -04:00
Alexander Neff 00f08c608b Fix single quote 2023-10-30 13:38:10 -04:00
Alexander Neff 4840ea0cd3 Changed to f-string, swapped single quote to double quotes 2023-10-30 10:38:52 -04:00
XiaoliChan 58f6b3715f [winrm.py] ruff
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-29 19:36:16 +08:00
XiaoliChan f18c279a1c [connection.py] ruff
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-29 19:15:56 +08:00
XiaoliChan aeb2a62e1e [winrm] repush commit
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-29 19:12:06 +08:00
XiaoliChan 406f6934b0 [connection.py] Add line break
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-29 18:57:36 +08:00
XiaoliChan b162a07e56 [PR 63] conflict solved
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-29 18:53:29 +08:00
Marshall Hallenbeck b60bef6106
Merge branch 'develop' into neff-bh-pc
Signed-off-by: Marshall Hallenbeck <Marshall.Hallenbeck@gmail.com>
2023-10-29 01:11:51 -04:00
Marshall Hallenbeck 23caad854e
Merge branch 'develop' into neff-py-version
Signed-off-by: Marshall Hallenbeck <Marshall.Hallenbeck@gmail.com>
2023-10-29 01:11:47 -04:00
Marshall Hallenbeck 4b2535d8b4
Merge branch 'develop' into neff-neo4j
Signed-off-by: Marshall Hallenbeck <Marshall.Hallenbeck@gmail.com>
2023-10-29 01:11:25 -04:00
Alex 72500d99be Simplify code and remove unnecessary return nones 2023-10-28 01:04:52 +02:00
Marshall Hallenbeck 9387891dc1 fix comments without space after hash 2023-10-26 19:58:36 -04:00
Marshall Hallenbeck dcdff05b59 fix and add more debug statements for winrm 2023-10-26 19:57:14 -04:00
Marshall Hallenbeck ce1d2a0814 ruff: linting stuff (some was from my conflict resolution I messed up) 2023-10-26 18:26:44 -04:00
Marshall Hallenbeck 71d39f25ef ruff: autofix 2023-10-26 18:22:47 -04:00
Marshall Hallenbeck dc5ef93f7c
Merge branch 'develop' into marshall_cleanup
Signed-off-by: Marshall Hallenbeck <Marshall.Hallenbeck@gmail.com>
2023-10-26 18:10:05 -04:00
Alexander Neff b2c63d569a Change back formating for readability 2023-10-26 21:34:36 +02:00
Alexander Neff db8368e6fb Change back formating for readability 2023-10-26 21:22:50 +02:00
Alexander Neff afe4cd7570 Change back formating for readability 2023-10-26 21:13:34 +02:00
Alexander Neff a416cec4bb Convert one-liner into multi-liner for readability 2023-10-26 21:03:49 +02:00
Alexander Neff c2d6eadd26 Extract base64 script from python code 2023-10-26 20:34:55 +02:00
Alexander Neff d1db71dfae Fix multi-line log message 2023-10-26 20:25:13 +02:00
Alexander Neff cdf089fba8 Fix format of config list 2023-10-24 22:48:12 +02:00
Alexander Neff 34c9c33a4b Extract base64 code to file 2023-10-24 22:43:14 +02:00
Alexander Neff 2595fab10f Format cli.py 2023-10-24 22:16:45 +02:00
sandw1ch c6e5fdb205
use fstring, delete testing comment
Signed-off-by: sandw1ch <se.brink15@gmail.com>
2023-10-24 13:00:22 -05:00
XiaoliChan 96ba933e12 [connection.py] less line
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-24 00:31:45 +08:00
XiaoliChan a037ac9f4a [connection.py] less if condition
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-24 00:23:51 +08:00
XiaoliChan 6ac9f7f0a5 [connection.py] IPv4 preferred
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-23 23:49:12 +08:00
Alexander Neff e4f1558b5a Add computer accounts to bloodhound if local admin on host 2023-10-23 11:20:47 -04:00
XiaoliChan 9cf88eb71c [ssh] conflict fix
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-23 11:17:42 +08:00
Alexander Neff 2998c571a6 Add debug output to get OS and Python version 2023-10-22 13:05:06 -04:00
Alexander Neff a04f08db4b Improve bloodhound connector when adding users and using the NETBIOS name from the domain 2023-10-22 11:38:45 -04:00
Alexander Neff 6a5ba76578 Merge remote-tracking branch 'refs/remotes/xioali_nxc/ssh-improv' into ssh-improv 2023-10-22 07:37:11 -04:00
Alexander Neff 92f9c8c51e Improve ssh key file output 2023-10-22 07:32:11 -04:00
XiaoliChan 4153b80643 Merge remote-tracking branch 'upstream/develop' into ssh-improv 2023-10-22 19:11:08 +08:00
XiaoliChan 0a2a5df789 Merge remote-tracking branch 'upstream/develop' into connection-miss-port 2023-10-22 19:09:59 +08:00
Marshall Hallenbeck be0247cd06
Merge branch 'develop' into neff-module-sort 2023-10-22 00:08:43 -04:00
Marshall Hallenbeck 9e6cef13d1 remove unnecessary import 2023-10-21 23:47:47 -04:00
Marshall Hallenbeck e9eccba193 refactor: remove Python shebangs since they are not needed 2023-10-21 23:45:16 -04:00
Marshall Hallenbeck b31b3b70ba fix: remove loading http server for #35 2023-10-21 23:44:53 -04:00
Marshall Hallenbeck aa696051ed remove http server; fixes #21 2023-10-21 23:43:13 -04:00
Marshall Hallenbeck 8ecdcebf4d fix redundant lines 2023-10-21 19:24:31 -04:00
Marshall Hallenbeck 33a8dfc109 remove redundant log call 2023-10-21 19:20:08 -04:00
Marshall Hallenbeck 3ce70c71b6 fix arbitrary newlining 2023-10-21 19:16:54 -04:00
Marshall Hallenbeck e9dd72e1c1 remove python env specification 2023-10-21 19:13:26 -04:00
Marshall Hallenbeck ac4c2f4168 remove 'exploit' term from MS17-010 since its a check, not an exploit 2023-10-21 19:11:41 -04:00
Marshall Hallenbeck c523d9679b convert string concat to fstring 2023-10-21 19:10:06 -04:00
Marshall Hallenbeck 7eef62ed78 fix: undo newlining 2023-10-21 19:00:16 -04:00
Marshall Hallenbeck 92ddea1ffb fix: remove unnecessary newlining 2023-10-21 18:59:33 -04:00
zblurx b4ccc5a08c remove single quotes 2023-10-21 18:47:01 +02:00
XiaoliChan 425e83c4c4 [ssh] disable look_for_keys in paramiko
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-21 23:38:06 +08:00
XiaoliChan 35cdf414b7 [ssh] Neff review II
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-21 23:13:47 +08:00
Alexander Neff 6a5f76b939 Remove all files created on the target 2023-10-21 07:08:36 -04:00
zblurx 8521d6bf0c Merge branch 's4u' of github.com:Pennyw0rth/NetExec into s4u 2023-10-21 12:44:40 +02:00
zblurx 187828a2b8 fix camelcase and logger import 2023-10-21 12:42:28 +02:00
XiaoliChan fa7c5945ef [ssh] Marshall review I
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-20 15:59:58 +08:00
XiaoliChan 78ed508066 [ssh] Marshall review I
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-20 15:56:39 +08:00
mpgn 5e282156bb Fix ldap query over 1000 results 2023-10-19 15:30:00 -04:00
zblurx 99bba69a72
Merge branch 'develop' into s4u 2023-10-19 11:09:44 +02:00
zblurx 8ea441595c cleanup 2023-10-19 11:07:50 +02:00
XiaoliChan 8f36ad2b1b [connection.py] remove ugly space
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-19 11:00:56 +08:00
XiaoliChan d19aca3c05 [connection.py] Neff review I
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-19 10:35:29 +08:00
Alexander Neff 6385cce49a Formating, ruff linting and removal of unused code 2023-10-18 22:56:23 +02:00
Marshall Hallenbeck dbbffc5952 fix(add-computer): set proper permission on open user request and exit if the computer account is already created 2023-10-18 13:44:01 -04:00
Marshall Hallenbeck f87eeffc41 move imports back to conditional and add comment 2023-10-18 12:08:46 -04:00
XiaoliChan 113b98060c [ssh] Neff review: args condition
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-18 22:40:37 +08:00
XiaoliChan feac7f07bf [ssh] Neff review I
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-18 22:15:38 +08:00
XiaoliChan ac0fa8c3a0 [ssh] conflict fix
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-18 20:12:25 +08:00
Marshall Hallenbeck 8056ef8e28 fix(kerberos): pass kdc_host on kerberos connection 2023-10-17 14:58:22 -04:00
Marshall Hallenbeck 14d6e9bc3e fix: remove ClassVar to be revisited later 2023-10-17 14:58:22 -04:00
Marshall Hallenbeck d28dc10e0f fix(ruff): add back in res variable since it's called in the following debug and add noqa for F841 on it since it will get auto-fixed 2023-10-17 14:30:24 -04:00
Marshall Hallenbeck 2854aa010d ruff: fix a single RUF012 and then ignore it for future use 2023-10-17 14:19:42 -04:00
Marshall Hallenbeck 84d55aa264 ruff: add LOG (no fixes) and RUF and auto-fix 2023-10-16 12:54:57 -04:00
Marshall Hallenbeck b39389f122 ruff: fix E261 - spaces before inline comments 2023-10-16 12:52:45 -04:00
Marshall Hallenbeck a7b95f2fc8 ruff: add refurb (FURB) and auto-fix 2023-10-16 12:48:15 -04:00
Alexander Neff b33f67792d Simplify code and remove unused variables 2023-10-15 20:35:45 +02:00
Alexander Neff 052bfa3c1a Resolve merge conflicts 2023-10-15 20:23:12 +02:00
Marshall Hallenbeck e77ecd31bd ruff: add F841 back in and auto-fix 2023-10-15 13:31:51 -04:00
Alexander Neff e672dce25f Convert for loops into list comprehensions 2023-10-15 19:21:14 +02:00
Alexander Neff dbc1feeadd Replace for loops with list comprehensions 2023-10-15 18:24:09 +02:00
Alex fb886295e1
Merge branch 'develop' into main 2023-10-15 17:30:15 +02:00
Roman Rivas II f26b676c8e
Update ftp.py
Signed-off-by: Roman Rivas II <74742067+RomanRII@users.noreply.github.com>
2023-10-15 08:14:15 -07:00
Roman Rivas II 901b8dee80
Update proto_args.py
Signed-off-by: Roman Rivas II <74742067+RomanRII@users.noreply.github.com>
2023-10-15 08:12:21 -07:00
Alexander Neff dfafcb2975 Add module sorting when listing modules by privileges needed for execution 2023-10-15 10:59:22 -04:00
Alexander Neff 0e4c545bc0 Formating 2023-10-15 09:09:26 -04:00
Marshall Hallenbeck e043e0704e refactor: list comprehension, better header skip, and update docstring 2023-10-15 07:28:58 -04:00
Marshall Hallenbeck 44b0619f44 refactor: list comprehension 2023-10-15 07:28:37 -04:00
Marshall Hallenbeck 6841537347 refactor(daclread): add additional debug, update docstrings, refactor to use list comprehension 2023-10-15 07:18:21 -04:00
Marshall Hallenbeck a90898dba6 refactor: use list comprehension 2023-10-15 06:56:43 -04:00
Marshall Hallenbeck 528248dd31 refactor(samrfunc): use list/dict comprehension 2023-10-15 06:56:21 -04:00
Marshall Hallenbeck fd433b1227 update logging string 2023-10-15 06:49:41 -04:00
Marshall Hallenbeck 8c73dec431 refactor(wmi): fix try except in forloop, add docstring, fix wql variable, and update logging to not cast 2023-10-15 06:41:54 -04:00
Marshall Hallenbeck b3ea011d3b remove string import 2023-10-15 06:30:52 -04:00
Marshall Hallenbeck cd3f3e9347 refactor: reference ascii_lowercase directly 2023-10-15 06:30:29 -04:00
Marshall Hallenbeck 3e056659d8 refactor: use list comprehension for domains retrieved - PERF401 2023-10-14 22:16:59 -04:00
Marshall Hallenbeck 467882a759 refactor: move try except outside forloops - PERF203 2023-10-14 22:15:24 -04:00
Marshall Hallenbeck bc0254d97e refactor: clean up parse_perms logic 2023-10-14 22:13:03 -04:00
Marshall Hallenbeck 5b5ed0c880 refactor: improve character randomization 2023-10-14 21:58:06 -04:00
Marshall Hallenbeck f1af5b8959 ruff: run previously unincluded PIE790 fixes in ruff 0.0.292 2023-10-14 21:53:46 -04:00
Marshall Hallenbeck 59767febce refactor: move try outside forloop 2023-10-14 21:53:06 -04:00
Marshall Hallenbeck 2b34359103 ruff: add ERA001 ignores 2023-10-14 18:42:10 -04:00
Marshall Hallenbeck 6fae02aee0 ruff: add flynt (FLY) and auto-fix 2023-10-14 18:41:08 -04:00
Marshall Hallenbeck 21a8707e9e ruff: add Pylint (PL) and auto-run 2023-10-14 18:36:20 -04:00
Marshall Hallenbeck 82e5d78007 ruff: eradicate commented out code 2023-10-14 18:34:09 -04:00
Marshall Hallenbeck adeddb756e refactor remaining flake8-simplify (SIM) issues 2023-10-14 18:26:24 -04:00
Marshall Hallenbeck cd1b4680ab refactor: simplify logic 2023-10-14 18:13:37 -04:00
Marshall Hallenbeck c1585a5609 refactor: simplify logic again 2023-10-14 18:11:06 -04:00
Marshall Hallenbeck 53af86a557 refactor: use with open for file writing 2023-10-14 18:08:43 -04:00
Marshall Hallenbeck e03e3a105d refactor: use with open for file opening 2023-10-14 17:57:35 -04:00
Marshall Hallenbeck 3a27363c35 refactor: use with for file open 2023-10-14 17:53:01 -04:00
Marshall Hallenbeck c9b325a80c refactor: update if logic 2023-10-14 17:48:05 -04:00
Marshall Hallenbeck 7a8756d692 add noqa for SIM115 2023-10-14 17:47:51 -04:00
Marshall Hallenbeck 4d2ab762bd refactor: simplify logic 2023-10-14 17:44:52 -04:00
Marshall Hallenbeck f3a358fd82 simplify logic and add additional debug statements 2023-10-14 17:36:47 -04:00
Marshall Hallenbeck 39b0ca68a3 fix: ftp proto name 2023-10-14 16:28:26 -04:00
Marshall Hallenbeck cdc8bdbc77 fix: remove extra param added erroneously 2023-10-14 15:56:34 -04:00
Marshall Hallenbeck d8b29312b7 ruff: add flake8-simplify (SIM) and auto-fix 2023-10-14 15:56:22 -04:00
Marshall Hallenbeck cf637968fe fix: ftp class name 2023-10-14 15:52:55 -04:00
Marshall Hallenbeck cdcde5a91b ruff: add flake8-return (RET) and auto-run 2023-10-14 14:16:28 -04:00
Marshall Hallenbeck 781afc9c65 ruff: add flake8-raise (RSE) and auto-run 2023-10-13 15:27:34 -04:00
Marshall Hallenbeck ae14929faf ruff: add flake8-quotes (Q) and auto-run 2023-10-13 15:26:57 -04:00
Marshall Hallenbeck 008b99a28b ruff: add flake8-pytest-style (PT) and auto-run 2023-10-13 15:25:36 -04:00
Marshall Hallenbeck 916c7390c6 ruff: add flake8-pie (PIE) and auto-run 2023-10-13 14:27:53 -04:00
Marshall Hallenbeck d9f2db1a30 ruff: manual flake8-implicit-str-concat (ISC) fixes 2023-10-13 14:19:39 -04:00
Marshall Hallenbeck 0f93876b54 ruff: auto-run flake8-implicit-str-concat (ISC) 2023-10-13 11:23:44 -04:00
Marshall Hallenbeck dcc724118f ruff: auto-run flake8-comprehensions (C4) 2023-10-13 11:21:20 -04:00
Marshall Hallenbeck e3d6622dee remove redundant paranthesis 2023-10-13 11:20:17 -04:00
XiaoliChan fbe9c9f3d9 [connection.py] add 'self.port' & improve gethost_addrinfo
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-13 10:46:45 +08:00
Marshall Hallenbeck 40f557b8e9 ruff: fix flake8-builtins (A) issues 2023-10-12 17:34:01 -04:00
Marshall Hallenbeck bfd32f1910 ruff: manually fix flake8-bugbear issues 2023-10-12 17:23:21 -04:00
Marshall Hallenbeck 4045bebd77 ruff: auto flake8-bugbear, see B006 mutable-argument-default for function param changes 2023-10-12 17:17:20 -04:00
sandw1ch 0b7756f3f6
Merge branch 'develop' into main
Signed-off-by: sandw1ch <se.brink15@gmail.com>
2023-10-12 16:11:23 -05:00
Marshall Hallenbeck 4f5a89262c ruff: remove encoding 2023-10-12 17:07:40 -04:00
Marshall Hallenbeck b24b9210e4 ruff: pyupgrade (UP) ruff changes 2023-10-12 17:06:04 -04:00
Marshall Hallenbeck adc59ffaaa Merge remote-tracking branch 'origin/develop' into marshall_cleanup 2023-10-12 17:00:02 -04:00
Marshall Hallenbeck ba5db57ac9
Merge branch 'develop' into XiaoliChan-nanodump 2023-10-12 16:50:20 -04:00
Marshall Hallenbeck 007d09a390 fix: inform user if msol.ps1 file doesnt exist 2023-10-12 16:04:22 -04:00
Marshall Hallenbeck d638b17c44 fix: inform user if impersonate file doesnt exist 2023-10-12 16:03:37 -04:00
Marshall Hallenbeck 25e4248ccb fix: inform user if handlekatz file doesnt exist 2023-10-12 16:01:54 -04:00
Marshall Hallenbeck b01384d1ec fix error string 2023-10-12 15:58:31 -04:00
Marshall Hallenbeck 8c51b3722a fix: dont throw an exception right after catching it 2023-10-12 15:55:28 -04:00
Marshall Hallenbeck 9052470a5b fix: properly handle connection issue to bolt and let user know 2023-10-12 15:49:57 -04:00
Marshall Hallenbeck 335e6c9755 ruff: manually fixed pydocstyle ruff alerts and add exclusions 2023-10-12 15:41:13 -04:00
Marshall Hallenbeck b002336680 ruff: fix pydocstyle via ruff 2023-10-12 15:13:16 -04:00
Marshall Hallenbeck c9112b1c13 ruff: add quote flake8 rules and re-run ruff 2023-10-12 14:50:36 -04:00
Marshall Hallenbeck 52a1a7a230 Merge branch 'marshall_cleanup' of https://github.com/Pennyw0rth/NetExec into marshall_cleanup 2023-10-12 14:37:37 -04:00
Marshall Hallenbeck 76ac0f7f2b fix: change conflict resolution I messed up and remove ruff quote section, since it was causing issues running ruff check 2023-10-12 14:37:32 -04:00
Marshall Hallenbeck a295db84dd
Merge branch 'develop' into marshall_cleanup
Signed-off-by: Marshall Hallenbeck <Marshall.Hallenbeck@gmail.com>
2023-10-12 14:31:11 -04:00
Marshall Hallenbeck f61d068cd2 ruff: remove unnecessary f string 2023-10-12 14:30:26 -04:00
Marshall Hallenbeck 35333504ea fix: remove extra Exception 2023-10-12 14:30:03 -04:00
Marshall Hallenbeck 4eb2c08d73
Merge branch 'develop' into ssh-improv 2023-10-12 14:26:35 -04:00
Marshall Hallenbeck 6e39bdd96a
Merge branch 'develop' into ascii-art 2023-10-12 14:07:01 -04:00
Marshall Hallenbeck 33d2dc2785 Merge branch 'marshall_cleanup' of https://github.com/Pennyw0rth/NetExec into marshall_cleanup 2023-10-12 11:36:16 -04:00
Marshall Hallenbeck 54bddb50fa fix: remove redundant Except 2023-10-12 11:36:05 -04:00
Marshall Hallenbeck bbc661ba38
Merge branch 'develop' into marshall_cleanup
Signed-off-by: Marshall Hallenbeck <Marshall.Hallenbeck@gmail.com>
2023-10-12 11:17:46 -04:00
Marshall Hallenbeck f573f7f2aa Merge branch 'marshall_cleanup' of https://github.com/Pennyw0rth/NetExec into marshall_cleanup 2023-10-12 11:13:44 -04:00
Marshall Hallenbeck 5cf9f34e1a
Merge branch 'develop' into main 2023-10-12 11:01:28 -04:00
zblurx b7da5aa597
Update nanodump.py 2023-10-12 15:39:53 +02:00
zblurx dd18ef1752 Added support for S4U2Self only 2023-10-12 12:02:34 +02:00
zblurx b7d6a987c9 Merge branch 'nanodump' 2023-10-12 11:37:53 +02:00
zblurx ac8067bc77 fix nanodump 2023-10-12 11:35:31 +02:00
XiaoliChan ea8cdcceef [nanodump] zblurx: review I
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-12 17:25:32 +08:00
XiaoliChan 784c42b674 [nanodump] fix error with temporary path
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-12 14:48:44 +08:00
sandw1ch 50f2e5d1c1
sed "s/'/\"/g"
Signed-off-by: sandw1ch <se.brink15@gmail.com>
2023-10-10 17:23:12 -05:00
sandw1ch 2e0a73c225
Update and rename get_fgpp.py to pso.py
Signed-off-by: sandw1ch <se.brink15@gmail.com>
2023-10-10 16:07:27 -05:00
sandw1ch bab6377101
Delete nxc/modules/pso.py
Signed-off-by: sandw1ch <se.brink15@gmail.com>
2023-10-10 16:06:54 -05:00
sandw1ch 9a4594ea40
Update get_fgpp.py
Signed-off-by: sandw1ch <se.brink15@gmail.com>
2023-10-10 15:58:00 -05:00
sandw1ch 6f8143136c
Update get_fgpp.py
Signed-off-by: sandw1ch <se.brink15@gmail.com>
2023-10-10 15:40:13 -05:00
sandw1ch 2915a54811
Update get_fgpp.py
Signed-off-by: sandw1ch <se.brink15@gmail.com>
2023-10-10 14:26:36 -05:00
sandw1ch e898c25716
Create get_fgpp.py
Signed-off-by: sandw1ch <se.brink15@gmail.com>
2023-10-10 13:18:12 -05:00
Alex 444845c7e2
Merge branch 'develop' into main 2023-10-10 06:58:37 -04:00
Alexander Neff 2ef51d642a Fix indentation and formating 2023-10-08 16:20:30 -04:00
Alex 3384e9a28f
Merge branch 'develop' into main 2023-10-08 14:54:11 -04:00
Alexander Neff ae417e5d3a Autoformat 2023-10-08 14:52:37 -04:00
Alexander Neff 669e0b45e7 Replace str(e).find with 'string' in str(e) 2023-10-08 14:50:59 -04:00
Alexander Neff b2c73b05d1 Added fail messages for not existing users and users having no active session, stop printing empty output messages. 2023-10-08 07:56:05 -04:00
Xiaoli Chan 84a41b72a2 [SSH] Remove useless package
Signed-off-by: Xiaoli Chan <2209553467@qq.com>
2023-10-08 00:03:21 +08:00
Xiaoli Chan 95ccfca992 [SSH] Logic fix
Signed-off-by: Xiaoli Chan <2209553467@qq.com>
2023-10-08 00:02:08 +08:00
Xiaoli Chan ea62e42526 [SSH] improve login failed output
Signed-off-by: Xiaoli Chan <2209553467@qq.com>
2023-10-07 23:35:36 +08:00
Xiaoli Chan c9af18df67 [SSH] fix private key with passphrase login
Signed-off-by: Xiaoli Chan <2209553467@qq.com>
2023-10-07 23:05:51 +08:00
Xiaoli Chan cec042d8ee [SSH] fix private key with passphrase login
Signed-off-by: Xiaoli Chan <2209553467@qq.com>
2023-10-07 23:03:23 +08:00
XiaoliChan 78de09be8d [ssh] Neff review I
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-07 16:37:45 +08:00
XiaoliChan d21bf5e463 [ssh] Marshall review I
Signed-off-by: XiaoliChan <2209553467@qq.com>
2023-10-07 15:36:00 +08:00
XiaoliChan 4b62a53790 Merge remote-tracking branch 'upstream/main' into ssh-improv 2023-10-07 15:08:34 +08:00
Marshall Hallenbeck 389b381584 cleanup(ruff): finish cleaning up E722 (do not euse bare except) 2023-10-06 12:47:49 -04:00
Marshall Hallenbeck b38ad265af formatting 2023-10-06 12:43:34 -04:00
Marshall Hallenbeck 95aaac7f68 cleanup: fix F403 from Ruff (import *) 2023-10-06 12:41:00 -04:00
Marshall Hallenbeck 165fa508ed bloodhound: fix imports 2023-10-06 12:31:07 -04:00
Marshall Hallenbeck 84358bb480 mssql: fix indentation 2023-10-06 12:30:30 -04:00
Marshall Hallenbeck f66923b296 ldap: fix truthiness check 2023-10-06 12:29:36 -04:00
Marshall Hallenbeck 4ec4672b87 ldap: fix error output string 2023-10-06 12:28:00 -04:00
Alex e24601b345 Fix #48 tries to falsly add creds to bloodhound using --laps 2023-10-06 12:22:27 -04:00
Marshall Hallenbeck 7620112657 ruff cleanup 2023-10-06 12:22:27 -04:00
Alex 6a0646067c Remove old NotImplementedError 2023-10-06 12:22:27 -04:00
Marshall Hallenbeck 386208a49c fix string interpolation 2023-10-06 12:22:27 -04:00
Marshall Hallenbeck 11ddfd9c79 ruff autoformat to clean up all the single quotes and other bad formatting 2023-10-06 12:22:25 -04:00
Marshall Hallenbeck 2dd8ea9ef0 clean up wireless module 2023-10-06 12:21:39 -04:00
Marshall Hallenbeck 51c8ee3f2f cleanup winscp_dump module 2023-10-06 12:21:39 -04:00
Marshall Hallenbeck 7deee30942 cleanup wdigest module 2023-10-06 12:21:39 -04:00
Marshall Hallenbeck a956d2cae8 fix variable naming for file listing 2023-10-06 12:21:39 -04:00