James Lee
6b0196eccc
Add a require for File in Common
2012-07-17 15:48:06 -06:00
James Lee
a1cfb32f93
Fix a typo that breaks post param padding
...
Corner case and doesn't really *break* things, just means you end up
with one big param instead of multiple due to missing ampersands.
2012-07-17 12:29:28 -06:00
sinn3r
fbe0cb7471
Merge branch 'post_win_gather_creds_gpp_pass' of https://github.com/Meatballs1/metasploit-framework into Meatballs1-post_win_gather_creds_gpp_pass
2012-07-17 08:28:19 -05:00
HD Moore
c887e0aaff
Re-add AFP changes due to mangled merge
2012-07-17 00:42:49 -05:00
HD Moore
b6d05c77ca
No, really. Bump
2012-07-17 00:36:19 -05:00
HD Moore
f62e0b1cca
AFP fixes and JTR typo fix
2012-07-16 21:45:45 -05:00
HD Moore
7e50f91d59
Bump
2012-07-16 21:02:40 -05:00
HD Moore
bc2edeace2
Cleanup AFP module output
2012-07-16 21:02:40 -05:00
James Lee
efe478f847
Merge branch 'master' into omg-post-exploits
2012-07-16 09:20:23 -06:00
James Lee
7091d1c65b
Add an exploit for sock_sendpage
...
Unfortunately, adds a dep on bionic for runtime compilation.
Gets ring0, sets the (res)uid to 0 and jumps to the payload. Still some
payload issues because linux stagers don't mprotect(2) the buffer they
read(2) into. Single payloads work fine, though.
Also cleans up and improves local exploits' ability to compile C.
[SEERM #3038 ]
2012-07-15 20:29:48 -06:00
HD Moore
4509c11916
Fingerprint dd-wrt even when auth is required
2012-07-15 21:21:13 -05:00
HD Moore
f111ae097e
Bail early if the user did not configure an injection parameter
2012-07-15 21:14:39 -05:00
HD Moore
0230ef60f6
Cosmetic
2012-07-15 15:46:54 -05:00
HD Moore
d6c6a3d0c5
Correct an issue with payload recalc during iteration
2012-07-15 15:45:25 -05:00
HD Moore
2254086dbe
Replace event handler with a straightforward filter
2012-07-11 03:00:44 -05:00
HD Moore
975d8004d3
Remove protected operator, not useful
2012-07-11 02:08:56 -05:00
HD Moore
430351fe79
Better handle of module cache when db_connect is run manually
2012-07-10 23:56:48 -05:00
HD Moore
a7d1a61af2
Handle non-failure module exits as well
2012-07-10 19:55:43 -05:00
HD Moore
64e8956319
More small tweaks to import/export of attempts
2012-07-10 00:18:06 -05:00
HD Moore
25fee46020
Quick typo fix
2012-07-09 23:31:53 -05:00
HD Moore
6c977535d0
Fix up attempt/detail import/export structure
2012-07-09 22:47:05 -05:00
HD Moore
bfde053cf4
Correct a flaw in vuln_attempt/vuln_detail import
2012-07-09 22:28:42 -05:00
webstersprodigy
f50843e0b7
Adding http_ntlmrelay module
2012-07-09 22:56:24 -04:00
sinn3r
b817070545
Merge branch 'mac_oui' of https://github.com/alexmaloteaux/metasploit-framework into alexmaloteaux-mac_oui
2012-07-09 20:14:25 -05:00
Alexandre Maloteaux
e509c72574
better handle company name
2012-07-10 00:24:30 +01:00
Alexandre Maloteaux
e949b8c2c8
mac_oui
2012-07-09 23:46:57 +01:00
m m
36d27242c7
allow reverse tcp with proxies
2012-07-09 23:05:09 +02:00
HD Moore
c8c3c0e3e4
Correct an issue with HTTP response header parsing
2012-07-09 10:22:12 -07:00
James Lee
8d9186748f
Fix logic fail
2012-07-08 20:46:37 -06:00
James Lee
c82037d85b
Add an xxd decoder
2012-07-08 20:45:25 -06:00
James Lee
6d6b4bfa92
Merge remote branch 'rapid7/master' into omg-post-exploits
2012-07-08 17:32:39 -06:00
HD Moore
a8266bd831
Fix up odd reference normalization cases
2012-07-08 11:25:32 -05:00
HD Moore
f75edc0ca1
Correct fix for older PG support, thanks to Patrick Fitzgerald
2012-07-08 10:16:51 -05:00
HD Moore
75430a0b7e
Cleanup to support v1.2 as well as 1.1
2012-07-08 01:53:32 -05:00
HD Moore
4199b67879
Prevent an exception from breaking the sql cache
2012-07-07 17:30:31 -05:00
HD Moore
1d5b7a1a69
Fix an issue with PG's handling of group by on distinct
2012-07-07 17:27:11 -05:00
HD Moore
881d0ff0c9
Add method to create an asset group
2012-07-07 17:27:11 -05:00
Tod Beardsley
33bf2881cc
Removing cached gem for journey.
2012-07-06 22:12:50 -05:00
Tod Beardsley
505b97b470
Adding new gem versions
...
Add the new gems referenced in the last commit for real.
2012-07-06 22:11:16 -05:00
Tod Beardsley
63e41ee6bb
Updating gems: coderay, journey, spork, sprockets
2012-07-06 22:03:33 -05:00
Tod Beardsley
3dba8273c9
Adding journey-1.0.4.
2012-07-06 17:33:16 -05:00
HD Moore
b102d869d7
Switch module search to the SQL backend. Fixes #565
2012-07-05 19:34:05 -07:00
HD Moore
d266dc6031
Revert what looks like an errant debug mode
2012-07-03 20:32:19 -05:00
HD Moore
64364e3f16
Handle failed reloads in a nicer way
2012-07-03 19:49:44 -05:00
Meatballs1
bd2368d6ab
Added specific details for each policy type to output table, modified REX:Ui:Table to prevent sorting when SortIndex == -1
2012-07-02 11:47:44 +01:00
HD Moore
4f9106b2e5
Reverse this back now that the bins are updated
2012-07-02 00:02:21 -05:00
sinn3r
d7d21f1bda
Merge branch 'patch-3' of https://github.com/mubix/metasploit-framework into mubix-patch-3
2012-07-01 19:42:49 -05:00
Rob Fuller
7298840478
Fix match on User-Agent for HTTPS
2012-07-01 21:32:29 -03:00
Rob Fuller
58dd2af998
Fix match on User-Agent for HTTP
2012-07-01 21:30:31 -03:00
RageLtMan
18e8285322
Fix up rev_http handler
2012-07-01 10:46:13 -04:00
HD Moore
12a6d67be4
Add support for user-agent and server control
2012-06-30 21:01:08 -07:00
HD Moore
9204a5b124
Move the db skip into the "web" console driver. FIXRM #7031
2012-06-29 10:46:15 -05:00
HD Moore
eb762b3653
Back out encoding change of empty string, done by comment
2012-06-29 01:07:58 -05:00
HD Moore
1627720166
Skip module loads/db connect for existing framework sessions
2012-06-29 01:03:13 -05:00
HD Moore
d656e3185f
Mark all libraries as defaulting to 8-bit strings
2012-06-29 00:18:28 -05:00
HD Moore
c45b1037f1
Make sure entries are 8-bit
2012-06-28 23:31:26 -05:00
sinn3r
0e55141fd9
Rename counts to count
2012-06-28 11:43:33 -05:00
sinn3r
5092152949
Fix the broken reload_modules method
...
When using the reload_all command, the framework will trigger an
'undefined method module_history' error, because we're missing
an accessor.
Also, even though reload_modules returns "counts". That actually
returns a hash instead of a real count of modules... the return
value is also never actually used anywhere. But to make this
part not broken, we return the actual count.
2012-06-28 11:39:14 -05:00
sinn3r
807142e988
'Size' may not exist in certain PDF structure.
...
This is a fix for issues related to:
'undefined method `[]' for nil:NilClass'
It is possible that a PDF may not have the 'Size' xref, and people
are running into the 'undefined method'[]' for NilClass' exception.
Because the pdf parser always assumes there is a Size field,
so it uses a match() function to find the value for Size, which
can be nil.
See the following bug report for example:
https://dev.metasploit.com/redmine/issues/7014
2012-06-26 16:09:13 -05:00
James Lee
b04170b283
Unbreak loadpath
...
HD's vuln-info merge broke add_module_path by removing an argument.
2012-06-25 16:37:16 -06:00
HD Moore
4dbdadfa3d
Merge pull request #523 from alexmaloteaux/fixmsfvenom
...
Fix msfvenom to correctly generate elf binaries for bsd and solaris platform
2012-06-25 11:55:49 -07:00
HD Moore
4afc6d698d
Merge/sync with mdm
2012-06-25 10:11:53 -05:00
HD Moore
3d0628debf
Handle unreachable errors better
2012-06-25 03:29:30 -05:00
HD Moore
a393f8d62d
Apply the console ID if specified
2012-06-25 01:37:38 -05:00
HD Moore
19c18a3e4e
Record the device_id correctly in the nexpose raw import
2012-06-25 01:23:16 -05:00
HD Moore
584e0dbd98
Load console config AFTER module path initialization
2012-06-25 01:16:35 -05:00
HD Moore
38cc6571de
Merge branch 'master' into feature/vuln-info
2012-06-25 01:03:52 -05:00
HD Moore
aa0c6d7036
Better IE 9/10 coverage
2012-06-25 01:03:34 -05:00
HD Moore
faf5adadd9
Merge branch 'master' into feature/vuln-info
2012-06-25 00:42:02 -05:00
HD Moore
4bd9b0c94a
Quick typo fix
2012-06-25 00:41:45 -05:00
HD Moore
f7dca272b6
IE 10/Win8 detection support
2012-06-25 00:36:49 -05:00
HD Moore
1989f0ab46
IE 10/Win8 detection support
2012-06-25 00:36:04 -05:00
HD Moore
348a0b8f6e
Merge branch 'master' into feature/vuln-info
2012-06-24 23:00:13 -05:00
Alexandre Maloteaux
2eddfa3444
fix bsd ans solaris platform when using encoder too
2012-06-25 03:12:33 +01:00
sinn3r
4d2e74e2ad
Need to account for the fact the server may timeout during operation
...
See the following issue for more info:
http://dev.metasploit.com/redmine/issues/4866
2012-06-24 20:17:51 -05:00
James Lee
6913440d67
More progress on syscall wrappers
...
Something is still broken, my socket() is returning EAFNOSUPPORT whereas
what looks like the same syscall in wunderbar_emporium's exploit.c is
returning a socket. Similarly, my __mmap2() is returning EFAULT when
trying to map anything, not just NULL.
2012-06-22 17:45:49 -06:00
Tod Beardsley
dfe0e10dc6
Adding kernelsmith's -a datastore opt
...
Works well enough on its own. Note that you cannot mix -g and -a since
set doesn't actually parse out dash options in a OptParse sort of way.
That said, setg -a seems to work well. This mixing options business
will need to be addressed soon, but that day is not today.
[Closes #514 ]
2012-06-22 16:01:38 -05:00
kernelsmith
1bcf241ec0
adds the -a (append) option to the console 'set' command
...
if RHOST is currently 192.168.20.1
set -a RHOST 5
appends 5 to RHOST making it 192.168.20.15
2012-06-22 01:23:54 -05:00
James Lee
fd8b1636b9
Add the first bits of a sock_sendpage exploit
...
This can currently build an executable that creates a socket, opens a
temporary file, truncates that file with ftruncate(2) and calls
sendfile. Still needs to mmap NULL and figure out ring0 shellcode.
Baby steps.
2012-06-22 00:03:29 -06:00
James Lee
815d80a2cc
Merge branch 'rapid7' into omg-post-exploits
2012-06-21 17:02:55 -06:00
Joe Vennix
328f927829
Updated MDM, specifically the error message on tag name validation.
2012-06-20 13:50:50 -05:00
HD Moore
f7ecc98923
Merge branch 'master' into feature/vuln-info
2012-06-20 13:34:53 -05:00
HD Moore
1468a904a7
More error cleanup
2012-06-20 13:34:31 -05:00
Joe Vennix
f7f9c23a23
Revert "MDM update."
...
This reverts commit 1b8d9446c9
.
2012-06-20 13:27:49 -05:00
Joe Vennix
1b8d9446c9
MDM update.
2012-06-20 13:12:47 -05:00
sinn3r
5a5166c90b
Merge branch 'gather-ssh-cleanup' of https://github.com/jlee-r7/metasploit-framework into jlee-r7-gather-ssh-cleanup
2012-06-20 12:07:23 -05:00
James Lee
60eedc46dd
Remove nils before sorting
...
Fixes a stack trace when one of the directory tests returns nil
2012-06-20 10:44:36 -06:00
HD Moore
83bf78c63b
New failure_reason messages
2012-06-19 13:31:39 -05:00
HD Moore
d5768080bf
Add a fail_message to attempts and fix bugs
2012-06-19 00:48:39 -05:00
HD Moore
bf3062aa89
Fix up opts.delete into temp storage for attempt tracking
2012-06-18 20:30:24 -05:00
HD Moore
5b5f3d0cf6
Merge over MDM
2012-06-18 13:35:27 -05:00
Samuel Huckins
68496d364a
MDM update for report model validation
2012-06-18 08:57:32 -05:00
HD Moore
0696748914
Import exploit attempts
2012-06-18 01:27:50 -05:00
HD Moore
d674ba103d
Export exploit_attempts & module_details, fix mixin load
2012-06-18 01:13:57 -05:00
HD Moore
e8ad66b799
Exploit attempt tracking is mostly complete
2012-06-17 23:00:21 -05:00
HD Moore
a8f7ea901a
Fix cache counters for vuln_attempts, tweak nexpose
2012-06-17 21:55:11 -05:00
HD Moore
a892fce320
Indent only subsequent list items
2012-06-17 20:55:19 -05:00
HD Moore
9ceba4421a
Bullet formatting rendered poorly, remove these and keep indents
2012-06-17 20:49:22 -05:00
HD Moore
39a77024e2
Parse solutions/descriptions into a slightly less ugly format
2012-06-17 19:27:25 -05:00
HD Moore
d7d4d13076
Store platform as a shortname, tweaks to vulns_refs to fix validation
2012-06-17 12:27:58 -05:00