Skip to content

Commit 830cd26

Browse files
jvazquez-r7jvazquez-r7
committed
Solve conflicts
2 parents 75c6341 + e3bbb7c commit 830cd26

File tree

324 files changed

+10925
-2480
lines changed

Some content is hidden

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

324 files changed

+10925
-2480
lines changed

‎.gitignore

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,7 @@ external/source/exploits/**/Release
6767

6868
# Avoid checking in Meterpreter binaries. These are supplied upstream by
6969
# the meterpreter_bins gem.
70-
data/meterpreter/elevator.*.dll
71-
data/meterpreter/ext_server_espia.*.dll
72-
data/meterpreter/ext_server_extapi.*.dll
73-
data/meterpreter/ext_server_incognito.*.dll
74-
data/meterpreter/ext_server_kiwi.*.dll
75-
data/meterpreter/ext_server_lanattacks.*.dll
76-
data/meterpreter/ext_server_mimikatz.*.dll
77-
data/meterpreter/ext_server_priv.*.dll
78-
data/meterpreter/ext_server_stdapi.*.dll
79-
data/meterpreter/metsrv.*.dll
80-
data/meterpreter/screenshot.*.dll
70+
data/meterpreter/*.dll
8171

8272
# Avoid checking in Meterpreter libs that are built from
8373
# private source. If you're interested in this functionality,

‎.mailmap

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ jhart-r7 <jhart-r7@github> Jon Hart <[email protected]>
1313
jlee-r7 <jlee-r7@github> egypt <[email protected]> # aka egypt
1414
jlee-r7 <jlee-r7@github> James Lee <[email protected]> # aka egypt
1515
jlee-r7 <jlee-r7@github> James Lee <[email protected]>
16-
joev-r7 <joev-r7@github> Joe Vennix <[email protected]>
17-
joev-r7 <joev-r7@github> Joe Vennix <[email protected]>
18-
joev-r7 <joev-r7@github> joev <[email protected]>
19-
joev-r7 <joev-r7@github> jvennix-r7 <[email protected]>
20-
joev-r7 <joev-r7@github> jvennix-r7 <[email protected]>
2116
jvazquez-r7 <jvazquez-r7@github> jvazquez-r7 <[email protected]>
2217
jvazquez-r7 <jvazquez-r7@github> jvazquez-r7 <[email protected]>
2318
kgray-r7 <kgray-r7@github> Kyle Gray <[email protected]>
@@ -80,9 +75,15 @@ jcran <jcran@github> Jonathan Cran <[email protected]>
8075
jcran <jcran@github> Jonathan Cran <[email protected]>
8176
jduck <jduck@github> Joshua Drake <[email protected]>
8277
jgor <jgor@github> jgor <[email protected]>
78+
joevennix <joevennix@github> joe <[email protected]>
79+
joevennix <joevennix@github> Joe Vennix <[email protected]>
80+
joevennix <joevennix@github> Joe Vennix <[email protected]>
81+
joevennix <joevennix@github> joev <[email protected]>
82+
joevennix <joevennix@github> jvennix-r7 <[email protected]>
83+
joevennix <joevennix@github> jvennix-r7 <[email protected]>
8384
kernelsmith <kernelsmith@github> Joshua Smith <[email protected]>
84-
kernelsmith <kernelsmith@github> kernelsmith <kernelsmith@kernelsmith>
8585
kernelsmith <kernelsmith@github> Joshua Smith <[email protected]>
86+
kernelsmith <kernelsmith@github> kernelsmith <kernelsmith@kernelsmith>
8687
kost <kost@github> Vlatko Kosturjak <[email protected]>
8788
kris <kris@???> kris <>
8889
m-1-k-3 <m-1-k-3@github> m-1-k-3 <[email protected]>

‎CONTRIBUTING.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Thanks for your interest in making Metasploit -- and therefore, the
44
world -- a better place!
55

66
Are you about to report a bug? Sorry to hear it. Here's our [Issue tracker].
7-
Please try to be as specific as you can about your problem, include steps
8-
to reproduce (cut and paste from your console output if it's helpful), and
7+
Please try to be as specific as you can about your problem; include steps
8+
to reproduce (cut and paste from your console output if it's helpful) and
99
what you were expecting to happen.
1010

1111
Are you about to report a security vulnerability in Metasploit itself?
@@ -18,7 +18,7 @@ Metasploit module? If so, read on...
1818

1919
# Contributing to Metasploit
2020

21-
What you see here in CONTRIBUTING.md is a bullet-point list of the do's
21+
What you see here in CONTRIBUTING.md is a bullet point list of the do's
2222
and don'ts of how to make sure *your* valuable contributions actually
2323
make it into Metasploit's master branch.
2424

@@ -27,7 +27,7 @@ closed. Sorry!
2727

2828
This is intended to be a **short** list. The [wiki] is much more
2929
exhaustive and reveals many mysteries. If you read nothing else, take a
30-
look at the standard [development environment setup] guide,
30+
look at the standard [development environment setup] guide
3131
and Metasploit's [Common Coding Mistakes].
3232

3333
## Code Contributions
@@ -52,7 +52,7 @@ Pull requests [PR#2940] and [PR#3043] are a couple good examples to follow.
5252
#### New Modules
5353

5454
* **Do** run `tools/msftidy.rb` against your module and fix any errors or warnings that come up.
55-
- Even better would be to set up `msftidy.rb` as a [pre-commit hook].
55+
- It would be even better to set up `msftidy.rb` as a [pre-commit hook].
5656
* **Do** use the many module mixin [API]s. Wheel improvements are welcome; wheel reinventions, not so much.
5757
* **Don't** include more than one module per pull request.
5858

@@ -80,19 +80,19 @@ Pull requests [PR#2940] and [PR#3043] are a couple good examples to follow.
8080
* **Do** report vulnerabilities in Rapid7 software directly to [email protected].
8181
* **Do** write a detailed description of your bug and use a descriptive title.
8282
* **Do** include reproduction steps, stack traces, and anything else that might help us verify and fix your bug.
83-
* **Don't** file duplicate reports - search for your bug before filing a new report.
83+
* **Don't** file duplicate reports; search for your bug before filing a new report.
8484

8585
If you need some more guidance, talk to the main body of open
86-
source contributors over on the [Freenode IRC channel]
87-
or e-mail us at [metasploit-hackers] mailing list.
86+
source contributors over on the [Freenode IRC channel],
87+
or e-mail us at the [metasploit-hackers] mailing list.
8888

8989
Also, **thank you** for taking the few moments to read this far! You're
9090
already way ahead of the curve, so keep it up!
9191

9292
[Issue Tracker]:http://r-7.co/MSF-BUGv1
9393
[PGP key]:http://pgp.mit.edu:11371/pks/lookup?op=vindex&search=0x2380F85B8AD4DB8D
9494
[wiki]:https://github.com/rapid7/metasploit-framework/wiki
95-
[scripts]: https://github.com/rapid7/metasploit-framework/tree/master/scripts
95+
[scripts]:https://github.com/rapid7/metasploit-framework/tree/master/scripts
9696
[development environment setup]:http://r-7.co/MSF-DEV
9797
[Common Coding Mistakes]:https://github.com/rapid7/metasploit-framework/wiki/Common-Metasploit-Module-Coding-Mistakes
9898
[Ruby style guide]:https://github.com/bbatsov/ruby-style-guide
@@ -104,10 +104,10 @@ already way ahead of the curve, so keep it up!
104104
[PR#2940]:https://github.com/rapid7/metasploit-framework/pull/2940
105105
[PR#3043]:https://github.com/rapid7/metasploit-framework/pull/3043
106106
[pre-commit hook]:https://github.com/rapid7/metasploit-framework/blob/master/tools/dev/pre-commit-hook.rb
107-
[API]:https://rapid7.github.io/metasploit-framework/api/
108-
[RSpec]:http://rspec.info/
109-
[Better Specs]:http://betterspecs.org/
110-
[YARD]:http://yardoc.org/
107+
[API]:https://rapid7.github.io/metasploit-framework/api
108+
[RSpec]:http://rspec.info
109+
[Better Specs]:http://betterspecs.org
110+
[YARD]:http://yardoc.org
111111
[Issues]:https://github.com/rapid7/metasploit-framework/issues
112112
[Freenode IRC channel]:http://webchat.freenode.net/?channels=%23metasploit&uio=d4
113113
[metasploit-hackers]:https://lists.sourceforge.net/lists/listinfo/metasploit-hackers

‎Gemfile.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ PATH
99
json
1010
metasploit-concern (~> 0.3.0)
1111
metasploit-model (~> 0.29.0)
12-
meterpreter_bins (= 0.0.14)
12+
meterpreter_bins (= 0.0.17)
1313
msgpack
1414
nokogiri
1515
packetfu (= 1.1.9)
@@ -24,7 +24,7 @@ PATH
2424
activerecord (>= 3.2.21, < 4.0.0)
2525
metasploit-credential (~> 0.14.3)
2626
metasploit-framework (= 4.11.0.pre.dev)
27-
metasploit_data_models (~> 0.23.0)
27+
metasploit_data_models (~> 0.23.2)
2828
pg (>= 0.11)
2929
metasploit-framework-pcap (4.11.0.pre.dev)
3030
metasploit-framework (= 4.11.0.pre.dev)
@@ -101,11 +101,11 @@ GEM
101101
gherkin (2.11.6)
102102
json (>= 1.7.6)
103103
hike (1.2.3)
104-
i18n (0.6.11)
104+
i18n (0.7.0)
105105
journey (1.0.4)
106106
jsobfu (0.2.1)
107107
rkelly-remix (= 0.0.6)
108-
json (1.8.1)
108+
json (1.8.2)
109109
mail (2.5.4)
110110
mime-types (~> 1.16)
111111
treetop (~> 1.4.8)
@@ -123,7 +123,7 @@ GEM
123123
metasploit-model (0.29.0)
124124
activesupport
125125
railties (< 4.0.0)
126-
metasploit_data_models (0.23.1)
126+
metasploit_data_models (0.23.2)
127127
activerecord (>= 3.2.13, < 4.0.0)
128128
activesupport
129129
arel-helpers
@@ -132,14 +132,14 @@ GEM
132132
pg
133133
railties (< 4.0.0)
134134
recog (~> 1.0)
135-
meterpreter_bins (0.0.14)
135+
meterpreter_bins (0.0.17)
136136
method_source (0.8.2)
137137
mime-types (1.25.1)
138-
mini_portile (0.6.1)
138+
mini_portile (0.6.2)
139139
msgpack (0.5.11)
140140
multi_json (1.0.4)
141141
network_interface (0.0.1)
142-
nokogiri (1.6.5)
142+
nokogiri (1.6.6.2)
143143
mini_portile (~> 0.6.0)
144144
packetfu (1.1.9)
145145
pcaprub (0.11.3)
@@ -154,7 +154,7 @@ GEM
154154
rack (>= 0.4)
155155
rack-ssl (1.3.4)
156156
rack
157-
rack-test (0.6.2)
157+
rack-test (0.6.3)
158158
rack (>= 1.0)
159159
rails (3.2.21)
160160
actionmailer (= 3.2.21)
@@ -175,7 +175,7 @@ GEM
175175
rb-readline-r7 (0.5.2.0)
176176
rdoc (3.12.2)
177177
json (~> 1.4)
178-
recog (1.0.16)
178+
recog (1.0.24)
179179
nokogiri
180180
redcarpet (3.1.2)
181181
rkelly-remix (0.0.6)
@@ -219,7 +219,7 @@ GEM
219219
treetop (1.4.15)
220220
polyglot
221221
polyglot (>= 0.3.1)
222-
tzinfo (0.3.42)
222+
tzinfo (0.3.43)
223223
xpath (2.0.0)
224224
nokogiri (~> 1.3)
225225
yard (0.8.7.4)

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Metasploit [![Build Status](https://travis-ci.org/rapid7/metasploit-framework.pn
33
The Metasploit Framework is released under a BSD-style license. See
44
COPYING for more details.
55

6-
The latest version of this software is available from https://metasploit.com/
6+
The latest version of this software is available from: https://metasploit.com
77

88
Bug tracking and development information can be found at:
99
https://github.com/rapid7/metasploit-framework
@@ -20,8 +20,8 @@ Questions and suggestions can be sent to:
2020
Installing
2121
--
2222

23-
Generally, you should use [the free installer](https://www.metasploit.com/download)
24-
which contains all dependencies and will get you up and running with a
23+
Generally, you should use [the free installer](https://www.metasploit.com/download),
24+
which contains all of the dependencies and will get you up and running with a
2525
few clicks. See the [Dev Environment Setup](http://r-7.co/MSF-DEV) if
2626
you'd like to deal with dependencies on your own.
2727

@@ -34,10 +34,10 @@ resources](https://metasploit.github.io), or the [wiki].
3434

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

4343

‎data/exploits/CVE-2014-0980.pui

16.7 KB
Binary file not shown.

‎data/exploits/CVE-2015-0313/msf.swf

17.5 KB
Binary file not shown.

‎data/logos/pony-01.aftxt

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
 _________________________________________________ 
2+
< This console just got 20% cooler >
3+
 ------------------------------------------------- 
4+
/
5+
/ 
6+
▀▄▄▄▄▄▄▄▄ / 
7+
▀▀▄▄▄▄▄█▄▄▄▄ / 
8+
▄███▄▄▄▄██▄██ / 
9+
▄██▄█▄▄█▄▄██▄███ / 
10+
▄██▄█████▄██▄▄█▄▄ / 
11+
▄███████▄██▄▀▀▄▄██ / 
12+
██████████▄▄▄ ██▄█ / 
13+
██▄███▄███ ▀▀ ████ / 
14+
▀███▄███▄▀ ███ / 
15+
▀ ████▄▀ █▄█ / 
16+
██▄▀█ ▄▄▄▄▄▄▄▄ / 
17+
▀▄█ ▀ ▄▄█▄██████▄▄ / 
18+
▀█ ███▄█████████ / 
19+
▄███▄▄█████████ / 
20+
███████▄██████▄▀ / 
21+
█████▄▄█████████ 
22+
▄▄███▄▀ █▄███████ ▄▄▄▄▄▄▄▄▄ 
23+
▄▄█████ ▄█▄██▄████▄█▄█▄▄██▄▄██▄█▀ 
24+
▀▄██▄▀▄▄▄███▄▄███▄██▄▄███▄▄███▄▄▄ 
25+
▀▀ ▄███████████████▄▄▄██▄▄███▀▄ 
26+
████▄█████████▄▄▄▄▄█▄▄▄▄▄███ 
27+
███████▄█████▄▄████▄▄██▄██▀▄██ 
28+
▀▀▄▄██████▄██████▄▄▄████▄▄ ▀▀▀ 
29+
▄▄██████████▄▄█▄▄▄▄▄██▄▄▄ 
30+
██▄█████████▄▄▄██████████ 
31+
▀▀ █▄████ ███▄█▄▄▄▄▄▄▄▀▀ 
32+
▄▄████ ████▄██ 
33+
▀▄████ ██▄███ 
34+
▀▄▄▀ ██▀█▀▀ 
35+
█ 

0 commit comments

Comments
 (0)