Skip to content

Commit ec97d32

Browse files
author
Pedro Ribeiro
authored
Merge pull request #38 from rapid7/master
sdsd
2 parents bc9c96e + f9e4fd5 commit ec97d32

File tree

175 files changed

+9401
-3252
lines changed

Some content is hidden

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

175 files changed

+9401
-3252
lines changed

Gemfile.lock

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
metasploit-framework (4.13.18)
4+
metasploit-framework (4.14.1)
55
actionpack (~> 4.2.6)
66
activerecord (~> 4.2.6)
77
activesupport (~> 4.2.6)
@@ -14,18 +14,19 @@ PATH
1414
metasploit-concern
1515
metasploit-credential
1616
metasploit-model
17-
metasploit-payloads (= 1.2.11)
17+
metasploit-payloads (= 1.2.14)
1818
metasploit_data_models
1919
metasploit_payloads-mettle (= 0.1.7)
2020
msgpack
2121
nessus_rest
2222
net-ssh
2323
network_interface
24+
nexpose
2425
nokogiri
2526
octokit
2627
openssl-ccm
2728
openvas-omp
28-
packetfu
29+
packetfu (= 1.1.13.pre)
2930
patch_finder
3031
pcaprub
3132
pg
@@ -63,29 +64,28 @@ PATH
6364
GEM
6465
remote: https://rubygems.org/
6566
specs:
66-
actionpack (4.2.7.1)
67-
actionview (= 4.2.7.1)
68-
activesupport (= 4.2.7.1)
67+
actionpack (4.2.8)
68+
actionview (= 4.2.8)
69+
activesupport (= 4.2.8)
6970
rack (~> 1.6)
7071
rack-test (~> 0.6.2)
7172
rails-dom-testing (~> 1.0, >= 1.0.5)
7273
rails-html-sanitizer (~> 1.0, >= 1.0.2)
73-
actionview (4.2.7.1)
74-
activesupport (= 4.2.7.1)
74+
actionview (4.2.8)
75+
activesupport (= 4.2.8)
7576
builder (~> 3.1)
7677
erubis (~> 2.7.0)
7778
rails-dom-testing (~> 1.0, >= 1.0.5)
78-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
79-
activemodel (4.2.7.1)
80-
activesupport (= 4.2.7.1)
79+
rails-html-sanitizer (~> 1.0, >= 1.0.3)
80+
activemodel (4.2.8)
81+
activesupport (= 4.2.8)
8182
builder (~> 3.1)
82-
activerecord (4.2.7.1)
83-
activemodel (= 4.2.7.1)
84-
activesupport (= 4.2.7.1)
83+
activerecord (4.2.8)
84+
activemodel (= 4.2.8)
85+
activesupport (= 4.2.8)
8586
arel (~> 6.0)
86-
activesupport (4.2.7.1)
87+
activesupport (4.2.8)
8788
i18n (~> 0.7)
88-
json (~> 1.7, >= 1.7.7)
8989
minitest (~> 5.1)
9090
thread_safe (~> 0.3, >= 0.3.4)
9191
tzinfo (~> 1.1)
@@ -104,7 +104,7 @@ GEM
104104
bcrypt (3.1.11)
105105
bit-struct (0.15.0)
106106
builder (3.2.3)
107-
capybara (2.12.0)
107+
capybara (2.12.1)
108108
addressable
109109
mime-types (>= 1.16)
110110
nokogiri (>= 1.3.3)
@@ -114,7 +114,7 @@ GEM
114114
childprocess (0.5.9)
115115
ffi (~> 1.0, >= 1.0.11)
116116
coderay (1.1.1)
117-
contracts (0.14.0)
117+
contracts (0.15.0)
118118
cucumber (2.4.0)
119119
builder (>= 2.1.2)
120120
cucumber-core (~> 1.5.0)
@@ -146,10 +146,10 @@ GEM
146146
filesize (0.1.1)
147147
fivemat (1.3.2)
148148
gherkin (4.0.0)
149-
i18n (0.8.0)
149+
i18n (0.8.1)
150150
jsobfu (0.4.2)
151151
rkelly-remix
152-
json (1.8.6)
152+
json (2.0.3)
153153
loofah (2.0.3)
154154
nokogiri (>= 1.5.9)
155155
metasm (1.0.2)
@@ -169,7 +169,7 @@ GEM
169169
activemodel (~> 4.2.6)
170170
activesupport (~> 4.2.6)
171171
railties (~> 4.2.6)
172-
metasploit-payloads (1.2.11)
172+
metasploit-payloads (1.2.14)
173173
metasploit_data_models (2.0.14)
174174
activerecord (~> 4.2.6)
175175
activesupport (~> 4.2.6)
@@ -192,17 +192,17 @@ GEM
192192
multi_test (0.1.2)
193193
multipart-post (2.0.0)
194194
nessus_rest (0.1.6)
195-
net-ssh (4.0.1)
195+
net-ssh (4.1.0)
196196
network_interface (0.0.1)
197+
nexpose (5.3.0)
197198
nokogiri (1.7.0.1)
198199
mini_portile2 (~> 2.1.0)
199200
octokit (4.6.2)
200201
sawyer (~> 0.8.0, >= 0.5.3)
201202
openssl-ccm (1.2.1)
202203
openvas-omp (0.0.4)
203-
packetfu (1.1.11)
204-
network_interface (~> 0.0)
205-
pcaprub (~> 0.12)
204+
packetfu (1.1.13.pre)
205+
pcaprub
206206
patch_finder (1.0.2)
207207
pcaprub (0.12.4)
208208
pg (0.19.0)
@@ -227,13 +227,13 @@ GEM
227227
rails-deprecated_sanitizer (>= 1.0.1)
228228
rails-html-sanitizer (1.0.3)
229229
loofah (~> 2.0)
230-
railties (4.2.7.1)
231-
actionpack (= 4.2.7.1)
232-
activesupport (= 4.2.7.1)
230+
railties (4.2.8)
231+
actionpack (= 4.2.8)
232+
activesupport (= 4.2.8)
233233
rake (>= 0.8.7)
234234
thor (>= 0.18.1, < 2.0)
235235
rake (12.0.0)
236-
rb-readline (0.5.3)
236+
rb-readline (0.5.4)
237237
recog (2.1.4)
238238
nokogiri
239239
redcarpet (3.4.0)
@@ -245,12 +245,12 @@ GEM
245245
rex-core
246246
rex-struct2
247247
rex-text
248-
rex-core (0.1.6)
248+
rex-core (0.1.7)
249249
rex-encoder (0.1.2)
250250
metasm
251251
rex-arch
252252
rex-text
253-
rex-exploitation (0.1.10)
253+
rex-exploitation (0.1.11)
254254
jsobfu
255255
metasm
256256
rex-arch
@@ -302,7 +302,7 @@ GEM
302302
rspec-support (~> 3.5.0)
303303
rspec-support (3.5.0)
304304
rubyntlm (0.6.1)
305-
rubyzip (1.2.0)
305+
rubyzip (1.2.1)
306306
sawyer (0.8.1)
307307
addressable (>= 2.3.5, < 2.6)
308308
faraday (~> 0.8, < 1.0)
@@ -317,7 +317,7 @@ GEM
317317
sqlite3 (1.3.13)
318318
sshkey (1.9.0)
319319
thor (0.19.4)
320-
thread_safe (0.3.5)
320+
thread_safe (0.3.6)
321321
timecop (0.8.1)
322322
tzinfo (1.2.2)
323323
thread_safe (~> 0.1)
@@ -348,4 +348,4 @@ DEPENDENCIES
348348
yard
349349

350350
BUNDLED WITH
351-
1.14.3
351+
1.14.5
5 KB
Binary file not shown.
5 KB
Binary file not shown.
5 KB
Binary file not shown.
5 KB
Binary file not shown.
5 KB
Binary file not shown.
5 KB
Binary file not shown.
5 KB
Binary file not shown.
5 KB
Binary file not shown.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="bin" ContentType="application/vnd.ms-office.vbaProject"/><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="xml" ContentType="application/xml"/><Override PartName="/word/document.xml" ContentType="application/vnd.ms-word.document.macroEnabled.main+xml"/><Override PartName="/word/vbaData.xml" ContentType="application/vnd.ms-word.vbaData+xml"/><Override PartName="/word/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"/><Override PartName="/word/settings.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml"/><Override PartName="/word/webSettings.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml"/><Override PartName="/word/fontTable.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml"/><Override PartName="/word/theme/theme1.xml" ContentType="application/vnd.openxmlformats-officedocument.theme+xml"/><Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/><Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/></Types>

0 commit comments

Comments
 (0)