Commit Graph

1412 Commits (12e259970d7c110daf835bf5dbdbdc15c924ed1b)

Author SHA1 Message Date
Marshall Hallenbeck cc0e3a6ab8 feat(ftp): add user DB functions 2023-06-01 16:31:44 -04:00
Marshall Hallenbeck b6717c3d2e feat(ftp): add LoggedInRelation DB functions 2023-06-01 16:30:20 -04:00
Alex da6afe2ac3
Merge pull request #48 from mpgn/neff_veeam_dump 2023-06-01 19:01:03 +02:00
Marshall Hallenbeck 34703125c4 fix(veeam): add in try/except for shutting down remote registry 2023-06-01 10:31:14 -04:00
Alex 77a45f9b2f
Add Marshall to veeam module contributions 2023-06-01 01:16:37 +02:00
Alexander Neff 2e8f1508da Fix minor Format issue 2023-06-01 00:17:17 +02:00
Alexander Neff 1a9dfe81ac Added PostgreSQL support for veeam dumper module 2023-06-01 00:05:19 +02:00
Marshall Hallenbeck d0fabf38d0 fix(ftp): remove redundant argument options 2023-05-31 10:21:16 -04:00
Marshall Hallenbeck 5167528dd6 fstring version 2023-05-31 10:18:18 -04:00
Marshall Hallenbeck e36d3de905 Revert "fix: check for version argument before protocol parser for quicker version print"
This reverts commit 1a6ea3ac33.
2023-05-31 10:16:35 -04:00
Marshall Hallenbeck 67ed83a30c RIP Harambe memes for Darrell 2023-05-31 10:08:38 -04:00
Marshall Hallenbeck 1a6ea3ac33 fix: check for version argument before protocol parser for quicker version print 2023-05-31 10:00:32 -04:00
Marshall Hallenbeck e2955c2be5 cli: move module parser above normal argument parser to check if module listing is being requested 2023-05-31 09:55:09 -04:00
Marshall Hallenbeck 464d3e8fed ftp: update moved proto args 2023-05-31 09:52:15 -04:00
Marshall Hallenbeck 82ffe72528 Merge branch 'master' into protocol_db_marshall
# Conflicts:
#	cme/cli.py
#	cme/protocols/ftp.py
#	cme/protocols/ldap.py
#	cme/protocols/smb.py
2023-05-31 09:51:03 -04:00
Marshall Hallenbeck efb0d27bbb fix stupid formatting 2023-05-29 18:12:16 -04:00
Alexander Neff b7ef67e4bf Fixing typo 2023-05-29 19:36:40 +02:00
Alexander Neff 7e5bf7bc61 Veeam Module now supports Veeam v12 if MsSql is used 2023-05-29 17:26:50 +02:00
Alexander Neff fa63bbfec6 Format changes as suggested by marshall 2023-05-29 16:40:29 +02:00
Alexander Neff 1f7f581d2d Improve exception handling in modules veeam and winscp 2023-05-29 16:33:19 +02:00
mpgn 48bd0017a7 fix wrong import for gmsa 2023-05-29 07:55:15 +00:00
Alexander Neff 5a6bacdb35 Minor improvement 2023-05-28 17:37:03 +02:00
Marshall Hallenbeck 35e56c6149 add placeholder funcs for ftp db 2023-05-28 10:04:49 -04:00
Alexander Neff 2d86234d67 Update some changes from Master branch 2023-05-28 15:16:10 +02:00
Alexander Neff 72435fce7f Fix Merge issue 2023-05-28 14:33:44 +02:00
Alexander Neff 98e12fd374 Merge branch 'login_neff' into neff_speed_improv 2023-05-28 14:33:18 +02:00
Alexander Neff 57a0df70fb Fix merge issue 2023-05-28 14:08:20 +02:00
Alex aeea5d98a7 Fix format 2023-05-28 13:50:52 +02:00
Alex 86387bef5d Merge branch 'master' into login_neff 2023-05-28 13:42:11 +02:00
Alexander Neff c7ddbd9028 Reduced big request import and load modules only when necessary 2023-05-28 00:24:40 +02:00
Alexander Neff 0da869f236 Fix spelling mistake causing "first_run" to be executed twice 2023-05-28 00:09:37 +02:00
Alexander Neff e5ff5a9870 Move import statement as it consumes 30% of execution time 2023-05-27 21:03:01 +02:00
Alexander Neff 271ff922e3 Improve initial execution time by extruding cli_args 2023-05-27 20:52:28 +02:00
Marshall Hallenbeck d2fbfbe09d Merge branch 'master' into protocol_db_marshall 2023-05-25 11:08:18 -04:00
Alex 8559d0f10b
Merge pull request #45 from mpgn/neff_small_improvements 2023-05-25 17:03:03 +02:00
mpgn 95797a762e save command into multiple log files 2023-05-25 08:16:05 -04:00
mpgn 4f46a19631 fix ldap connection 2023-05-25 04:00:22 -04:00
mpgn 95bd9bca54 remove ldap3 dependency for ldap-checker module 2023-05-24 17:33:47 -04:00
mpgn 8d36d330e8 fix logger color 2023-05-24 23:48:36 -04:00
mpgn 1d5df5b9b3 fix rdp scanner 2023-05-24 09:19:26 -04:00
Alexander Neff 777a074add Add "(all except LoggedOn)" to bloodhound description 2023-05-24 14:36:39 +02:00
Alexander Neff 7d1c2a0aa4 Add Error handling when an endpoint protection doesn't allow to dump lsa or sam although using the DA 2023-05-24 12:23:22 +02:00
Alexander Neff 2b007032fd Add Sophos av services, taken from https://github.com/tothi/serviceDetector/pull/6 2023-05-24 11:57:25 +02:00
Alexander Neff 3839b88e5f Fix #42 and fix small double export output 2023-05-24 11:41:45 +02:00
dt 9fbad041c0 Add Sophos to enum_av module (pipes for now) 2023-05-24 11:23:49 +02:00
Marshall Hallenbeck 7d83c8bc5b ftp: add directory listing header 2023-05-21 21:03:53 -04:00
Marshall Hallenbeck 85a028c4b7 feat(ftp): allow full directory listing after successful ftp auth 2023-05-21 18:28:44 -04:00
Marshall Hallenbeck 7db9201c37 fix: allow listing modules without a target specified 2023-05-21 17:32:58 -04:00
Marshall Hallenbeck 2c09eaac81 fix(cmedb): put create_workspace back into CMEDB class 2023-05-21 17:08:36 -04:00
Marshall Hallenbeck 09b45e2d80 feat(ftp): display if login was anonymous 2023-05-21 15:47:34 -04:00
Marshall Hallenbeck 5603d10ddd feat(smb): allow for both --lsa and --sam 2023-05-21 15:47:01 -04:00
Marshall Hallenbeck f9b7fd1c60 fix typo 2023-05-21 12:54:18 -04:00
Marshall Hallenbeck ecb68637b6 Merge branch 'master' into protocol_db_marshall 2023-05-19 19:02:17 -04:00
mpgn d3839fc0cd update laps 2023-05-19 05:54:44 -04:00
mpgn 7c2304c8cb remove space 2023-05-18 03:36:20 -04:00
mpgn 4e93894784 add missing file 2023-05-18 03:35:23 -04:00
mpgn 7a9102b2ee decrypt laps password 2023-05-17 16:40:33 -04:00
Marshall Hallenbeck 77abecd805 fix indenting 2023-05-15 22:04:04 -04:00
Marshall Hallenbeck fb874a06ed update protocol db schema mismatch error 2023-05-15 21:58:08 -04:00
Marshall Hallenbeck ef04ba3e65 ftp: add in new table and update error on schema mismatch 2023-05-15 21:53:33 -04:00
Marshall Hallenbeck 84d133ed84 fix(mssql): print error properly when login fails, mute impacket logs, and fix output 2023-05-15 20:55:42 -04:00
Marshall Hallenbeck 2c282beeef initial ftp changes 2023-05-11 09:24:03 -04:00
Marshall Hallenbeck 321be0f1ac update ftp db db session name 2023-05-11 09:21:53 -04:00
Alex f8e787a5f4
Delete output-test.py 2023-05-11 14:41:42 +02:00
mpgn 5a16e8956d always use fqdn for domain in db #40wq 2023-05-10 16:36:23 -04:00
mpgn 914c549327 improve ldap bloodhound output 2023-05-10 16:26:14 -04:00
mpgn 84a66dc650 use fail instead of error for bh 2023-05-10 16:18:07 -04:00
Marshall Hallenbeck 9104c9b198 fix(smb): set self.protocol property 2023-05-09 09:59:25 -04:00
Marshall Hallenbeck 59d82f1be3 fix(logger): properly use protocol logger, falling back to cme_logger 2023-05-09 09:55:10 -04:00
Marshall Hallenbeck 07b6921777 fix(smamruser): properly use protocol's logger 2023-05-09 09:50:56 -04:00
mpgn 0469e72fa4 remove black + update connection.py 2023-05-09 04:26:01 -04:00
mpgn a0d6e64f8f black v2 formating 2023-05-08 14:39:36 -04:00
Marshall Hallenbeck fcfebc21e2 clean and fix imports 2023-05-07 18:51:01 -04:00
Marshall Hallenbeck 13f4ebbb2b fix(cmedb): correct variable reference 2023-05-07 18:39:12 -04:00
mpgn 8b1abf2c8c fix kerberos connection if ntlm not allowed 2023-05-07 17:21:33 -04:00
mpgn af5bd859d8 display output to help user to disable opsec option 2023-05-07 08:24:19 -04:00
mpgn 677cb0c9eb opsec ignore to true by default 2023-05-07 07:55:25 -04:00
Marshall Hallenbeck c763baf6b6 black format drop-sc.py 2023-05-07 07:46:57 -04:00
Marshall Hallenbeck 5a25f1c79a update logging/output for drop-sc 2023-05-07 07:46:57 -04:00
Marshall Hallenbeck 304ff90791 update bloodhound imports 2023-05-07 07:46:57 -04:00
Marshall Hallenbeck 90de636536 black format bh_owned 2023-05-07 07:46:57 -04:00
Marshall Hallenbeck af4e070759 black format test_connection.py 2023-05-07 07:46:57 -04:00
Marshall Hallenbeck 53b80e025a black refactor winrm.py 2023-05-07 07:46:57 -04:00
Marshall Hallenbeck fae4e34e99 fix(test_connection): works for smb and mssql now 2023-05-07 07:46:57 -04:00
Marshall Hallenbeck ae9320c518 update smb ps_exec to return response 2023-05-07 07:46:57 -04:00
Marshall Hallenbeck 08d65188ec fix(mssql_priv): properly retrieve results from mssql queries and improve logic to prevent impersonation loop checks 2023-05-07 07:46:57 -04:00
Marshall Hallenbeck f129447c8b fix(winrm): update smb connecting to match current smb proto 2023-05-07 07:46:57 -04:00
Marshall Hallenbeck 909dee5e48 Revert "revert opsec flag for various modules"
This reverts commit 87ff0d07
2023-05-07 07:46:57 -04:00
Marshall Hallenbeck c14d136a71 formatting: Black formatting 2023-05-07 07:46:53 -04:00
Marshall Hallenbeck 1f458ecab7 fix(smb): check if server_os is bytes and decode it if so; fixes #749 2023-05-07 07:46:39 -04:00
Marshall Hallenbeck 5819bc917e fix(empire): update empire_exec for v5 API; fixes #764 2023-05-07 07:45:25 -04:00
Marshall Hallenbeck c7f45db8e6 fix(empire): change empire password in config to correct default 2023-05-07 07:45:25 -04:00
Marshall Hallenbeck 878d90e1b1 rename drop-sc module file to match module name 2023-05-07 07:45:25 -04:00
mpgn 54df342541 fix protoflow order 2023-05-06 15:30:52 -04:00
Marshall Hallenbeck e5d997fb88 refactor(perflint): improve imports, specifically in forloops 2023-05-05 14:44:11 -04:00
Marshall Hallenbeck 788701cb2c refactor: small perflint improvements 2023-05-05 14:37:20 -04:00
Marshall Hallenbeck 574fc5a212 refactor: remove unnecessary variable creation 2023-05-05 14:36:47 -04:00
Marshall Hallenbeck 7f73740e50 firefox: redo black 2023-05-04 09:22:31 -04:00
Marshall Hallenbeck 1f1ddedf34 redo black 2023-05-04 09:21:17 -04:00
Marshall Hallenbeck a4b18d261b refactor(firefox): perflint and formatting refactors 2023-05-04 00:23:51 -04:00
Marshall Hallenbeck f4401182bd refactor: remove unnecessary variable declaration 2023-05-03 16:48:05 -04:00
Marshall Hallenbeck d6608ab018 mssql db_navigator format fix 2023-05-03 16:43:44 -04:00
Marshall Hallenbeck 9428a6e85c fix formatting that was missed in previous revamp 2023-05-03 16:38:46 -04:00
Marshall Hallenbeck 8e27453478 refactor(linting): move rdp_error_status to be a local object variable since global variable lookups are slower 2023-05-03 16:36:13 -04:00
Marshall Hallenbeck 593b9090c9 refactor(linting): initial perflint linting 2023-05-03 16:31:54 -04:00
mpgn 09844d1819 bump to 5.4.7 2023-05-02 16:18:58 -04:00
mpgn 06ef7ebd14 format black 2023-05-02 16:12:45 -04:00
mpgn a2a00472dc add module printnigthmare 2023-05-02 16:12:14 -04:00
mpgn 2c8ecf9b20 switch proto flow to is correct line 2023-05-02 16:10:44 -04:00
Marshall Hallenbeck d6f3a2da4f chore(formatting): rest of formatting that didn't get included in branch before merging 2023-05-02 14:03:53 -04:00
mpgn 2be85b5da7 black formating 2023-05-02 11:17:59 -04:00
mpgn 77c97a4afd rename plaintext_login 2023-05-02 08:52:27 -04:00
Alexander Neff 037bece662 Resolve merge conflicts and add ssh keyfile login from marshall 2023-05-02 13:30:32 +02:00
Alexander Neff a6c77294dc Resolve merge conflicts 2023-05-02 12:47:05 +02:00
Alexander Neff 715bb53762 Fix ssh protocol 2023-05-02 12:45:30 +02:00
Alexander Neff 841603a084 Move options `--continue-on-success` and `--no-bruteforce` to upper level of the argparser 2023-05-02 12:35:15 +02:00
mpgn 87ff0d0715 revert opsec flag for various modules 2023-05-02 03:58:23 -04:00
Marshall Hallenbeck f25d83a510
fix(cme): check if proto is ssh before checking for keyfile arg 2023-05-01 11:52:10 -04:00
Marshall Hallenbeck 05ed2b8746 fix(ssh): require the -p parameter, even if a keyfile is used - properly tell the user about this issue and exit 2023-05-01 10:04:08 -04:00
Marshall Hallenbeck 01d62904d4 fix(ssh): add imports to ssh from connection 2023-05-01 09:56:03 -04:00
Marshall Hallenbeck ce45763cf7 fix(connection): remove unused imports 2023-05-01 09:55:08 -04:00
Marshall Hallenbeck 1de0f1ee8c ftp: update ftp to use process_secret() 2023-04-30 23:12:31 -04:00
Marshall Hallenbeck f651abfd68 fix(ssh): read in keyfile and pass it to paramiko due to bug in paramiko looping through key types on failure; closes #454 2023-04-30 21:49:45 -04:00
Marshall Hallenbeck 35a45d5f4f fix(arguments): require at least 1 target to be defined; also update quote formatting 2023-04-30 21:00:55 -04:00
Marshall Hallenbeck 5a25d83be1 fix(mssql): fix command execution for MSSQL 2023-04-30 17:47:52 -04:00
Marshall Hallenbeck 1260751194 fix(mssql): change how mssql returns results, bypassing impacket/tds jank logging and fix handlekatz/nanodump modules 2023-04-30 17:24:18 -04:00
Marshall Hallenbeck bf77a28014 feat(ssh): add ability to properly use SSH keys via -cred 2023-04-30 17:23:29 -04:00
Marshall Hallenbeck 79eacf9dea format update 2023-04-30 17:21:24 -04:00
Alexander Neff 1c2c1c9f1b Resolve merge conflicts 2023-04-30 11:49:56 +02:00
Marshall Hallenbeck a9294e7b36 feat(ssh): add shell access tracking to DB and display it in cmedb 2023-04-29 16:33:16 -04:00
Marshall Hallenbeck e6100d4675 fix(ssh): fix username and password display for ssh creds 2023-04-27 14:20:19 -04:00
Alexander Neff 6eb9fb27ad Formating 2023-04-27 17:11:26 +02:00
Alexander Neff 9dcf40cfc5 Resolve merge conflicts 2023-04-27 17:08:03 +02:00
Marshall Hallenbeck 5d56614ef2 note TODO on commented out code so it is not removed 2023-04-27 00:44:36 -04:00
Marshall Hallenbeck 362dab0393 remove commented code 2023-04-27 00:44:23 -04:00
Marshall Hallenbeck 2fbe55294f feat(ssh): add keys to database and update cmedb to display and export keys 2023-04-27 00:36:30 -04:00
Marshall Hallenbeck 1e36200a6b feat(ssh): display if there is shell access for ssh logins 2023-04-26 20:36:36 -04:00
Marshall Hallenbeck 29c812fdf3 fix(ssh): add ConnectionResetError to login exceptions 2023-04-26 12:50:00 -04:00
Marshall Hallenbeck 0cd56fcfb2 feat(ssh): add total logins when displaying creds 2023-04-26 12:08:59 -04:00
Marshall Hallenbeck 5d2ae44deb fix(ssh): add NoValidConnectionsError to auth check 2023-04-26 11:53:44 -04:00
Marshall Hallenbeck 8b57cdef25 feat(ssh): update SSH protocol to use the CMEDB and add some additional functionality for determining total logins for SSH users 2023-04-26 11:43:49 -04:00
Marshall Hallenbeck 58c10bb11e feat(ssh): add additional check for root level access after login and update formatting 2023-04-25 19:45:56 -04:00
Marshall Hallenbeck 3a7f0305e0 feat(ssh): initial db update for SSH to properly add in hosts 2023-04-25 19:45:18 -04:00
Marshall Hallenbeck 3798682ed7 fix(mssql): fix hacky printing of admin check query and handle error if the domain is None for impacket 2023-04-25 13:54:49 -04:00
Marshall Hallenbeck c8c571cde4 Merge branch 'master' of github.com:mpgn/cme 2023-04-25 09:56:06 -04:00
Marshall Hallenbeck aaa5642338 fix(console): soft wrap and set tab size to 4 2023-04-25 09:49:44 -04:00
mpgn 4e4bb9d841 update daclread module 2023-04-25 09:47:33 -04:00
mpgn 603092134d update lsassy module 2023-04-25 09:29:14 -04:00
mpgn 41ebc9bba4 replace cme_logger by the real oneé 2023-04-25 06:58:01 -04:00
mpgn 5674c73094 Fix lsa MD4 error 2023-04-25 06:41:44 -04:00