Skip to content

Commit b2cb102

Browse files
errorxyzerrorxyz
authored
Merge branch 'rapid7:master' into manageengine
2 parents 184ed3a + 4af5c54 commit b2cb102

File tree

207 files changed

+11956
-3580
lines changed

Some content is hidden

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

207 files changed

+11956
-3580
lines changed

‎.github/workflows/acceptance.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ on:
3838
- 'lib/msf/core/**'
3939
- 'tools/dev/**'
4040
- 'spec/acceptance/**'
41+
- 'spec/support/acceptance/**'
4142
- 'spec/acceptance_spec_helper.rb'
4243
# Example of running as a cron, to weed out flaky tests
4344
# schedule:

‎.github/workflows/verify.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@ jobs:
7474
exclude:
7575
- { os: ubuntu-latest, ruby: '3.0' }
7676
include:
77-
- os: ubuntu-latest
78-
ruby: '3.1'
79-
test_cmd: 'bundle exec rake rspec-rerun:spec SPEC_OPTS="--tag content" MSF_FEATURE_DATASTORE_FALLBACKS=1'
8077
- os: ubuntu-latest
8178
ruby: '3.1'
8279
test_cmd: 'bundle exec rake rspec-rerun:spec SPEC_OPTS="--tag content" MSF_FEATURE_DEFER_MODULE_LOADS=1'

‎Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
FROM ruby:3.1.4-alpine3.18 AS builder
22
LABEL maintainer="Rapid7"
33

4-
ARG BUNDLER_CONFIG_ARGS="set clean 'true' set no-cache 'true' set system 'true' set without 'development test coverage'"
4+
ARG BUNDLER_CONFIG_ARGS="set no-cache 'true' set system 'true' set without 'development test coverage'"
5+
ARG BUNDLER_FORCE_CLEAN="true"
56
ENV APP_HOME=/usr/src/metasploit-framework
67
ENV TOOLS_HOME=/usr/src/tools
78
ENV BUNDLE_IGNORE_MESSAGES="true"
@@ -33,8 +34,11 @@ RUN apk add --no-cache \
3334
go \
3435
&& echo "gem: --no-document" > /etc/gemrc \
3536
&& gem update --system \
36-
&& bundle config $BUNDLER_ARGS \
37+
&& bundle config $BUNDLER_CONFIG_ARGS \
3738
&& bundle install --jobs=8 \
39+
&& if [ "${BUNDLER_FORCE_CLEAN}" == "true" ]; then \
40+
bundle clean --force; \
41+
fi \
3842
# temp fix for https://github.com/bundler/bundler/issues/6680
3943
&& rm -rf /usr/local/bundle/cache \
4044
# needed so non root users can read content of the bundle

‎Gemfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
metasploit-framework (6.3.56)
4+
metasploit-framework (6.3.58)
55
actionpack (~> 7.0.0)
66
activerecord (~> 7.0.0)
77
activesupport (~> 7.0.0)
@@ -33,7 +33,7 @@ PATH
3333
metasploit-concern
3434
metasploit-credential
3535
metasploit-model
36-
metasploit-payloads (= 2.0.165)
36+
metasploit-payloads (= 2.0.166)
3737
metasploit_data_models
3838
metasploit_payloads-mettle (= 1.0.26)
3939
mqtt
@@ -265,7 +265,7 @@ GEM
265265
activesupport (~> 7.0)
266266
railties (~> 7.0)
267267
zeitwerk
268-
metasploit-credential (6.0.6)
268+
metasploit-credential (6.0.7)
269269
metasploit-concern
270270
metasploit-model
271271
metasploit_data_models (>= 5.0.0)
@@ -279,7 +279,7 @@ GEM
279279
activemodel (~> 7.0)
280280
activesupport (~> 7.0)
281281
railties (~> 7.0)
282-
metasploit-payloads (2.0.165)
282+
metasploit-payloads (2.0.166)
283283
metasploit_data_models (6.0.3)
284284
activerecord (~> 7.0)
285285
activesupport (~> 7.0)
@@ -419,7 +419,7 @@ GEM
419419
metasm
420420
rex-core
421421
rex-text
422-
rex-socket (0.1.55)
422+
rex-socket (0.1.56)
423423
rex-core
424424
rex-sslscan (0.1.10)
425425
rex-core

‎LICENSE_GEMS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ macaddr, 1.7.2, ruby
7979
memory_profiler, 1.0.1, MIT
8080
metasm, 1.0.5, LGPL-2.1
8181
metasploit-concern, 5.0.2, "New BSD"
82-
metasploit-credential, 6.0.6, "New BSD"
83-
metasploit-framework, 6.3.56, "New BSD"
82+
metasploit-credential, 6.0.7, "New BSD"
83+
metasploit-framework, 6.3.58, "New BSD"
8484
metasploit-model, 5.0.2, "New BSD"
85-
metasploit-payloads, 2.0.165, "3-clause (or ""modified"") BSD"
85+
metasploit-payloads, 2.0.166, "3-clause (or ""modified"") BSD"
8686
metasploit_data_models, 6.0.3, "New BSD"
8787
metasploit_payloads-mettle, 1.0.26, "3-clause (or ""modified"") BSD"
8888
method_source, 1.0.0, MIT
@@ -149,7 +149,7 @@ rex-powershell, 0.1.99, "New BSD"
149149
rex-random_identifier, 0.1.11, "New BSD"
150150
rex-registry, 0.1.5, "New BSD"
151151
rex-rop_builder, 0.1.5, "New BSD"
152-
rex-socket, 0.1.55, "New BSD"
152+
rex-socket, 0.1.56, "New BSD"
153153
rex-sslscan, 0.1.10, "New BSD"
154154
rex-struct2, 0.1.4, "New BSD"
155155
rex-text, 0.2.53, "New BSD"

‎data/capture_config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ services:
1616
enabled: yes
1717
- type: IMAP
1818
enabled: yes
19+
- type: LDAP
20+
enabled: yes
1921
- type: MSSQL
2022
enabled: yes
2123
- type: MySQL

‎data/kafka_ui_versions.json

Lines changed: 188 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
1+
[
2+
{
3+
"name": "v0.7.1",
4+
"commit": {
5+
"sha": "56fa824510d8a35b08e3b42bf6625c846e2ed5a0"
6+
}
7+
},
8+
{
9+
"name": "v0.7.0",
10+
"commit": {
11+
"sha": "fdd9ad94c11d44259ef26bf4b2dc9a8bd139f607"
12+
}
13+
},
14+
{
15+
"name": "v0.6.2",
16+
"commit": {
17+
"sha": "b0c367cac7211117e88a55517396764036ac0552"
18+
}
19+
},
20+
{
21+
"name": "v0.6.1",
22+
"commit": {
23+
"sha": "ef0dacb0c36a1a180ef8fda670c82854658aab00"
24+
}
25+
},
26+
{
27+
"name": "v0.6.0",
28+
"commit": {
29+
"sha": "e72f6d6d5dd078df2d270cc48a4087588443f89a"
30+
}
31+
},
32+
{
33+
"name": "v0.5.0",
34+
"commit": {
35+
"sha": "027d9b4653e2f3ea13d4de6a0b2bd568106ffb40"
36+
}
37+
},
38+
{
39+
"name": "v0.4.0",
40+
"commit": {
41+
"sha": "521ba0cb2f63110eb2ed13a7054a4d70238a862a"
42+
}
43+
},
44+
{
45+
"name": "v0.3.3",
46+
"commit": {
47+
"sha": "38c4cf7dd9275294348bab903be9dc12eafe37dd"
48+
}
49+
},
50+
{
51+
"name": "v0.3.2",
52+
"commit": {
53+
"sha": "9d9d31a6694ab1fc12da20ea18fa5a778ce5a631"
54+
}
55+
},
56+
{
57+
"name": "v0.3.1",
58+
"commit": {
59+
"sha": "e75c251013845f1921ea75c24b44fd7164ee398d"
60+
}
61+
},
62+
{
63+
"name": "v0.3.0",
64+
"commit": {
65+
"sha": "9606d7ee5ab3b8056b4a69610ae79b7b473d779d"
66+
}
67+
},
68+
{
69+
"name": "v0.2.1",
70+
"commit": {
71+
"sha": "da29a200cd8ec46da709e0523787479ac6fb274b"
72+
}
73+
},
74+
{
75+
"name": "v0.2.0",
76+
"commit": {
77+
"sha": "2e345f6f6caeb3495f6454bfaa5a10bf50639411"
78+
}
79+
},
80+
{
81+
"name": "v0.1.0",
82+
"commit": {
83+
"sha": "1869a7f0a85ceaa707ea25866da98a3ac5a0667e"
84+
}
85+
},
86+
{
87+
"name": "v0.0.10",
88+
"commit": {
89+
"sha": "f08970c1d8910091a392d26b51db33b5c99a0f81"
90+
}
91+
},
92+
{
93+
"name": "v0.0.9",
94+
"commit": {
95+
"sha": "f98abfb79dc2c437f1b6cb5f534da560c85c5406"
96+
}
97+
},
98+
{
99+
"name": "v0.0.8",
100+
"commit": {
101+
"sha": "222cf2c65189c97877491c7bcc6fc14982ce65d7"
102+
}
103+
},
104+
{
105+
"name": "v0.0.7",
106+
"commit": {
107+
"sha": "2a743a5bf4b27a6cc9cb857bd178c2e724d98821"
108+
}
109+
},
110+
{
111+
"name": "v0.0.6",
112+
"commit": {
113+
"sha": "f6253b6bfaa249236ac1b4f0505f4b7af8f89116"
114+
}
115+
},
116+
{
117+
"name": "v0.0.5",
118+
"commit": {
119+
"sha": "abae56b3d0d2383d0351280213236cd988fd6d28"
120+
}
121+
},
122+
{
123+
"name": "v0.0.4",
124+
"commit": {
125+
"sha": "4190d76f2fefb65cb898f6c648e932b2c1a5fba3"
126+
}
127+
},
128+
{
129+
"name": "v0.0.3",
130+
"commit": {
131+
"sha": "8057dc123f23f6da9752d712edeb5e7e490b648c"
132+
}
133+
},
134+
{
135+
"name": "v0.0.2",
136+
"commit": {
137+
"sha": "f5bb336a75351379dad289b73a85f6ebf8ff5498"
138+
}
139+
},
140+
{
141+
"name": "v0.0.1",
142+
"commit": {
143+
"sha": "ed08f278f95dca46e58e24a13923939d268eedd3"
144+
}
145+
},
146+
{
147+
"name": "charts/kafka-ui-0.7.1",
148+
"commit": {
149+
"sha": "c998e17e8322a867c02ef4cdf577aa33c2d3a81e"
150+
}
151+
},
152+
{
153+
"name": "charts/kafka-ui-0.7.0",
154+
"commit": {
155+
"sha": "78cc4dd981a89b26006fea0984f1305bc663281f"
156+
}
157+
},
158+
{
159+
"name": "charts/kafka-ui-0.6.2",
160+
"commit": {
161+
"sha": "838fb604d569dae18a1a7a85ef28ed2c125df986"
162+
}
163+
},
164+
{
165+
"name": "charts/kafka-ui-0.6.1",
166+
"commit": {
167+
"sha": "4a1e987a1d2a958119ab5c936d4b1d82125e14d9"
168+
}
169+
},
170+
{
171+
"name": "charts/kafka-ui-0.6.0",
172+
"commit": {
173+
"sha": "f2a2574ddc8bbe20776071569935922c3593d5e7"
174+
}
175+
},
176+
{
177+
"name": "charts/kafka-ui-0.5.4",
178+
"commit": {
179+
"sha": "334ba3df99dfc84385faace167f6410c8ce0be91"
180+
}
181+
},
182+
{
183+
"name": "charts/kafka-ui-0.5.3",
184+
"commit": {
185+
"sha": "cbb166026d8c6360836def9bf9c208313023961c"
186+
}
187+
}
188+
]

‎data/templates/src/elf/dll/elf_dll_aarch64_template.s

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ strtab:
8888
db 0
8989
db 0
9090
strtabsz equ $ - strtab
91+
92+
align 16
9193
global _start
9294
_start:
93-

‎data/templates/template_aarch64_linux_dll.bin

14 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)