Skip to content

Commit 184b4e8

Browse files
committed
Merge branch 'master' into feature/MSP-11141/extract-cache-from-metasploit-model
MSP-11141 Conflicts: Gemfile.lock metasploit-framework-db.gemspec
2 parents 5df1336 + 7f2add2 commit 184b4e8

File tree

362 files changed

+15991
-5582
lines changed

Some content is hidden

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

362 files changed

+15991
-5582
lines changed

.mailmap

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,46 @@
11
bcook-r7 <bcook-r7@github> Brent Cook <[email protected]>
22
bturner-r7 <bturner-r7@github> Brandon Turner <[email protected]>
3+
cdoughty-r7 <cdoughty-r7@github> Chris Doughty <[email protected]>
34
dheiland-r7 <dheiland-r7@github> Deral Heiland <[email protected]>
4-
dmaloney-r7 <dmaloney-r7@github> David Maloney <[email protected]>
55
dmaloney-r7 <dmaloney-r7@github> David Maloney <[email protected]>
6+
dmaloney-r7 <dmaloney-r7@github> David Maloney <[email protected]>
67
dmaloney-r7 <dmaloney-r7@github> dmaloney-r7 <[email protected]>
78
ecarey-r7 <ecarey-r7@github> Erran Carey <[email protected]>
89
farias-r7 <farias-r7@github> Fernando Arias <[email protected]>
910
hmoore-r7 <hmoore-r7@github> HD Moore <[email protected]>
1011
hmoore-r7 <hmoore-r7@github> HD Moore <[email protected]>
1112
jhart-r7 <jhart-r7@github> Jon Hart <[email protected]>
12-
jlee-r7 <jlee-r7@github> James Lee <[email protected]>
13-
jlee-r7 <jlee-r7@github> James Lee <[email protected]> # aka egypt
1413
jlee-r7 <jlee-r7@github> egypt <[email protected]> # aka egypt
14+
jlee-r7 <jlee-r7@github> James Lee <[email protected]> # aka egypt
15+
jlee-r7 <jlee-r7@github> James Lee <[email protected]>
1516
joev-r7 <joev-r7@github> Joe Vennix <[email protected]>
17+
joev-r7 <joev-r7@github> Joe Vennix <[email protected]>
1618
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]>
1721
jvazquez-r7 <jvazquez-r7@github> jvazquez-r7 <[email protected]>
1822
jvazquez-r7 <jvazquez-r7@github> jvazquez-r7 <[email protected]>
23+
kgray-r7 <kgray-r7@github> Kyle Gray <[email protected]>
1924
limhoff-r7 <limhoff-r7@github> Luke Imhoff <[email protected]>
20-
lsanchez-r7 <lsanchez-r7@github> Lance Sanchez <[email protected]>
2125
lsanchez-r7 <lsanchez-r7@github> darkbushido <[email protected]>
26+
lsanchez-r7 <lsanchez-r7@github> Lance Sanchez <[email protected]>
27+
lsanchez-r7 <lsanchez-r7@github> Lance Sanchez <[email protected]>
28+
lsanchez-r7 <lsanchez-r7@github> Lance Sanchez <[email protected]>
29+
lsanchez-r7 <lsanchez-r7@github> Lance Sanchez <[email protected]>
2230
mbuck-r7 <mbuck-r7@github> Matt Buck <[email protected]>
2331
mbuck-r7 <mbuck-r7@github> Matt Buck <[email protected]>
32+
mschloesser-r7 <mschloesser-r7@github> Mark Schloesser <[email protected]>
33+
mschloesser-r7 <mschloesser-r7@github> mschloesser-r7 <[email protected]>
2434
parzamendi-r7 <parzamendi-r7@github> parzamendi-r7 <[email protected]>
2535
shuckins-r7 <shuckins-r7@github> Samuel Huckins <[email protected]>
2636
todb-r7 <todb-r7@github> Tod Beardsley <[email protected]>
2737
todb-r7 <todb-r7@github> Tod Beardsley <[email protected]>
2838
todb-r7 <todb-r7@github> Tod Beardsley <[email protected]>
29-
trosen-r7 <trosen-r7@github> Trevor Rosen <[email protected]>
3039
trosen-r7 <trosen-r7@github> Trevor Rosen <[email protected]>
31-
wchen-r7 <wchen-r7@github> Wei Chen <Wei_Chen@rapid7.com>
40+
trosen-r7 <trosen-r7@github> Trevor Rosen <Trevor_Rosen@rapid7.com>
3241
wchen-r7 <wchen-r7@github> sinn3r <[email protected]> # aka sinn3r
3342
wchen-r7 <wchen-r7@github> sinn3r <[email protected]>
43+
wchen-r7 <wchen-r7@github> Wei Chen <[email protected]>
3444
wvu-r7 <wvu-r7@github> William Vu <[email protected]>
3545
wvu-r7 <wvu-r7@github> William Vu <[email protected]>
3646
wvu-r7 <wvu-r7@github> William Vu <[email protected]>
@@ -44,10 +54,13 @@ wvu-r7 <wvu-r7@github> wvu-r7 <[email protected]>
4454
# let [email protected] know.
4555

4656
bannedit <bannedit@github> David Rude <[email protected]>
47-
Brandon Perry <brandonprry@github> Brandon Perry <[email protected]>
48-
Brandon Perry <brandonprry@github> Brandon Perry <bperry@bperry-rapid7.(none)>
49-
Brian Wallace <bwall@github> (B)rian (Wall)ace <[email protected]>
50-
Brian Wallace <bwall@github> Brian Wallace <[email protected]>
57+
bcoles <bcoles@github> bcoles <[email protected]>
58+
bcoles <bcoles@github> Brendan Coles <[email protected]>
59+
brandonprry <brandonprry@github> Brandon Perry <[email protected]>
60+
brandonprry <brandonprry@github> Brandon Perry <bperry@bperry-rapid7.(none)>
61+
brandonprry <brandonprry@github> Brandon Perry <[email protected]>
62+
bwall <bwall@github> (B)rian (Wall)ace <[email protected]>
63+
bwall <bwall@github> Brian Wallace <[email protected]>
5164
ceballosm <ceballosm@github> Mario Ceballos <[email protected]>
5265
Chao-mu <Chao-Mu@github> Chao Mu <[email protected]>
5366
Chao-mu <Chao-Mu@github> chao-mu <[email protected]>
@@ -69,11 +82,13 @@ jduck <jduck@github> Joshua Drake <[email protected]>
6982
jgor <jgor@github> jgor <[email protected]>
7083
kernelsmith <kernelsmith@github> Joshua Smith <[email protected]>
7184
kernelsmith <kernelsmith@github> kernelsmith <kernelsmith@kernelsmith>
85+
kernelsmith <kernelsmith@github> Joshua Smith <[email protected]>
7286
kost <kost@github> Vlatko Kosturjak <[email protected]>
7387
kris <kris@???> kris <>
7488
m-1-k-3 <m-1-k-3@github> m-1-k-3 <[email protected]>
7589
m-1-k-3 <m-1-k-3@github> m-1-k-3 <[email protected]>
7690
m-1-k-3 <m-1-k-3@github> m-1-k-3 <[email protected]>
91+
m-1-k-3 <m-1-k-3@github> Michael Messner <[email protected]>
7792
Meatballs1 <Meatballs1@github> Ben Campbell <[email protected]>
7893
Meatballs1 <Meatballs1@github> Meatballs <[email protected]>
7994
Meatballs1 <Meatballs1@github> Meatballs1 <[email protected]>
@@ -83,8 +98,8 @@ nmonkee <nmonkee@github> nmonkee <[email protected]>
8398
nullbind <nullbind@github> nullbind <[email protected]>
8499
nullbind <nullbind@github> Scott Sutherland <[email protected]>
85100
ohdae <ohdae@github> ohdae <[email protected]>
86-
OJ <oj@github> OJ <[email protected]>
87-
OJ <oj@github> OJ Reeves <[email protected]>
101+
oj <oj@github> OJ <[email protected]>
102+
oj <oj@github> OJ Reeves <[email protected]>
88103
r3dy <r3dy@github> Royce Davis <[email protected]>
89104
r3dy <r3dy@github> Royce Davis <[email protected]>
90105
Rick Flores <[email protected]> Rick Flores (nanotechz9l) <[email protected]>
@@ -96,12 +111,15 @@ skape <skape@???> Matt Miller <[email protected]>
96111
spoonm <spoonm@github> Spoon M <[email protected]>
97112
swtornio <swtornio@github> Steve Tornio <[email protected]>
98113
Tasos Laskos <[email protected]> Tasos Laskos <[email protected]>
114+
timwr <timwr@github> Tim <[email protected]>
99115
timwr <timwr@github> Tim Wright <[email protected]>
116+
TomSellers <TomSellers@github> Tom Sellers <[email protected]>
100117
TrustedSec <[email protected]> trustedsec <[email protected]>
101118
zeroSteiner <zeroSteiner@github> Spencer McIntyre <[email protected]>
102119

103120
# Aliases for utility author names. Since they're fake, typos abound
104121

105-
Tab Assassin <[email protected]> Tabasssassin <[email protected]>
106122
Tab Assassin <[email protected]> Tabassassin <[email protected]>
107123
Tab Assassin <[email protected]> TabAssassin <[email protected]>
124+
Tab Assassin <[email protected]> Tabasssassin <[email protected]>
125+
Tab Assassin <[email protected]> URI Assassin <[email protected]>

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.9.3-p551
1+
2.1.5

CONTRIBUTING.md

Lines changed: 53 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@
33
Thanks for your interest in making Metasploit -- and therefore, the
44
world -- a better place!
55

6-
Are you about to report a bug? Sorry to hear it.
7-
8-
Here's our [Issue tracker](https://github.com/rapid7/metasploit-framework/issues).
6+
Are you about to report a bug? Sorry to hear it. Here's our [Issue tracker].
97
Please try to be as specific as you can about your problem, include steps
108
to reproduce (cut and paste from your console output if it's helpful), and
119
what you were expecting to happen.
1210

1311
Are you about to report a security vulnerability in Metasploit itself?
1412
How ironic! Please take a look at Rapid7's [Vulnerability
1513
Disclosure Policy](https://www.rapid7.com/disclosure.jsp), and send
16-
your report to [email protected] using [our PGP key](http://pgp.mit.edu:11371/pks/lookup?op=vindex&search=0x2380F85B8AD4DB8D).
14+
your report to [email protected] using our [PGP key].
1715

1816
Are you about to contribute some new functionality, a bug fix, or a new
1917
Metasploit module? If so, read on...
@@ -25,52 +23,57 @@ and don'ts of how to make sure *your* valuable contributions actually
2523
make it into Metasploit's master branch.
2624

2725
If you care not to follow these rules, your contribution **will** be
28-
closed (*Road House* style). Sorry!
26+
closed. Sorry!
2927

30-
This is intended to be a **short** list. The
31-
[wiki](https://github.com/rapid7/metasploit-framework/wiki) is much more
28+
This is intended to be a **short** list. The [wiki] is much more
3229
exhaustive and reveals many mysteries. If you read nothing else, take a
33-
look at the standard [development environment setup
34-
guide](https://github.com/rapid7/metasploit-framework/wiki/Setting-Up-a-Metasploit-Development-Environment)
35-
and Metasploit's [Common Coding Mistakes](https://github.com/rapid7/metasploit-framework/wiki/Common-Metasploit-Module-Coding-Mistakes).
30+
look at the standard [development environment setup] guide,
31+
and Metasploit's [Common Coding Mistakes].
3632

3733
## Code Contributions
3834

39-
* **Do** stick to the [Ruby style guide](https://github.com/bbatsov/ruby-style-guide).
40-
* **Do** get [Rubocop](https://rubygems.org/search?query=rubocop) relatively quiet against the code you are adding or modifying.
41-
* **Do** follow the [50/72 rule](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) for Git commit messages.
42-
* **Don't** use the default merge messages when merging from other
43-
branches.
44-
* **Do** create a [topic branch](http://git-scm.com/book/en/Git-Branching-Branching-Workflows#Topic-Branches) to work on instead of working directly on `master`.
35+
* **Do** stick to the [Ruby style guide].
36+
* **Do** get [Rubocop] relatively quiet against the code you are adding or modifying.
37+
* **Do** follow the [50/72 rule] for Git commit messages.
38+
* **Don't** use the default merge messages when merging from other branches.
39+
* **Do** create a [topic branch] to work on instead of working directly on `master`.
4540

4641
### Pull Requests
4742

4843
* **Do** target your pull request to the **master branch**. Not staging, not develop, not release.
4944
* **Do** specify a descriptive title to make searching for your pull request easier.
50-
* **Do** include [console output](https://help.github.com/articles/github-flavored-markdown#fenced-code-blocks), especially for witnessable effects in `msfconsole`.
51-
* **Do** list [verification steps](https://help.github.com/articles/writing-on-github#task-lists) so your code is testable.
45+
* **Do** include [console output], especially for witnessable effects in `msfconsole`.
46+
* **Do** list [verification steps] so your code is testable.
5247
* **Don't** leave your pull request description blank.
5348
* **Don't** abandon your pull request. Being responsive helps us land your code faster.
5449

55-
Pull requests [#2940](https://github.com/rapid7/metasploit-framework/pull/2940) and [#3043](https://github.com/rapid7/metasploit-framework/pull/3043) are a couple good examples to follow.
50+
Pull requests [PR#2940] and [PR#3043] are a couple good examples to follow.
5651

5752
#### New Modules
5853

59-
* **Do** run `tools/msftidy.rb` against your module and fix any errors or warnings that come up. Even better would be to set up `msftidy.rb` as a [pre-commit hook](https://github.com/rapid7/metasploit-framework/blob/master/tools/dev/pre-commit-hook.rb).
60-
* **Do** use the [many module mixin APIs](https://rapid7.github.io/metasploit-framework/api/). Wheel improvements are welcome; wheel reinventions, not so much.
54+
* **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].
56+
* **Do** use the many module mixin [API]s. Wheel improvements are welcome; wheel reinventions, not so much.
6157
* **Don't** include more than one module per pull request.
6258

59+
#### Scripts
60+
61+
* **Don't** submit new [scripts]. Scripts are shipped as examples for
62+
automating local tasks, and anything "serious" can be done with post
63+
modules and local exploits.
64+
6365
#### Library Code
6466

65-
* **Do** write [RSpec](http://rspec.info/) tests - even the smallest change in library land can thoroughly screw things up.
66-
* **Do** follow [Better Specs](http://betterspecs.org/) - it's like the style guide for specs.
67-
* **Do** write [YARD](http://yardoc.org/) documentation - this makes it easier for people to use your code.
67+
* **Do** write [RSpec] tests - even the smallest change in library land can thoroughly screw things up.
68+
* **Do** follow [Better Specs] - it's like the style guide for specs.
69+
* **Do** write [YARD] documentation - this makes it easier for people to use your code.
6870
* **Don't** fix a lot of things in one pull request. Small fixes are easier to validate.
6971

7072
#### Bug Fixes
7173

7274
* **Do** include reproduction steps in the form of verification steps.
73-
* **Do** include a link to any corresponding [Issue](https://github.com/rapid7/metasploit-framework/issues) in the format of `See #1234` in your commit description.
75+
* **Do** include a link to any corresponding [Issues] in the format of
76+
`See #1234` in your commit description.
7477

7578
## Bug Reports
7679

@@ -80,9 +83,31 @@ Pull requests [#2940](https://github.com/rapid7/metasploit-framework/pull/2940)
8083
* **Don't** file duplicate reports - search for your bug before filing a new report.
8184

8285
If you need some more guidance, talk to the main body of open
83-
source contributors over on the [Freenode IRC channel](http://webchat.freenode.net/?channels=%23metasploit&uio=d4)
84-
or e-mail us at [metasploit-hackers](https://lists.sourceforge.net/lists/listinfo/metasploit-hackers)
85-
mailing list.
86+
source contributors over on the [Freenode IRC channel]
87+
or e-mail us at [metasploit-hackers] mailing list.
8688

8789
Also, **thank you** for taking the few moments to read this far! You're
8890
already way ahead of the curve, so keep it up!
91+
92+
[Issue Tracker]:http://r-7.co/MSF-BUGv1
93+
[PGP key]:http://pgp.mit.edu:11371/pks/lookup?op=vindex&search=0x2380F85B8AD4DB8D
94+
[wiki]:https://github.com/rapid7/metasploit-framework/wiki
95+
[scripts]: https://github.com/rapid7/metasploit-framework/tree/master/scripts
96+
[development environment setup]:http://r-7.co/MSF-DEV
97+
[Common Coding Mistakes]:https://github.com/rapid7/metasploit-framework/wiki/Common-Metasploit-Module-Coding-Mistakes
98+
[Ruby style guide]:https://github.com/bbatsov/ruby-style-guide
99+
[Rubocop]:https://rubygems.org/search?query=rubocop
100+
[50.72 rule]:http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
101+
[topic branch]:http://git-scm.com/book/en/Git-Branching-Branching-Workflows#Topic-Branches
102+
[console output]:https://help.github.com/articles/github-flavored-markdown#fenced-code-blocks
103+
[verification steps]:https://help.github.com/articles/writing-on-github#task-lists
104+
[PR#2940]:https://github.com/rapid7/metasploit-framework/pull/2940
105+
[PR#3043]:https://github.com/rapid7/metasploit-framework/pull/3043
106+
[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/
111+
[Issues]:https://github.com/rapid7/metasploit-framework/issues
112+
[Freenode IRC channel]:http://webchat.freenode.net/?channels=%23metasploit&uio=d4
113+
[metasploit-hackers]:https://lists.sourceforge.net/lists/listinfo/metasploit-hackers

COPYING

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (C) 2006-2014, Rapid7, Inc.
1+
Copyright (C) 2006-2015, Rapid7, Inc.
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,

Gemfile.lock

Lines changed: 2 additions & 2 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.12)
12+
meterpreter_bins (= 0.0.13)
1313
msgpack
1414
nokogiri
1515
packetfu (= 1.1.9)
@@ -132,7 +132,7 @@ GEM
132132
pg
133133
railties (< 4.0.0)
134134
recog (~> 1.0)
135-
meterpreter_bins (0.0.12)
135+
meterpreter_bins (0.0.13)
136136
method_source (0.8.2)
137137
mime-types (1.25.1)
138138
mini_portile (0.6.1)

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
22
Source: http://www.metasploit.com/
33

44
Files: *
5-
Copyright: 2006-2014, Rapid7, Inc.
5+
Copyright: 2006-2015, Rapid7, Inc.
66
License: BSD-3-clause
77

88
# The Metasploit Framework is provided under the 3-clause BSD license provided

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
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)
1+
Metasploit [![Build Status](https://travis-ci.org/rapid7/metasploit-framework.png?branch=master)](https://travis-ci.org/rapid7/metasploit-framework) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/rapid7/metasploit-framework)
22
==
33
The Metasploit Framework is released under a BSD-style license. See
44
COPYING for more details.
@@ -8,6 +8,9 @@ The latest version of this software is available from https://metasploit.com/
88
Bug tracking and development information can be found at:
99
https://github.com/rapid7/metasploit-framework
1010

11+
New bugs and feature requests should be directed to:
12+
http://r-7.co/MSF-BUGv1
13+
1114
API documentation for writing modules can be found at:
1215
https://rapid7.github.io/metasploit-framework/api
1316

config/application.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ module Framework
3434
class Application < Rails::Application
3535
include Metasploit::Framework::CommonEngine
3636

37+
config.paths['log'] = "#{Msf::Config.log_directory}/#{Rails.env}.log"
3738
config.paths['config/database'] = [Metasploit::Framework::Database.configurations_pathname.try(:to_path)]
3839
end
3940
end

data/android/apk/classes.dex

-1.11 KB
Binary file not shown.

data/android/apk/resources.arsc

-4 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)