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
|
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 |
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 |
|
Marshall Hallenbeck
|
b2ec26a757
|
fix(ldap): fix string formatting
|
2023-04-23 19:20:09 -04:00 |
|
Alexander Neff
|
05f7e244cb
|
Bug fixing
|
2023-04-23 14:07:02 +02:00 |
|
Alexander Neff
|
a7d727c795
|
Formating
|
2023-04-23 13:45:42 +02:00 |
|
Alexander Neff
|
d50dfad42f
|
Remove self.args.continue_on_success from connection protocols and formating
|
2023-04-23 13:45:16 +02:00 |
|
Marshall Hallenbeck
|
6da074e73b
|
update f-strings
|
2023-04-22 13:48:07 -04:00 |
|
Marshall Hallenbeck
|
88aeb3c04c
|
Merge branch 'master' into console_marshall
|
2023-04-22 13:45:10 -04:00 |
|
mpgn
|
6c132af27b
|
fix laps core option with winrm
|
2023-04-21 07:25:25 -04:00 |
|
mpgn
|
059c6af3c2
|
fix laps core option with smb
|
2023-04-21 07:23:15 -04:00 |
|
mpgn
|
45effc625a
|
core switch to fail instead of error function
|
2023-04-21 06:20:47 -04:00 |
|
mpgn
|
d154627633
|
Add new Windows LAPS
|
2023-04-21 06:14:12 -04:00 |
|
mpgn
|
5a01ad25ae
|
ldap switch to diplay
|
2023-04-21 06:10:11 -04:00 |
|
mpgn
|
c72aeaffba
|
add timeout rdp
|
2023-04-21 06:08:24 -04:00 |
|
mpgn
|
95da356e3b
|
Add new Windows LAPS
|
2023-04-16 15:05:06 -04:00 |
|
Marshall Hallenbeck
|
10ac9d22d2
|
fix(logging): fix logger assignment
|
2023-04-14 15:15:23 -04:00 |
|
Marshall Hallenbeck
|
13302234cc
|
fix(smb): fix f-string for rid-brute
|
2023-04-14 15:11:43 -04:00 |
|
Marshall Hallenbeck
|
bb5df5160d
|
fix(samruser): properly set logger
|
2023-04-14 15:11:12 -04:00 |
|
Marshall Hallenbeck
|
cfbeeda0ba
|
define logger before setting it
|
2023-04-14 11:55:06 -04:00 |
|
Marshall Hallenbeck
|
763a4f72ed
|
fix(cmedb): cherry pick adding NoSuchTableError
|
2023-04-14 11:49:05 -04:00 |
|
Marshall Hallenbeck
|
295a1edd15
|
fix(cmedb): check for NoSuchTableError while reflecting tables
|
2023-04-14 11:44:07 -04:00 |
|
Marshall Hallenbeck
|
2f333bde0f
|
Merge branch 'master' into console_marshall
|
2023-04-14 10:19:31 -04:00 |
|
Marshall Hallenbeck
|
14bc33b866
|
more PEP8 and formatting fixes, also fix connection's kerberos_auth function definition
|
2023-04-12 12:37:19 -04:00 |
|
Marshall Hallenbeck
|
aac704937d
|
fix(ldap): remove setting smb fileshare property that doesnt exist, crashing ldap module on run
|
2023-04-12 11:28:46 -04:00 |
|
Marshall Hallenbeck
|
e6079e4ddf
|
convert format() to f-string, update single quote to double, and some PEP8 fixes
|
2023-04-12 00:25:38 -04:00 |
|
Marshall Hallenbeck
|
18c20f116a
|
more f-string conversion
|
2023-04-11 23:55:11 -04:00 |
|
Marshall Hallenbeck
|
de35fc5abd
|
finalize double quote normalization and f-string conversion
|
2023-04-11 20:03:58 -04:00 |
|
Marshall Hallenbeck
|
15f8e25f23
|
normalize to double quotes for params
|
2023-04-11 19:53:20 -04:00 |
|
Marshall Hallenbeck
|
f804ec7059
|
f-string conversions and PEP8 fixes
|
2023-04-11 19:43:15 -04:00 |
|
Marshall Hallenbeck
|
6cde0a2dbb
|
f-string conversions and PEP8 fixes
|
2023-04-11 19:40:35 -04:00 |
|
Marshall Hallenbeck
|
a0880742a3
|
more formatting fixes
|
2023-04-11 11:54:06 -04:00 |
|
Marshall Hallenbeck
|
47ab04b178
|
clean up logging statements in smb.py
|
2023-04-11 11:48:45 -04:00 |
|
Marshall Hallenbeck
|
e4005c6095
|
PEP8 work
|
2023-04-11 11:37:44 -04:00 |
|
Marshall Hallenbeck
|
1ae3c828de
|
fix(cmedb): remove winrm db functionality trying to get groups, since that does not exist for winrm
|
2023-04-08 14:16:50 -04:00 |
|
Marshall Hallenbeck
|
474aeedce9
|
remove unneeded print
|
2023-04-07 16:44:09 -04:00 |
|
Marshall Hallenbeck
|
713f4bcd9d
|
clean up imports
|
2023-04-07 13:12:56 -04:00 |
|
Marshall Hallenbeck
|
a9b7529796
|
fix(docs): replace single quote doc strings with double quote
|
2023-04-07 12:40:48 -04:00 |
|
mpgn
|
47cf9c9264
|
fix conflict
|
2023-04-07 11:26:20 -04:00 |
|
mpgn
|
81915c09b9
|
Fix kerberos auth with local-group function
|
2023-04-07 11:12:40 -04:00 |
|
Marshall Hallenbeck
|
38ce4f6112
|
update logging and formatting
|
2023-04-07 10:30:55 -04:00 |
|
Marshall Hallenbeck
|
908d72159e
|
update logging and formatting
|
2023-04-07 10:30:31 -04:00 |
|
mpgn
|
82bf27f8b1
|
Fix issue with rid-brute and kerberos
|
2023-04-07 10:28:39 -04:00 |
|
Marshall Hallenbeck
|
5c90e8cc07
|
add config.py, update logging, and more
|
2023-04-05 20:09:07 -04:00 |
|
Marshall Hallenbeck
|
7acc00fe0d
|
update lsassy module for logging and improved error handling/logging
|
2023-04-05 18:50:56 -04:00 |
|
Marshall Hallenbeck
|
a5b821d96f
|
fix(ftp): update error to fail, remove redundant code, and update formatting
|
2023-04-04 23:45:41 -04:00 |
|
Marshall Hallenbeck
|
bd99de3dd0
|
fix(ftp): update error to fail
|
2023-04-04 23:38:47 -04:00 |
|
Marshall Hallenbeck
|
1bc4150ea1
|
fix(logging): add fail log message for printing out to console and update smb to use
|
2023-04-04 23:01:20 -04:00 |
|
Marshall Hallenbeck
|
fec7a667d2
|
fix(logging): update logging to use cme_logger and fix some formatting
|
2023-03-30 16:36:58 -04:00 |
|
Marshall Hallenbeck
|
9db621380b
|
more logging and formatting fixes
|
2023-03-30 00:33:57 -04:00 |
|
Marshall Hallenbeck
|
26c026d003
|
feat(console): complete log overhaul, allowing more granular debug messages, and logging to console
|
2023-03-29 23:59:22 -04:00 |
|
Marshall Hallenbeck
|
c42f9bcd3d
|
feat(console): progress on dropping in console logging while keeping everything else the same
|
2023-03-29 14:19:31 -04:00 |
|
Marshall Hallenbeck
|
26db2ca3ed
|
feat(console): properly print normal messages to console
|
2023-03-28 22:58:26 -04:00 |
|
Marshall Hallenbeck
|
1ade25cc10
|
feat(console): initial console implementation with progress bar
|
2023-03-27 12:18:29 -04:00 |
|
Marshall Hallenbeck
|
82e3dad5af
|
Merge branch 'tests_marshall' into modules_marshall
# Conflicts:
# cme/loaders/module_loader.py
|
2023-03-26 22:46:20 -04:00 |
|
mpgn
|
51752f8e29
|
update wording on dump users function
|
2023-03-26 06:14:18 -04:00 |
|
mpgn
|
87e9fc4cce
|
remove useless code from users function on smb proto
|
2023-03-26 06:08:52 -04:00 |
|
Marshall Hallenbeck
|
f187453525
|
Merge branch 'tests_marshall' into modules_marshall
|
2023-03-26 02:05:43 -04:00 |
|
Marshall Hallenbeck
|
bfcc689acc
|
refactor(async): update how tasks are created to new threads using proper ThreadPool; update functionality everywhere to match
|
2023-03-26 01:52:37 -04:00 |
|
mpgn
|
118ee3a944
|
revert some changes on smb
|
2023-03-25 16:25:36 -04:00 |
|
mpgn
|
c7679c7acf
|
revert some changes on smb
|
2023-03-25 16:10:31 -04:00 |
|
Marshall Hallenbeck
|
4569a632cf
|
fix(smb): handle SMB SessionErrors when enumerating local groups
|
2023-03-24 15:18:37 -04:00 |
|
Marshall Hallenbeck
|
9cad93fb3a
|
fix(smb): handle ACCESS_DENIED issues when bruteforcing RIDs
|
2023-03-24 15:18:37 -04:00 |
|
Marshall Hallenbeck
|
4ad86cee0d
|
fix(smb): handle additional SMB connection errors, including unknown nt errors that impacket doesnt have
|
2023-03-24 15:18:37 -04:00 |
|
Marshall Hallenbeck
|
67bc50ca44
|
fix(smb): handle SMB SessionErrors when enumerating local groups
|
2023-03-24 14:25:17 -04:00 |
|
Marshall Hallenbeck
|
8be90461c7
|
fix(smb): handle ACCESS_DENIED issues when bruteforcing RIDs
|
2023-03-24 14:25:17 -04:00 |
|
Marshall Hallenbeck
|
d112bfcbfb
|
fix(smb): handle additional SMB connection errors, including unknown nt errors that impacket doesnt have
|
2023-03-24 14:25:17 -04:00 |
|
Marshall Hallenbeck
|
fcb5d972c5
|
update ldap formatting and error checking; LDAPS port can be open but not configured
|
2023-03-24 11:06:40 -04:00 |
|
Marshall Hallenbeck
|
1a4a887d4e
|
chore(ldap): update formatting
|
2023-03-24 10:19:05 -04:00 |
|
Marshall Hallenbeck
|
08871f398e
|
refactor(ldap): update some formatting
|
2023-03-24 09:48:40 -04:00 |
|
mpgn
|
a55e49ee36
|
Update get-file output file
|
2023-03-23 23:51:50 -04:00 |
twosevenzero
|
8233c5bf48
|
Closes Issue #697. Added a flag to append self.host to the filename of the retrieved file from the get-file option.
|
2023-03-23 23:51:49 -04:00 |
|
mpgn
|
e791c817f6
|
Update get-file output file
|
2023-03-23 07:13:18 -04:00 |
|
twosevenzero
|
c725094bd9
|
Closes Issue #697. Added a flag to append self.host to the filename of the retrieved file from the get-file option.
|
2023-03-23 07:04:07 -04:00 |
|
Marshall Hallenbeck
|
3cdb3cdf0b
|
fix(cmedb): update error message to instruct user to only delete the workspaces folder
|
2023-03-22 11:58:49 -04:00 |
|
Marshall Hallenbeck
|
772986c0fa
|
fix(cmedb): display error if DB reflection fails for new schema and tell user how to fix it
|
2023-03-22 11:51:24 -04:00 |
famos0
|
3980362dd1
|
add helper for cmedb dpapi
|
2023-03-21 10:41:10 +01:00 |
|
Marshall Hallenbeck
|
9b16a5bd4e
|
feat(cmedb): add ability to export IPs of hosts with signing disabled, different implementation from pull #758
|
2023-03-20 22:03:23 -04:00 |
|
Marshall Hallenbeck
|
c60cc1ec38
|
feat(cmedb): update vnc protocol to match updated cmedb database loading
|
2023-03-18 18:15:30 -04:00 |
|
Marshall Hallenbeck
|
4adb335a58
|
fix(smb): update add_share() to ignore if the share already exists
|
2023-03-17 20:33:03 -04:00 |
|
Marshall Hallenbeck
|
f6ff5ec37c
|
fix(dpapi): do nothing if dpapi secret is already in database
|
2023-03-17 14:36:19 -04:00 |
|
Marshall Hallenbeck
|
b69e070674
|
fix(mssql): remove group references since mssql db doesnt have groups
|
2023-03-17 13:03:13 -04:00 |
|
Marshall Hallenbeck
|
d59c107350
|
return updated host ids if any were updated
|
2023-03-17 13:02:46 -04:00 |
|
Marshall Hallenbeck
|
915062b420
|
fix(smb): groups functionality again returns inserted or updated group ids
|
2023-03-17 12:56:20 -04:00 |
|
Marshall Hallenbeck
|
192203972e
|
chore(imports): remove unused imports
|
2023-03-17 10:52:30 -04:00 |
|
Marshall Hallenbeck
|
b5493295c8
|
fix(smb): readd functionality to add loggedin_relation to db without RETURNING clause
|
2023-03-17 09:58:12 -04:00 |
|
Marshall Hallenbeck
|
10efcc9d42
|
fix: remove remaining returned ids from sqlalchemy queries due to RETURNING clause
|
2023-03-17 09:13:16 -04:00 |
|
Marshall Hallenbeck
|
9a15dfce28
|
fix(cmedb): fix group display columns
|
2023-03-16 18:02:48 -04:00 |
|
Marshall Hallenbeck
|
1a71bb2e0b
|
fix(sqlite): remove all RETURNING clauses from queries due to sqlite not supporting until 3.35
|
2023-03-16 18:02:20 -04:00 |
|
Marshall Hallenbeck
|
c52a8566eb
|
fix(dpapi): revert my 'fix', properly connect to DC via domain query
|
2023-03-16 08:34:52 -04:00 |
|
Marshall Hallenbeck
|
63c1e03a1d
|
fix(kerberos): add back in kerberos for Petitpotam and samrfunc
|
2023-03-16 08:34:07 -04:00 |
|
Marshall Hallenbeck
|
941efd353a
|
fix(dpapi): update target to be the host instead of domain
|
2023-03-14 01:26:08 -04:00 |
|
Marshall Hallenbeck
|
da99886ca8
|
fix(dpapi): update dpapi feature to sqlalchmey and update formatting
|
2023-03-14 01:25:20 -04:00 |
|
Marshall Hallenbeck
|
4f3759cdce
|
feat(smb): add functionality to query SAMR for local groups if DC query fails; closes #687
|
2023-03-13 16:12:44 -04:00 |
|
Marshall Hallenbeck
|
735e230945
|
fix(smb): update smb protocol to properly insert AdminRelations, GroupRelations, and LoggedinRelations to the database
|
2023-03-13 16:12:44 -04:00 |
|
Marshall Hallenbeck
|
cc3a42ab00
|
chore(mssqldb): remove unnecessary debug prints
|
2023-03-13 16:12:44 -04:00 |
|
Marshall Hallenbeck
|
b21e450f90
|
feat|fix(winrm): update winrm to use database to save hosts and credentials; closes #739 and closes #740
|
2023-03-13 16:12:42 -04:00 |
|
Marshall Hallenbeck
|
39502bc210
|
docs(rdpdb): add helpdoc for clear_database command
|
2023-03-13 16:12:32 -04:00 |
|
Marshall Hallenbeck
|
4891750af7
|
refactor: standardize nomenclature to uses 'hosts' instead of 'computers'
|
2023-03-13 16:12:30 -04:00 |
|
Marshall Hallenbeck
|
ca0ab3b98c
|
fix some major bugs and add in proper admin relations to the database functionality
|
2023-03-13 16:12:20 -04:00 |
|
Marshall Hallenbeck
|
1ce23664dc
|
refactor(smbdb): move DB-related functions together
|
2023-03-13 16:11:08 -04:00 |
|
Marshall Hallenbeck
|
2532a9c3ba
|
fix(cmedb): check if filter_term is not None on domain query check
|
2023-03-13 16:11:01 -04:00 |
|
Marshall Hallenbeck
|
0c30b840a5
|
feat(smbdb): add feature to print hosts by domain search in CMEDB
|
2023-03-13 16:11:01 -04:00 |
|
Marshall Hallenbeck
|
4b4e2126cd
|
fix: catch BrokenPipeErrors when connecting via SMB
|
2023-03-13 16:10:59 -04:00 |
|
Marshall Hallenbeck
|
17fb198735
|
docs(cmedb): update help strings for smb cmedb
|
2023-03-13 16:10:30 -04:00 |
|
Marshall Hallenbeck
|
fba8559049
|
fix: change back variable names for nthash and lmhash
|
2023-03-13 16:10:28 -04:00 |
|
Marshall Hallenbeck
|
137a7c7283
|
fix(cmedb): add func.lower() calls back into certain columns that need it
|
2023-03-13 16:10:07 -04:00 |
|
Marshall Hallenbeck
|
a955a7d7ab
|
fix(cmedb): fix LIKE queries to properly work
|
2023-03-13 16:10:07 -04:00 |
|
Marshall Hallenbeck
|
160efc6980
|
update formatting, some variable names, and other Pythonic things for winrm
|
2023-03-13 16:10:05 -04:00 |
|
Marshall Hallenbeck
|
e9b353d645
|
feat(dbs): add help string and confirmation for all database clear_database functions
|
2023-03-13 16:08:18 -04:00 |
|
Marshall Hallenbeck
|
47d68dce7b
|
feat(cmedb): update table when printing specific host to include additional info
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
ec58fb7f7e
|
fix(db): fix update columns reference for Upsert queries to properly update columns
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
b368b2ca85
|
fix(mssqldb): properly apply filters for sqlalchemy queries
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
cffec370a4
|
feat(smbdb): add feature to allow search on r/w/rw shares
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
e4c21e242d
|
fix(smbdb): properly apply filters for sqlalchemy queries
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
7a43382c7b
|
chore: remove unnecessary commented code
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
3996d21175
|
feat(ssh|winrmdb): update ssh and winrm database files to use proper sqlalchemy methods
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
3491499845
|
feat(ftpdb): update ftp database file to use new sqlalchemy connection and query methods
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
c55e2563a3
|
fix(rdp|ldapdb): fix table name reflection
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
fa073b4449
|
fix(rdp|ldapdb): fix table name reflection
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
222c6442ec
|
feat(rdpdb): update rdp databse file to use new sqlalchemy connection and query methods
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
9c48638733
|
chore(mssqldb): remove unnecessary import and add SAWarning ignore
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
99d041684a
|
feat(mssqldb): update clear_database to be the same as smbdb
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
16f0fe5b35
|
feat(mssqldb): update get_computers to be the same as smbdb
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
e170f839f7
|
feat(mssqldb): update is_computer_valid to be the same as smbdb
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
c38117a8dd
|
feat(mssqldb): update get_credentials to be the same as smbdb
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
608304d5d5
|
feat(mssqldb): update is_credential_valid to be the same as smbdb
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
75fcf0e666
|
feat(mssqldb): update remove_admin_relations to be the same as smbdb
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
051a7c0e4b
|
feat(mssqldb): update get_admin_relations to be the same as smbdb
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
3b86e8c1fa
|
feat(mssqldb): update add_admin_user to be the same as smbdb
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
38854a59e4
|
feat(mssqldb): update remove_credentials to be the same as smbdb
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
f9ff7cef7a
|
feat(mssqldb): update add_credential to be the same as smbdb
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
0eb20ff3a2
|
feat(mssqldb): update add_computer to proper sqlalchemny syntax
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
515209a4e0
|
feat(smbdb): only update hosts if they have changed to improve SQL write time
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
3143b56060
|
logging(smbdb): update log string to better specify which add_computer() is being called
|
2023-03-13 16:07:07 -04:00 |
|
Marshall Hallenbeck
|
beaab6034e
|
format(smbdb): change order of functions to match other database classes
|
2023-03-13 16:07:05 -04:00 |
|
Marshall Hallenbeck
|
c211f53cbd
|
feat(smbdb): add help_creds
|
2023-03-13 16:06:18 -04:00 |
|
Marshall Hallenbeck
|
d588b523e1
|
chore: remove old commented code
|
2023-03-13 16:06:18 -04:00 |
|
Marshall Hallenbeck
|
121b25d243
|
feat(smbdb): update remaining functions to proper sqlalchemy syntax
|
2023-03-13 16:06:18 -04:00 |