Skip to content

Commit cf8b4a7

Browse files
wchen-r7wchen-r7
committed
Bring branch up to date with upstream-master
2 parents 183be81 + 1736332 commit cf8b4a7

File tree

6,798 files changed

+480458
-296720
lines changed

Some content is hidden

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

6,798 files changed

+480458
-296720
lines changed

‎.dockerignore

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
.dockerignore
2+
.gitignore
3+
.env*
4+
docker-compose*.yml
5+
docker/
6+
!docker/msfconsole.rc
7+
README.md
8+
9+
.bundle
10+
Gemfile.local
11+
Gemfile.local.lock
12+
# Rubymine project directory
13+
.idea
14+
# Sublime Text project directory (not created by ST by default)
15+
.sublime-project
16+
# RVM control file, keep this to avoid backdooring Metasploit
17+
.rvmrc
18+
# Allow for a local choice of (unsupported / semi-supported) ruby versions
19+
# See PR #4136 for usage, but example usage for rvm:
20+
# rvm --create --versions-conf use 2.1.4@metasploit-framework
21+
# Because rbenv doesn't use .versions.conf, to achieve this same functionality, run:
22+
# rbenv shell 2.1.4
23+
.versions.conf
24+
# YARD cache directory
25+
.yardoc
26+
# Mac OS X files
27+
.DS_Store
28+
# database config for testing
29+
config/database.yml
30+
# target config file for testing
31+
features/support/targets.yml
32+
# simplecov coverage data
33+
coverage
34+
doc/
35+
external/source/meterpreter/java/bin
36+
external/source/meterpreter/java/build
37+
external/source/meterpreter/java/extensions
38+
external/source/javapayload/bin
39+
external/source/javapayload/build
40+
# Java binary ignores. Replace the 5 above with this once we're merged.
41+
external/source/javapayload/*/.classpath
42+
external/source/javapayload/*/.project
43+
external/source/javapayload/*/.settings
44+
external/source/javapayload/*/bin
45+
external/source/javapayload/*/target
46+
external/source/javapayload/*/*/.classpath
47+
external/source/javapayload/*/*/.project
48+
external/source/javapayload/*/*/.settings
49+
external/source/javapayload/*/*/bin
50+
external/source/javapayload/*/*/target
51+
# Packaging directory
52+
pkg
53+
tags
54+
*.swp
55+
*.orig
56+
*.rej
57+
*~
58+
# Ignore backups of retabbed files
59+
*.notab
60+
61+
# ignore Visual Studio external source garbage
62+
*.suo
63+
*.sdf
64+
*.opensdf
65+
*.user
66+
67+
# Rails log directory
68+
/log
69+
# Rails tmp directory
70+
/tmp
71+
72+
# ignore release/debug folders for exploits
73+
external/source/exploits/**/Debug
74+
external/source/exploits/**/Release
75+
76+
# Avoid checking in Meterpreter binaries. These are supplied upstream by
77+
# the metasploit-payloads gem.
78+
data/meterpreter/*.dll
79+
data/meterpreter/*.php
80+
data/meterpreter/*.py
81+
data/meterpreter/*.bin
82+
data/meterpreter/*.jar
83+
data/meterpreter/*.lso
84+
data/android
85+
data/java
86+
87+
# Avoid checking in Meterpreter libs that are built from
88+
# private source. If you're interested in this functionality,
89+
# check out Metasploit Pro: http://metasploit.com/download
90+
data/meterpreter/ext_server_pivot.*.dll
91+
92+
# Avoid checking in metakitty, the source for
93+
# https://rapid7.github.io/metasploit-framework. It's an orphan branch.
94+
/metakitty
95+
.vagrant

‎.github/ISSUE_TEMPLATE.md

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
## Steps to reproduce
2+
3+
How'd you do it?
4+
5+
1. ...
6+
2. ...
7+
8+
This section should also tell us any relevant information about the
9+
environment; for example, if an exploit that used to work is failing,
10+
tell us the victim operating system and service versions.
11+
12+
## Expected behavior
13+
14+
What should happen?
15+
16+
## Current behavior
17+
18+
What happens instead?
19+
20+
You might also want to check the last ~1k lines of
21+
`/opt/metasploit/apps/pro/engine/config/logs/framework.log` or
22+
`~/.msf4/logs/framework.log` for relevant stack traces
23+
24+
25+
## System stuff
26+
27+
### Metasploit version
28+
29+
Get this with the `version` command in msfconsole (or `git log -1 --pretty=oneline` for a source install).
30+
31+
### I installed Metasploit with:
32+
- [ ] Kali package via apt
33+
- [ ] Omnibus installer (nightly)
34+
- [ ] Commercial/Community installer (from http://www.rapid7.com/products/metasploit/download.jsp)
35+
- [ ] Source install (please specify ruby version)
36+
37+
### OS
38+
39+
What OS are you running Metasploit on?
40+
41+

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
Tell us what this change does. If you're fixing a bug, please mention
3+
the github issue number.
4+
5+
## Verification
6+
7+
List the steps needed to make sure this thing works
8+
9+
- [ ] Start `msfconsole`
10+
- [ ] `use exploit/windows/smb/ms08_067_netapi`
11+
- [ ] ...
12+
- [ ] **Verify** the thing does what it should
13+
- [ ] **Verify** the thing does not do what it should not
14+

‎.gitignore

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
11
.bundle
2+
Gemfile.local
3+
Gemfile.local.lock
24
# Rubymine project directory
35
.idea
46
# Sublime Text project directory (not created by ST by default)
57
.sublime-project
68
# RVM control file, keep this to avoid backdooring Metasploit
79
.rvmrc
10+
# Allow for a local choice of (unsupported / semi-supported) ruby versions
11+
# See PR #4136 for usage, but example usage for rvm:
12+
# rvm --create --versions-conf use 2.1.4@metasploit-framework
13+
# Because rbenv doesn't use .versions.conf, to achieve this same functionality, run:
14+
# rbenv shell 2.1.4
15+
.versions.conf
816
# YARD cache directory
917
.yardoc
1018
# Mac OS X files
1119
.DS_Store
1220
# database config for testing
1321
config/database.yml
22+
# target config file for testing
23+
features/support/targets.yml
1424
# simplecov coverage data
1525
coverage
16-
data/meterpreter/ext_server_pivot.x86.dll
17-
data/meterpreter/ext_server_pivot.x64.dll
1826
doc/
1927
external/source/meterpreter/java/bin
2028
external/source/meterpreter/java/build
@@ -48,6 +56,35 @@ tags
4856
*.opensdf
4957
*.user
5058

59+
# Rails log directory
60+
/log
61+
# Rails tmp directory
62+
/tmp
63+
5164
# ignore release/debug folders for exploits
5265
external/source/exploits/**/Debug
5366
external/source/exploits/**/Release
67+
68+
# Avoid checking in Meterpreter binaries. These are supplied upstream by
69+
# the metasploit-payloads gem.
70+
data/meterpreter/*.dll
71+
data/meterpreter/*.php
72+
data/meterpreter/*.py
73+
data/meterpreter/*.bin
74+
data/meterpreter/*.jar
75+
data/meterpreter/*.lso
76+
data/android
77+
data/java
78+
79+
# Avoid checking in Meterpreter libs that are built from
80+
# private source. If you're interested in this functionality,
81+
# check out Metasploit Pro: http://metasploit.com/download
82+
data/meterpreter/ext_server_pivot.*.dll
83+
84+
# Avoid checking in metakitty, the source for
85+
# https://rapid7.github.io/metasploit-framework. It's an orphan branch.
86+
/metakitty
87+
.vagrant
88+
89+
# local docker compose overrides
90+
docker-compose.local*

0 commit comments

Comments
 (0)