1
mirror of https://github.com/rapid7/metasploit-framework synced 2024-10-29 18:07:27 +01:00
Commit Graph

32629 Commits

Author SHA1 Message Date
darkbushido
13f19601d5
updatingg metasploit-gems 2015-04-21 15:42:15 -05:00
Matt Buck
563c1a7192
Revert not null constraints on timestamps
MSP-12184
2015-04-17 14:17:41 -05:00
Matt Buck
cf2be4bf33
Update metasploit gem deps 2015-04-15 14:10:23 -05:00
Matt Buck
e82fb5f836
Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	lib/msf/ui/console/command_dispatcher/db.rb
	metasploit-framework-db.gemspec
	metasploit-framework.gemspec
2015-04-15 14:04:35 -05:00
William Vu
3633be127a
Land #5153, gem/autoload updates 2015-04-15 13:37:15 -05:00
Matt Buck
1e7a6bf3e9
Update metasploit gem dependencies to released versions 2015-04-15 13:06:33 -05:00
Matt Buck
491835d578
Land #5114, missing metasploit/credential require 2015-04-15 12:52:41 -05:00
jvazquez-r7
ef6bf54e2f
Fix metadata 2015-04-15 09:22:59 -05:00
jvazquez-r7
1da6b32df7
Land #4924, @m-1-k-3's DLink CVE-2015-1187 exploit
* ncc service ping.cpp command injection
2015-04-15 09:17:10 -05:00
jvazquez-r7
6019bbe0d2
Add ranking comment 2015-04-15 09:12:03 -05:00
jvazquez-r7
ad465c4d5b
Do code cleanup 2015-04-15 09:10:18 -05:00
Luke Imhoff
c971bc930c
Mark app/concerns as autoload
To work with metasploit-concern 0.4.0 prerelease not deriving
app/concerns from root and to ensure it is does not inherit eager_load
from app.
2015-04-14 15:06:59 -05:00
Luke Imhoff
b9bce90759
Update to metasploit-concern 0.4.0 prerelease
MSP-12550

Properly shows Metasploit::Credential::Core::ToCredential is not loaded.
2015-04-14 15:03:20 -05:00
Luke Imhoff
4c407ce962
Merge branch 'bug/MSP-12529/missing-require-metasploit-credential' into bug/MSP-12550/app-concerns-eager-load
MSP-12550
2015-04-14 14:42:54 -05:00
William Vu
b5ae3fd62c
Land #5142, missing module rank fixes 2015-04-14 13:41:38 -05:00
sinn3r
aca93cc86e Add missing Rank 2015-04-14 13:33:37 -05:00
Brent Cook
75b559eea3
Land #5081, meterpreter certificate hash check controls 2015-04-14 10:46:13 -05:00
Brent Cook
0e864e1631 update bins to 0.0.21 2015-04-14 10:45:49 -05:00
Brent Cook
7f56c07b64 add missing sslhash attribute 2015-04-14 10:45:44 -05:00
Tod Beardsley
97e715b1ce
Land #5139, metasm/ruby signedness fix 2015-04-14 10:26:23 -05:00
William Vu
f6285991b3
Land #5140, extraneous space fix 2015-04-14 01:38:21 -05:00
sinn3r
61b709b8c5 Extra space in message "Local IP:" 2015-04-14 01:34:07 -05:00
William Vu
e114c85044
Land #5127, x64 OS X prepend stubs 'n' stuff 2015-04-14 01:25:39 -05:00
William Vu
8d1126eaa5
Land #5129, x64 BSD prepend stubs 'n' stuff 2015-04-14 01:24:50 -05:00
Brent Cook
3860bbabbb Avoid generating labels with '..' in them with metasm
So, metasm generates labels for the assembler using "%x" % string.object_id. If
the pointer for string.object_id begins with the most significant digit set, it
looks like a sign-extended 2's complement number (negative), and gets formatted
by ruby as '..f1412300' or similar. On 32-bit platforms, there is rather high
chance of randomly ending up with a label like 'goto_test_uuid..f1234560:',
which is a parse error.

This patch simply takes the absolute value of the object_id to avoid negative
interpretations.  This fixes hiesenbugs using metasm's C compiler on 32-bit
platforms.
2015-04-13 22:43:18 -05:00
Joe Vennix
52fc60b294 Merge pull request #1 from wvu-r7/pr/5127
Add Privileged to info hash
2015-04-13 17:08:14 -05:00
William Vu
e324819feb Add Privileged to info hash
Also remove default payload. Was set for CMD.
2015-04-13 15:23:30 -05:00
Tod Beardsley
c2a252face
Land #5133, grammar/spelling fixes from @void-in 2015-04-13 12:47:32 -05:00
Tod Beardsley
c4084659a9 Check @void-in's fixes out 2015-04-13 12:44:40 -05:00
William Vu
1a81938c6e
Land #5132, @todb-r7's release fixes 2015-04-13 11:07:56 -05:00
Tod Beardsley
bd3b6514fa
Dubbed. Whump whump. 2015-04-13 10:52:32 -05:00
Tod Beardsley
d87483b28d
Squashed commit of the following:
commit 49f480af8b9d27e676c02006ae8873a119e1aae6
Author: Tod Beardsley <tod_beardsley@rapid7.com>
Date:   Mon Apr 13 10:42:13 2015 -0500

    Fix funny punctuation on rootpipe exploit title

    See #5119

commit 0b439671efd6dabcf1a69fd0b089c28badf5ccff
Author: Tod Beardsley <tod_beardsley@rapid7.com>
Date:   Mon Apr 13 10:37:39 2015 -0500

    Fix vendor caps

    Trusting the github repo README at

    https://github.com/embedthis/goahead

    See #5101
2015-04-13 10:46:47 -05:00
root
51dd88114b Fix grammer in comments 2015-04-13 13:21:41 +05:00
joev
2d3614f647 Implement x64 BSD exec and exe template.
- Fixes bug in CachedSize due to all options being set
- Adds new payload to payload_spec.
2015-04-12 12:17:25 -05:00
joev
92c12de6db Fix invalid datastore options. 2015-04-12 00:54:10 -05:00
joev
ceadd1e6ec Update osx x86 payload cached sizes to be accurate.
- Right now there is a bug in the payload_spec, which causes the payload's
  datastore during the spec run to have things like 'PrependSetuid' => 'false',
  where 'false' is a string, which means 'if (datastore['PrependSetuid'])'
  branch will be taken, resulting in incorrect behavior.
2015-04-12 00:21:18 -05:00
joev
eaab665a6d Remove #generate patch, specs will fail again. 2015-04-12 00:07:39 -05:00
joev
60d98ba892 Implement the remaining syscalls. 2015-04-12 00:02:29 -05:00
joev
3fe6fb44b9 Prevent this from changing cache size. 2015-04-11 23:44:56 -05:00
joev
c132a3fb0a Fix OSX prepends and implement x64 setreuid. 2015-04-11 20:04:21 -05:00
William Vu
d5903ca5b2
Land #5126, Meterpreter edit command fix 2015-04-10 17:19:33 -05:00
William Vu
9625504f5b
Land #5121, timestomp arg/opt order fix 2015-04-10 17:18:14 -05:00
William Vu
8acc768da7 Copy documentation 2015-04-10 17:17:54 -05:00
Sonny Gonzalez
3ae533f995 Merge pull request #5117 from shuckins-r7/chore/MSP-12540/set-postgres93-travis
Land #5117 - Set postgres version for Travis to 9.3
2015-04-10 15:36:46 -05:00
Matt Buck
9f15824e2a
Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
2015-04-10 15:35:27 -05:00
rwhitcroft
64c2bf3227 don't raise exception if file download fails 2015-04-10 16:23:33 -04:00
sinn3r
284ef5bbbb
Land #5112, Nessus REST Login Module 2015-04-10 13:32:53 -05:00
joev
3313dac30f
Land #5119, @wvu's addition of the OSX rootpipe privesc exploit.
orts
borts
2015-04-10 12:38:25 -05:00
root
0adc558395 Merge branch 'wchen-r7-pr5112_update' into aux-scanner-nessus 2015-04-10 22:38:22 +05:00
root
19fe226b30 Correct a minor typo 2015-04-10 22:37:14 +05:00