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
HD Moore
8709473e72
Add fullname to modules, load mixins, fix platform
2012-06-17 11:57:33 -05:00
HD Moore
642f2bf552
MDM update
2012-06-17 11:44:04 -05:00
HD Moore
999f7d7174
One more round of tweaks and finally back and running
2012-06-17 02:06:52 -05:00
HD Moore
37531d4486
Fix typo in table name
2012-06-17 02:01:23 -05:00
HD Moore
980327dddf
Fix typo, redo add(), account for it in the loader
2012-06-17 01:59:19 -05:00
HD Moore
38ad7230d2
Fix up a typo
2012-06-17 01:35:39 -05:00
HD Moore
e4fffc36de
Move to one to many instead of m2m for module_detail tracking
2012-06-17 01:21:38 -05:00
HD Moore
780b8ee48b
Remove the vulns_refs destroy, this causes issues
...
when the join table has no .id
2012-06-17 00:12:10 -05:00
HD Moore
be9b7a88fb
Complicate the matching process in the name of memory
...
and loading speed. Use optional match_details param
to find matching vuln instances.
2012-06-17 00:07:00 -05:00
HD Moore
7d9d6f11e5
Comitting a copy of the "old" mode of loading,
...
still hoping to avoid having to do this due to
memory bloat and slowness.
2012-06-16 22:42:31 -05:00
HD Moore
52150b0e89
Merge branch 'master' into feature/vuln-info
2012-06-16 15:43:52 -05:00
HD Moore
6dd8fd2e05
Move the cache rebuild into a background job
2012-06-16 15:41:37 -05:00
sinn3r
931f24b380
Merge branch 'php_apache_request_headers_bof' of https://github.com/jvazquez-r7/metasploit-framework into jvazquez-r7-php_apache_request_headers_bof
2012-06-16 14:56:45 -05:00
HD Moore
8425c8438d
Switch to a MDM/SQL-based module cache
2012-06-16 14:51:09 -05:00
David Maloney
122b34c703
fix missing bock transitions
...
the block objects weren't being transitioned over from the class
methods properly, so the callback blocks were never getting processed.
2012-06-15 14:25:47 -05:00
jvazquez-r7
091b3bbbd9
Added module plus encoder for CVE-2012-2329
2012-06-15 00:29:52 +02:00
HD Moore
8177783681
Merge branch 'master' into feature/vuln-info
2012-06-14 16:21:51 -05:00
HD Moore
e2c1657eb4
Adds a block callback to work with the replicant
...
module instance prior to it being launched.
2012-06-14 16:21:06 -05:00
HD Moore
e59b33fc76
Incorporate egypt's feedback
2012-06-14 10:43:09 -05:00
Tod Beardsley
bffb3571c2
Adding URL ref for db_autopwn deprecation message
2012-06-14 09:53:59 -05:00
James Lee
2683bb0ba7
Add deprecation warnings for old commands
...
This should hopefully cut down a bit on support requests from people
asking about old commands they read about in _Metasploit: The
Penetration Tester's Guide_
2012-06-14 09:44:38 -05:00
HD Moore
03b29fff68
Merge up the latest, does not automaticlly load
...
the module tree into the database right now.
2012-06-14 04:35:43 -05:00
HD Moore
a6070f8584
Tweak schema (type gets mangled by AR), add caching routine
2012-06-14 03:27:36 -05:00
HD Moore
cc56f43532
Merge in new MDM with corrected relationships
2012-06-14 00:24:21 -05:00
HD Moore
65686824e0
Merge in the MDM with module tables
2012-06-13 21:59:55 -05:00
HD Moore
554defa9c0
Merge MDM changes to fix the vuln refs relationship
2012-06-13 20:43:30 -05:00
HD Moore
8f448c9159
Merge MDM
2012-06-13 14:06:12 -07:00
HD Moore
9351e3ab25
MDM update to support fusion import
2012-06-13 14:02:40 -07:00
David Maloney
08cbd87541
Default mime-types to octet-stream
2012-06-13 14:48:58 -05:00
James Lee
d2d37f770d
Add expand_path and upload_file methods
2012-06-12 23:58:20 -06:00
James Lee
2e4231d825
Fix NoMethodError when post mods call super from setup
2012-06-12 23:58:20 -06:00
James Lee
8707df3abb
Allow tab-completing SESSION on exploits as well
2012-06-12 23:58:19 -06:00
James Lee
5717f52246
Make the Exploit::Local class useful
...
This commit is the main infrastructure needed to run exploits in a local
context, gluing the Exploit and Post module classes together.
2012-06-12 23:58:19 -06:00
HD Moore
de45630092
Merge branch 'master' into feature/vuln-info
2012-06-12 15:36:16 -05:00
Jeff Jarmoc
e820d23f73
Cleanup whitespace
2012-06-12 15:32:50 -05:00
HD Moore
374b5b86f7
Merge branch 'master' into feature/vuln-info
2012-06-12 15:24:50 -05:00
Tod Beardsley
3756a5031f
Adding carrierwave to metasploit's gemcache.
2012-06-12 14:47:50 -05:00