10cf466a99
Egypt's code is broken. Revert to old code until he fixes it agai
...
See pull request:
https://github.com/rapid7/metasploit-framework/pull/664n
2012-08-21 20:33:24 -05:00
b457289e01
Merge remote branch 'webstersprodigy/module-http-ntlmrelay'
2012-08-21 15:28:50 -05:00
5e89c546c5
Merge branch 'reverse-http-redmine-7141' of https://github.com/jlee-r7/metasploit-framework into jlee-r7-reverse-http-redmine-7141
2012-08-21 14:33:42 -05:00
1aa83b830f
Let Resolver#send_tcp take a block
...
This solves the looping problem. Since the TCP connection wouldn't
necessarily close, we couldn't count on a 0-length recv, and the
connection was timing out. Changed it so send_tcp can take a block, in
which we do parsing. AXFR responses are sandwiched between SOA answers,
so when the second one is reached, the transfer is done.
This is also cleaner for existing code that uses send_tcp, since if no
block is passed, it just returns the first response and tears down the
connection, just like it used to.
2012-08-20 20:51:18 -05:00
c015121dc0
Make Resolver#axfr use Resolver#send_tcp
...
This required some changes to send_tcp: it now loops, reading as many
length-prefixed DNS responses as are available before the connection
closes. This shouldn't affect other uses of the function, since most
questions only have one response in answer.
2012-08-19 17:21:37 -05:00
7005216d1f
Fix axfr support for auxiliary/gather/enum_dns
...
AXFR support in net-dns is broken. This fixes it, and makes the
requisite modifications to enum_dns module. Basic problem is that AXFR
responses consist of a chain of DNS replies, not a single reply with
multiple answers. Previously, only the first of these replies, the SOA
record, was returned. Also added some exception handling to avoid
problems like #483 .
2012-08-16 20:40:24 -05:00
288fe0395a
Corrected auto-generated env ref in mdm_console bin
2012-08-15 22:39:52 -05:00
a8ea014f25
MDM cache update
2012-08-15 10:16:47 -05:00
33c74c97e2
Add Opt::Proxies and opthash[:proxies] to ssh mods
2012-08-12 16:23:22 -04:00
c9690033c7
This commit allows ssh_login to use socks proxies. Net::SSH::Transport::Session could take a :proxy option,
...
but it expects a factory object not a string, when setting :proxy => datastore['Proxies'] user got:
"Auxiliary failed: NoMethodError private method `open' called for \"socks4:localhost:1080\":String."
VALID_OPTIONS in ssh.rb now takes :proxies option which is passed to the Rex socket in
Net::SSH::Transport::Session.new.
Testing: block all outgoing to SSH server, try to connect with a proxy. Try with :proxy option,
then merge this pull request and try again.
2012-08-12 16:01:52 -04:00
1485f74670
Out of 4.4.0, and into 4.5.0-dev
2012-08-07 09:53:01 -05:00
1d5af3d825
Alex' patch to Rex::Oui
2012-08-06 21:34:36 -04:00
58ce6fbac4
Adding author info for juan
2012-08-06 08:55:54 -05:00
4050633c18
Squashed commit of the following:
...
commit 665f3f5b993dfa48db817f6138ac356919af37fc
Author: Chris Lennert <calennert@gmail.com>
Date: Wed Aug 1 19:44:14 2012 -0500
Two corrections to NetGetJoinInformation args
[Closes #661 ]
2012-08-03 13:58:42 -06:00
66c5d8b617
Refactor reverse_*http(s) handlers
...
De-dups a whole bunch of copy pasted code. Should be a bit easier to
maintain now.
2012-08-03 13:27:40 -06:00
bf9d59003c
Always start a session when CONN comes in
...
Also gets rid of the conn_ids array, which was never pruned (and
without some extra gymnastics in meterpreter/client.rb *can't* be) when
handler URLs were removed.
2012-08-02 18:58:58 -06:00
832f47d467
Merge branch 'master' into jtr_seeding
2012-08-01 15:04:31 -05:00
fa2b0c26bb
Fixes password seeding for JtR modules
2012-08-01 14:15:51 -05:00
46312d9035
Add a comment describing function prototype
2012-08-01 00:28:18 -06:00
c25ebabce0
Fix up incompatibility with MaxDataSize (thanks @mubix)
2012-07-23 13:40:41 -05:00
d56ccc69b9
Forgot to git add client.rb
2012-07-22 20:13:57 -04:00
70017511f5
Implement proto/smb/client find_next for find_files
...
Squashed commit of the following:
commit b5370b24d48a0b79d13cff465ef1fe53738754d0
Author: Rob Fuller <jd.mubix@gmail.com>
Date: Sat Jul 21 01:52:31 2012 -0400
add some documentation for smb client
commit 92438f515ef272337ce02b6deebb35f62a50f0a3
Author: Rob Fuller <jd.mubix@gmail.com>
Date: Fri Jul 20 03:09:27 2012 -0400
adds find_next to find_files
[Closes #627 ]
2012-07-21 00:03:19 -06:00
99aa78a371
Tab complete LHOST based on RHOST if it is set
2012-07-20 23:10:22 -06:00
df7af9df40
Fix an errant bitwise-and used as bool
...
Squashed commit of the following:
commit 748ab76d71422e5909dc29403fd24ceb025504b5
Author: Rob Fuller <jd.mubix@gmail.com>
Date: Fri Jul 20 02:50:50 2012 -0400
fixes dir/file check
[Closes #626 ]
2012-07-20 16:29:53 -06:00
9d16a1a472
Fix some SMB operations that dont like this value
2012-07-20 16:25:00 -05:00
e200f43183
Squashed commit of the following:
...
commit 1de16b41c8808df2919706eaa8cc89ae44d9b591
Author: m m <gaspmat@gmail.com>
Date: Mon Jul 9 21:55:32 2012 +0200
typo
commit a396b55018175f3eb2a83baecb1ec601cc99eef4
Author: m m <gaspmat@gmail.com>
Date: Mon Jul 9 21:51:32 2012 +0200
various posix meterpreter bugfixes
[Closes #584 ]
[FIXRM #7042 ]
2012-07-19 15:56:47 -06:00
c1cf71c4e9
Remove debugging load()
2012-07-18 11:02:21 -06:00
5110aad0f3
Add better docs on some File methods
2012-07-17 17:32:27 -06:00
c9ccb02aae
Clean up rdoc
2012-07-17 17:32:27 -06:00
f4547527a8
Merge branch 'omg-post-exploits' of https://github.com/jlee-r7/metasploit-framework
2012-07-17 17:43:40 -05:00
62fe00866d
Add comments about what the block is for
2012-07-17 16:09:17 -06:00
6b0196eccc
Add a require for File in Common
2012-07-17 15:48:06 -06:00
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
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
c887e0aaff
Re-add AFP changes due to mangled merge
2012-07-17 00:42:49 -05:00
b6d05c77ca
No, really. Bump
2012-07-17 00:36:19 -05:00
f62e0b1cca
AFP fixes and JTR typo fix
2012-07-16 21:45:45 -05:00
7e50f91d59
Bump
2012-07-16 21:02:40 -05:00
bc2edeace2
Cleanup AFP module output
2012-07-16 21:02:40 -05:00
efe478f847
Merge branch 'master' into omg-post-exploits
2012-07-16 09:20:23 -06:00
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
4509c11916
Fingerprint dd-wrt even when auth is required
2012-07-15 21:21:13 -05:00
f111ae097e
Bail early if the user did not configure an injection parameter
2012-07-15 21:14:39 -05:00
0230ef60f6
Cosmetic
2012-07-15 15:46:54 -05:00
d6c6a3d0c5
Correct an issue with payload recalc during iteration
2012-07-15 15:45:25 -05:00
2254086dbe
Replace event handler with a straightforward filter
2012-07-11 03:00:44 -05:00
975d8004d3
Remove protected operator, not useful
2012-07-11 02:08:56 -05:00
430351fe79
Better handle of module cache when db_connect is run manually
2012-07-10 23:56:48 -05:00
a7d1a61af2
Handle non-failure module exits as well
2012-07-10 19:55:43 -05:00
64e8956319
More small tweaks to import/export of attempts
2012-07-10 00:18:06 -05:00
25fee46020
Quick typo fix
2012-07-09 23:31:53 -05:00
6c977535d0
Fix up attempt/detail import/export structure
2012-07-09 22:47:05 -05:00
bfde053cf4
Correct a flaw in vuln_attempt/vuln_detail import
2012-07-09 22:28:42 -05:00
f50843e0b7
Adding http_ntlmrelay module
2012-07-09 22:56:24 -04:00
b817070545
Merge branch 'mac_oui' of https://github.com/alexmaloteaux/metasploit-framework into alexmaloteaux-mac_oui
2012-07-09 20:14:25 -05:00
e509c72574
better handle company name
2012-07-10 00:24:30 +01:00
e949b8c2c8
mac_oui
2012-07-09 23:46:57 +01:00
36d27242c7
allow reverse tcp with proxies
2012-07-09 23:05:09 +02:00
c8c3c0e3e4
Correct an issue with HTTP response header parsing
2012-07-09 10:22:12 -07:00
8d9186748f
Fix logic fail
2012-07-08 20:46:37 -06:00
c82037d85b
Add an xxd decoder
2012-07-08 20:45:25 -06:00
6d6b4bfa92
Merge remote branch 'rapid7/master' into omg-post-exploits
2012-07-08 17:32:39 -06:00
a8266bd831
Fix up odd reference normalization cases
2012-07-08 11:25:32 -05:00
f75edc0ca1
Correct fix for older PG support, thanks to Patrick Fitzgerald
2012-07-08 10:16:51 -05:00
75430a0b7e
Cleanup to support v1.2 as well as 1.1
2012-07-08 01:53:32 -05:00
4199b67879
Prevent an exception from breaking the sql cache
2012-07-07 17:30:31 -05:00
1d5b7a1a69
Fix an issue with PG's handling of group by on distinct
2012-07-07 17:27:11 -05:00
881d0ff0c9
Add method to create an asset group
2012-07-07 17:27:11 -05:00
33bf2881cc
Removing cached gem for journey.
2012-07-06 22:12:50 -05:00
505b97b470
Adding new gem versions
...
Add the new gems referenced in the last commit for real.
2012-07-06 22:11:16 -05:00
63e41ee6bb
Updating gems: coderay, journey, spork, sprockets
2012-07-06 22:03:33 -05:00
3dba8273c9
Adding journey-1.0.4.
2012-07-06 17:33:16 -05:00
b102d869d7
Switch module search to the SQL backend. Fixes #565
2012-07-05 19:34:05 -07:00
d266dc6031
Revert what looks like an errant debug mode
2012-07-03 20:32:19 -05:00
64364e3f16
Handle failed reloads in a nicer way
2012-07-03 19:49:44 -05:00
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
4f9106b2e5
Reverse this back now that the bins are updated
2012-07-02 00:02:21 -05:00
d7d21f1bda
Merge branch 'patch-3' of https://github.com/mubix/metasploit-framework into mubix-patch-3
2012-07-01 19:42:49 -05:00
7298840478
Fix match on User-Agent for HTTPS
2012-07-01 21:32:29 -03:00
58dd2af998
Fix match on User-Agent for HTTP
2012-07-01 21:30:31 -03:00
18e8285322
Fix up rev_http handler
2012-07-01 10:46:13 -04:00
12a6d67be4
Add support for user-agent and server control
2012-06-30 21:01:08 -07:00
9204a5b124
Move the db skip into the "web" console driver. FIXRM #7031
2012-06-29 10:46:15 -05:00
eb762b3653
Back out encoding change of empty string, done by comment
2012-06-29 01:07:58 -05:00
1627720166
Skip module loads/db connect for existing framework sessions
2012-06-29 01:03:13 -05:00
d656e3185f
Mark all libraries as defaulting to 8-bit strings
2012-06-29 00:18:28 -05:00
c45b1037f1
Make sure entries are 8-bit
2012-06-28 23:31:26 -05:00
0e55141fd9
Rename counts to count
2012-06-28 11:43:33 -05:00
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
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
b04170b283
Unbreak loadpath
...
HD's vuln-info merge broke add_module_path by removing an argument.
2012-06-25 16:37:16 -06:00
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
4afc6d698d
Merge/sync with mdm
2012-06-25 10:11:53 -05:00
3d0628debf
Handle unreachable errors better
2012-06-25 03:29:30 -05:00
a393f8d62d
Apply the console ID if specified
2012-06-25 01:37:38 -05:00
19c18a3e4e
Record the device_id correctly in the nexpose raw import
2012-06-25 01:23:16 -05:00
584e0dbd98
Load console config AFTER module path initialization
2012-06-25 01:16:35 -05:00
38cc6571de
Merge branch 'master' into feature/vuln-info
2012-06-25 01:03:52 -05:00
aa0c6d7036
Better IE 9/10 coverage
2012-06-25 01:03:34 -05:00
faf5adadd9
Merge branch 'master' into feature/vuln-info
2012-06-25 00:42:02 -05:00
4bd9b0c94a
Quick typo fix
2012-06-25 00:41:45 -05:00
f7dca272b6
IE 10/Win8 detection support
2012-06-25 00:36:49 -05:00
1989f0ab46
IE 10/Win8 detection support
2012-06-25 00:36:04 -05:00
348a0b8f6e
Merge branch 'master' into feature/vuln-info
2012-06-24 23:00:13 -05:00
2eddfa3444
fix bsd ans solaris platform when using encoder too
2012-06-25 03:12:33 +01:00
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
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
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
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
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
815d80a2cc
Merge branch 'rapid7' into omg-post-exploits
2012-06-21 17:02:55 -06:00
328f927829
Updated MDM, specifically the error message on tag name validation.
2012-06-20 13:50:50 -05:00
f7ecc98923
Merge branch 'master' into feature/vuln-info
2012-06-20 13:34:53 -05:00
1468a904a7
More error cleanup
2012-06-20 13:34:31 -05:00
f7f9c23a23
Revert "MDM update."
...
This reverts commit 1b8d9446c9
2012-06-20 13:27:49 -05:00
1b8d9446c9
MDM update.
2012-06-20 13:12:47 -05:00
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
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
83bf78c63b
New failure_reason messages
2012-06-19 13:31:39 -05:00
d5768080bf
Add a fail_message to attempts and fix bugs
2012-06-19 00:48:39 -05:00
bf3062aa89
Fix up opts.delete into temp storage for attempt tracking
2012-06-18 20:30:24 -05:00
5b5f3d0cf6
Merge over MDM
2012-06-18 13:35:27 -05:00
68496d364a
MDM update for report model validation
2012-06-18 08:57:32 -05:00
0696748914
Import exploit attempts
2012-06-18 01:27:50 -05:00
d674ba103d
Export exploit_attempts & module_details, fix mixin load
2012-06-18 01:13:57 -05:00
e8ad66b799
Exploit attempt tracking is mostly complete
2012-06-17 23:00:21 -05:00
a8f7ea901a
Fix cache counters for vuln_attempts, tweak nexpose
2012-06-17 21:55:11 -05:00
a892fce320
Indent only subsequent list items
2012-06-17 20:55:19 -05:00
9ceba4421a
Bullet formatting rendered poorly, remove these and keep indents
2012-06-17 20:49:22 -05:00
39a77024e2
Parse solutions/descriptions into a slightly less ugly format
2012-06-17 19:27:25 -05:00
d7d4d13076
Store platform as a shortname, tweaks to vulns_refs to fix validation
2012-06-17 12:27:58 -05:00
8709473e72
Add fullname to modules, load mixins, fix platform
2012-06-17 11:57:33 -05:00
642f2bf552
MDM update
2012-06-17 11:44:04 -05:00
999f7d7174
One more round of tweaks and finally back and running
2012-06-17 02:06:52 -05:00
37531d4486
Fix typo in table name
2012-06-17 02:01:23 -05:00
980327dddf
Fix typo, redo add(), account for it in the loader
2012-06-17 01:59:19 -05:00
38ad7230d2
Fix up a typo
2012-06-17 01:35:39 -05:00
e4fffc36de
Move to one to many instead of m2m for module_detail tracking
2012-06-17 01:21:38 -05:00
780b8ee48b
Remove the vulns_refs destroy, this causes issues
...
when the join table has no .id
2012-06-17 00:12:10 -05:00
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
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
52150b0e89
Merge branch 'master' into feature/vuln-info
2012-06-16 15:43:52 -05:00
6dd8fd2e05
Move the cache rebuild into a background job
2012-06-16 15:41:37 -05:00
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
8425c8438d
Switch to a MDM/SQL-based module cache
2012-06-16 14:51:09 -05:00
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
091b3bbbd9
Added module plus encoder for CVE-2012-2329
2012-06-15 00:29:52 +02:00
8177783681
Merge branch 'master' into feature/vuln-info
2012-06-14 16:21:51 -05:00
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
e59b33fc76
Incorporate egypt's feedback
2012-06-14 10:43:09 -05:00
sinn3r
Tod Beardsley
Daniel Miller
Samuel Huckins
RageLtMan
Chris Lennert
James Lee
David Maloney
HD Moore
webstersprodigy
Rob Fuller
Alexandre Maloteaux
m m
Meatballs1
kernelsmith
Joe Vennix
jvazquez-r7