Tim
7bbe4f5794
Merge branch 'master' into retry_options
...
Conflicts:
androidpayload/app/src/com/metasploit/stage/Payload.java
2015-05-19 17:31:44 +01:00
Tim
5c362ad256
cleaner contextless meterpreter
2015-05-19 17:19:38 +01:00
Tim
ba2433a16f
fix termination
2015-05-19 17:19:11 +01:00
Brent Cook
b725543267
Land #35 , code reformat and whitespace fixes
2015-05-19 10:34:13 -05:00
Brent Cook
8a6e26af80
fix a little more whitespace, remove superfluous ;
2015-05-19 10:33:34 -05:00
Tim
57adddb803
fix http
2015-05-19 16:14:37 +01:00
David Maloney
37e7ab2fc9
just a little more cleanup
...
this should hpefully address the last of Juan's code review
feedback appropriately.
MSP-12356
2015-05-18 11:21:10 -05:00
David Maloney
a3b4b53029
size and signedness issue fixes
...
fixes several size and signedness issues caught
during code review
MSP-12356
2015-05-18 11:08:58 -05:00
David Maloney
7c0c78d766
more missing garbage collection
...
pek structures also were not being garbage collected properly
MSP-12356
2015-05-18 10:46:43 -05:00
David Maloney
6c15c0c0a0
better garbage collection on initial setup
...
the ntds_parse method that gets everything started
was missing garbage collection for accountColumns.
MSP-12356
2015-05-18 10:43:27 -05:00
OJ
84f5698c9d
PHP meterpreter refactoring in prep for uuid work
2015-05-18 17:40:48 +10:00
OJ
5c90b4977f
PHP meterpreter refactoring in prep for uuid work
2015-05-18 17:40:48 +10:00
Tim
6101c78a5b
code formatting
2015-05-18 07:03:15 +01:00
Tim
a66ec09285
wait for the context object
2015-05-18 06:55:31 +01:00
OJ
281ebf1ca8
Stage UUIDs, generation options, php and python meterp uuid
2015-05-18 13:29:46 +10:00
OJ
deae0b44b8
Stage UUIDs, generation options, php and python meterp uuid
2015-05-18 13:29:46 +10:00
Tim
d1e69b2d43
format all code with the default intellij java formatter
2015-05-17 19:05:21 +01:00
Tim
5fce838afc
add support for configurable retry options
2015-05-17 18:56:30 +01:00
Brent Cook
7c32995615
bump version
2015-05-17 09:33:42 -05:00
Brent Cook
c0a908fad0
Land #162 , UUID is a binary blob, not a string
2015-05-17 09:30:11 -05:00
Brent Cook
bb00b00b2c
do not log UUID as a string
2015-05-17 09:25:33 -05:00
OJ
5f7c2e7207
Fix handling of UUIDs in Meterpreter
...
The original implementation assumed that the UUIDs were coming through a strings, but this was changed at some point to use the 16-byte UUID format straight out of MSF.
This was causing issues when UUIDs had null bytes in them because the UUID was being truncated and the result was that UUIDs that were being parsed in MSF were too small, resulting in exceptions.
2015-05-17 17:43:59 +10:00
Brent Cook
df39c733b4
bump version
2015-05-15 16:43:47 -05:00
Brent Cook
68a24e3a47
Land #159 , user proxy settings support with winhttp
2015-05-15 16:41:22 -05:00
Brent Cook
5e7d7cee5d
Land #161 , user and domain information for sysinfo
2015-05-15 16:02:35 -05:00
Brent Cook
602e18591c
fixup build for posix, fix memory leak in utf conversion
2015-05-15 16:01:59 -05:00
David Maloney
e8449a1698
Merge branch 'master' into feature/MSP-12715/sysinfo-upgrade
2015-05-15 15:14:23 -05:00
David Maloney
30a1ecbbcb
add domain and loggedonusers to sysinfo
...
added the domain name and logged on user counts
to the sysinfo command
MSP-12715
2015-05-15 15:10:35 -05:00
Brent Cook
ed1bccd0fc
Land #160 , fix the bare example extension
2015-05-15 15:04:14 -05:00
OJ
7ff8263ce0
Actually set the result to success
2015-05-15 15:03:47 -05:00
OJ
f6c1485ebe
Add support for the sleep command
2015-05-15 15:03:47 -05:00
Meatballs
fded7311c4
Fixup bare met_svc var name
2015-05-15 20:43:47 +01:00
Brent Cook
807005a39f
Land #157 , use RAW rather than string for binary hashes
2015-05-15 11:59:14 -05:00
Brent Cook
dea9f0b049
Merge branch 'master' into land-5326-
2015-05-15 11:29:54 -05:00
Brent Cook
02e3583064
Merge branch 'master' into land-5326-
2015-05-15 11:29:54 -05:00
Brent Cook
3ba13e719a
Land #32 , switch FILE_HASH to use RAW, strings to use UTF-8
2015-05-15 09:58:38 -05:00
Brent Cook
21fb3dace1
Land #34 , simplify hooking meterpreter into an APK
2015-05-15 09:55:48 -05:00
Brent Cook
f390649c46
Merge branch 'master' into land-157-
2015-05-14 11:30:56 -05:00
Brent Cook
d9ce138eed
remove hash sizeof workaround
2015-05-14 11:29:44 -05:00
David Maloney
1bfd8526b6
Merge branch 'master' into feature/MSP-12356/ntds-parser
2015-05-14 10:55:55 -05:00
David Maloney
7e0c23e228
fixed missing type cast
...
needed explicit typecast for x64
MSP-12356
2015-05-13 14:54:32 -05:00
OJ
a7c2b4fcdd
Utilise IE configuration for proxies where possible
2015-05-13 15:46:33 +10:00
Brent Cook
30a6eb9e5d
bump version
2015-05-12 22:38:58 -05:00
Brent Cook
e158093b38
Land #156 , final tweaks for multi-transport support
2015-05-12 22:35:59 -05:00
Brent Cook
567fc73bbc
Land #156 , multi transport support
2015-05-12 21:42:06 -05:00
Brent Cook
595d975337
quit concatenating serials after the first one
2015-05-12 21:31:36 -05:00
Brent Cook
716330ee7c
make machine_id on POSIX more resilient
...
Only compute the value once, this prevents changing if drive topology changes.
Consider ata and md drive prefixes.
Always set a MACHINE_ID value, upstream expects it in the reply.
2015-05-12 21:25:39 -05:00
OJ
6ee3b53786
Tweak transport change
...
Cosmetic stuff really.
2015-05-13 09:15:03 +10:00
Brent Cook
f464bc142d
Land #5280 , update to Ruby on Rails 4.0
...
This upgrades a number of other gems as a side-effect.
2015-05-12 16:48:49 -05:00
Tim
98aa4babbf
fix Payload.start
2015-05-12 04:25:33 +01:00
