Skip to content

Commit cc59cd8

Browse files
committed
Remove non-ascii chars
1 parent 6beb47c commit cc59cd8

8 files changed

Lines changed: 15 additions & 15 deletions

File tree

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ PATH
6161
metasploit-concern
6262
metasploit-credential (>= 6.0.21)
6363
metasploit-model
64-
metasploit-payloads (= 2.0.246.pre.2)
64+
metasploit-payloads (= 2.0.246.pre.3)
6565
metasploit_data_models (>= 6.0.15)
6666
metasploit_payloads-mettle (= 1.0.48.pre.1)
6767
mqtt
@@ -369,7 +369,7 @@ GEM
369369
drb
370370
mutex_m
371371
railties (>= 7.0, < 8.1)
372-
metasploit-payloads (2.0.246.pre.2)
372+
metasploit-payloads (2.0.246.pre.3)
373373
metasploit_data_models (6.0.18)
374374
activerecord (>= 7.0, < 8.1)
375375
activesupport (>= 7.0, < 8.1)

lib/msf/base/sessions/mettle_config.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def generate_config(opts = {})
135135
# Mettle reserves a fixed 8 KB slot in the binary for the config
136136
# block. Catch the overflow here with a useful message instead of
137137
# letting the gem's `to_binary` raise a generic "config block too
138-
# large" baked-in EXTENSIONS= is the usual culprit.
138+
# large" -- baked-in EXTENSIONS= is the usual culprit.
139139
if opts[:config_block].length > MetasploitPayloads::Mettle::CONFIG_BLOCK_MAX
140140
raise ArgumentError, "Mettle config block (#{opts[:config_block].length} bytes) exceeds the #{MetasploitPayloads::Mettle::CONFIG_BLOCK_MAX}-byte embedded slot. " \
141141
"Drop EXTENSIONS= and `load <ext>` once the session is up."

lib/msf/core/handler/reverse_http.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -287,14 +287,14 @@ def setup_handler
287287
#
288288
# * query parameter (profile: `parameter "name";`)
289289
# * request header (profile: `header "name";`)
290-
# * trailing path seg (default no placement directive)
290+
# * trailing path seg (default -- no placement directive)
291291
#
292292
# For the path case, the URI looks like `<base>/<id>`, where `<base>`
293293
# is the profile's per-verb `set uri` if defined, otherwise `LURI`
294294
# (each is registered as a separate mount point in `all_uris`).
295295
# Taking the last `/`-separated segment skips the base regardless of
296296
# which one was used. Profile authors should not put `/` in
297-
# prepend/append directives that would split the id across segments
297+
# prepend/append directives -- that would split the id across segments
298298
# and defeat this scheme.
299299
#
300300
# If the profile applied `prepend` / `append` / `base64` / `base64url`
@@ -325,7 +325,7 @@ def find_resource_id(cli, request)
325325

326326
# Reverse the prepend/append + base64 transforms the profile applied
327327
# to the id on the payload side. If a declared wrapper is missing from
328-
# the candidate, leave the candidate alone this is not a payload
328+
# the candidate, leave the candidate alone -- this is not a payload
329329
# request, and `process_uri_resource` will return nil for it.
330330
def unwrap_profile_uuid(candidate, placement)
331331
prefix = placement.prepend.map{|d| d.args[0]}.join('')
@@ -357,8 +357,8 @@ def add_response_headers(req, resp)
357357

358358
# Return the live meterpreter session whose passive dispatcher is
359359
# registered for this bare conn_id, or nil if none matches. Used so
360-
# MC2 traffic which Rex routes to on_request because the profile
361-
# URI prefix outranks the session's /<conn_id> mount can still be
360+
# MC2 traffic -- which Rex routes to on_request because the profile
361+
# URI prefix outranks the session's /<conn_id> mount -- can still be
362362
# delivered to the right session instead of triggering a fresh
363363
# "orphaned attach" on every poll.
364364
def session_for_conn_id(bare_conn_id)

lib/msf/core/payload/java/meterpreter_loader.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module Payload::Java::MeterpreterLoader
1818
include Msf::Sessions::MeterpreterOptions::Java
1919

2020
# Resource path the stageless StagelessMain bootstrap reads. Deliberately
21-
# innocuous no meterpreter/metasploit markers in the name.
21+
# innocuous -- no meterpreter/metasploit markers in the name.
2222
STAGELESS_CONFIG_RESOURCE = 'META-INF/data'.freeze
2323
STAGELESS_MAIN_CLASS = 'com.metasploit.meterpreter.StagelessMain'.freeze
2424

@@ -44,7 +44,7 @@ def stage_payload(opts={})
4444
#
4545
# When opts[:stageless] is set, returns a self-contained jar with the
4646
# TLV config embedded as a resource and Main-Class pinned to
47-
# StagelessMain ready to run under `java -jar`.
47+
# StagelessMain -- ready to run under `java -jar`.
4848
#
4949
def stage_meterpreter(opts={})
5050
met = MetasploitPayloads.read('meterpreter', 'meterpreter.jar')

lib/msf/core/payload/malleable_c2.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def tokenize(text)
115115
# blank line
116116
next
117117
elsif scanner.scan(/#[^\n]*/)
118-
# comment anchorless so it matches indented comments too
118+
# comment -- anchorless so it matches indented comments too
119119
# (the prior `\s+` rule has already eaten any leading
120120
# whitespace by the time we get here)
121121
next
@@ -450,7 +450,7 @@ def parse(file)
450450
profile.sets << parse_set
451451
elsif block_ahead?
452452
# Any `name { ... }` is a block. We keep the ones we understand
453-
# (http-get/http-post/etc.) and harmlessly retain the rest
453+
# (http-get/http-post/etc.) and harmlessly retain the rest --
454454
# unsupported CS blocks like dns-beacon/process-inject/post-ex
455455
# are parsed for structure and simply ignored by to_tlv.
456456
profile.sections << parse_section

lib/rex/proto/http/request.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ def to_s
219219

220220
#
221221
# Returns a hijacked version of the body that shoves the request's query string in as a
222-
# replacement in cases where there is no body. YOLO! ¯\_(ツ)_/¯
222+
# replacement in cases where there is no body. YOLO! (shrug)
223223
#
224224
def body
225225
str = super || ''

lib/rex/proto/http/server.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ def dispatch_request(cli, request)
294294
p = resources[request.resource]
295295
# This branch is reached when resource_id is nil (e.g. fetch-payload
296296
# adapters have no find_resource_id), so the matched resource is the
297-
# request resource itself not resource_id, which would nil-deref.
297+
# request resource itself -- not resource_id, which would nil-deref.
298298
len = request.resource.length
299299
root = request.resource
300300
else

metasploit-framework.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Gem::Specification.new do |spec|
7474
# are needed when there's no database
7575
spec.add_runtime_dependency 'metasploit-model'
7676
# Needed for Meterpreter
77-
spec.add_runtime_dependency 'metasploit-payloads', '2.0.246.pre.2'
77+
spec.add_runtime_dependency 'metasploit-payloads', '2.0.246.pre.3'
7878
# Needed for the next-generation POSIX Meterpreter
7979
spec.add_runtime_dependency 'metasploit_payloads-mettle', '1.0.48.pre.1'
8080
# Needed by msfgui and other rpc components

0 commit comments

Comments
 (0)