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.

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

Jump to bottom

Create get_gpos module, implement get-folder command, and add some module helper functions #320

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Create get_gpos module, implement get-folder command, and add some module helper functions #320

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1409fea
feat(get-gpos): add new module to get GPOs from LDAP
Marshall-Hallenbeck May 16, 2024
3ec55a6
feat(modules): add module helper for logging and loot saving
Marshall-Hallenbeck May 16, 2024
e5151ff
feat(get_gpos): add in more options
Marshall-Hallenbeck May 16, 2024
83a4758
feat(get-gpos): add new module to get GPOs from LDAP
Marshall-Hallenbeck May 16, 2024
13bf6ee
feat(modules): add module helper for logging and loot saving
Marshall-Hallenbeck May 16, 2024
9c952be
feat(get_gpos): add in more options
Marshall-Hallenbeck May 16, 2024
785169f
Merge remote-tracking branch 'refs/remotes/remote/marshall-get-gpos' …
Marshall-Hallenbeck May 21, 2024
0d5daf6
feat(smb): add feature to download entire folders from target
Marshall-Hallenbeck May 22, 2024
b551d11
smb: clean up get-folder code
Marshall-Hallenbeck May 22, 2024
d17460d
add function to get loot data folder for modules
Marshall-Hallenbeck May 22, 2024
beb0885
get_gpos: remove download option as you can only retrieve certain inf…
Marshall-Hallenbeck May 22, 2024
d5883ae
Merge branch 'main' into marshall-get-gpos
Marshall-Hallenbeck Jun 18, 2024
8e1bc7b
feat: add all updated folder download stuff from #335 since that may …
Marshall-Hallenbeck Jun 18, 2024
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
Prev Previous commit
Next Next commit
Merge branch 'main' into marshall-get-gpos 
Signed-off-by: Marshall Hallenbeck <[email protected]>
  • Loading branch information
@Marshall-Hallenbeck
Marshall-Hallenbeck committed Jun 18, 2024
commit d5883ae79652baa45d46ebbe8ff6c49c2250f584
12 changes: 6 additions & 6 deletions nxc/protocols/smb/proto_args.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ def proto_args(parser, parents):
segroup.add_argument("--pattern", nargs="+", help="pattern(s) to search for in folders, filenames and file content")
segroup.add_argument("--regex", nargs="+", help="regex(s) to search for in folders, filenames and file content")

tgroup = smb_parser.add_argument_group("Files", "Options for put and get remote files")
tgroup.add_argument("--put-file", action="append", nargs=2, metavar="FILE", help="Put a local file into remote target, ex: whoami.txt \\\\Windows\\\\Temp\\\\whoami.txt")
tgroup.add_argument("--get-file", action="append", nargs=2, metavar="FILE", help="Get a remote file, ex: \\\\Windows\\\\Temp\\\\whoami.txt whoami.txt")
tgroup.add_argument("--get-folder", action="append", nargs=2, metavar="DIR", help="Get a remote directory, ex: \\\\Windows\\\\Temp\\\\testing testing")
tgroup.add_argument("--recursive", default=False, action="store_true", help="Recursively get a folder")
tgroup.add_argument("--append-host", action="store_true", help="append the host to the get-file filename")
files_group = smb_parser.add_argument_group("Files", "Options for put and get remote files")
files_group.add_argument("--put-file", action="append", nargs=2, metavar="FILE", help="Put a local file into remote target, ex: whoami.txt \\\\Windows\\\\Temp\\\\whoami.txt")
files_group.add_argument("--get-file", action="append", nargs=2, metavar="FILE", help="Get a remote file, ex: \\\\Windows\\\\Temp\\\\whoami.txt whoami.txt")
files_group.add_argument("--get-folder", action="append", nargs=2, metavar="DIR", help="Get a remote directory, ex: \\\\Windows\\\\Temp\\\\testing testing")
files_group.add_argument("--recursive", default=False, action="store_true", help="Recursively get a folder")
files_group.add_argument("--append-host", action="store_true", help="append the host to the get-file filename")

cmd_exec_group = smb_parser.add_argument_group("Command Execution", "Options for executing commands")
cmd_exec_group.add_argument("--exec-method", choices={"wmiexec", "mmcexec", "smbexec", "atexec"}, default="wmiexec", help="method to execute the command. Ignored if in MSSQL mode")
Expand Down
1 change: 0 additions & 1 deletion tests/e2e_commands.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ netexec ldap TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS -M subnets
netexec ldap TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS -M user-desc
netexec ldap TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS -M whoami
netexec ldap TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS -M pso
netexec ldap TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS -M pso --options
netexec ldap TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS -M get_gpos
netexec ldap TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS -M get_gpos --options
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--options should be removed

netexec ldap TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS -M get_gpos -o NAME="Default Domain Policy"
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.