Skip to content

Commit 7e25f9a

Browse files
committed
Death to unicode
Apologies to the authors whose names I am now intentionally misspelling. Maybe in another 10 years, we can guarantee that all terminals and machine parsers are okay with unicode suddenly popping up in strings. Also adds a check in msftidy for stray unicode.
1 parent ed0dbad commit 7e25f9a

File tree

5 files changed

+18
-6
lines changed

5 files changed

+18
-6
lines changed

modules/auxiliary/scanner/http/drupal_views_user_enum.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ module of Drupal, brute-forcing the first 10 usernames from 'a' to 'z'
2323
'Author' =>
2424
[
2525
'Justin Klein Keane', #Original Discovery
26-
'Robin François <rof[at]navixia.com>'
26+
'Robin Francois <rof[at]navixia.com>'
2727
],
2828
'License' => MSF_LICENSE,
2929
'References' =>

modules/exploits/multi/http/op5_license.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def initialize(info = {})
1717
'Name' => 'OP5 license.php Remote Command Execution',
1818
'Description' => %q{
1919
This module exploits an arbitrary root command execution vulnerability in the
20-
OP5 Monitor license.php. Ekelöw has confirmed that OP5 Monitor versions 5.3.5,
20+
OP5 Monitor license.php. Ekelow has confirmed that OP5 Monitor versions 5.3.5,
2121
5.4.0, 5.4.2, 5.5.0, 5.5.1 are vulnerable.
2222
},
2323
'Author' => [ 'Peter Osterberg <j[at]vel.nu>' ],
@@ -105,4 +105,4 @@ def exploit
105105
return
106106
end
107107
end
108-
end
108+
end

modules/exploits/unix/webapp/trixbox_langchoice.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def check
113113
# If it has the target footer, we know its vulnerable
114114
# however skining may mean the reverse is not true
115115
# We've only tested on v2.6.1, so that is all we will guarantee
116-
# Example footer: v2.6.1 ©2008 Fonality
116+
# Example footer: v2.6.1 &copy;2008 Fonality
117117
# if response.body =~ /(v2\.(?:[0-5]\.\d|6\.[0-1]))\s{2}&copy;200[0-8] Fonality/
118118
if response.body =~ /(v2\.6\.1)\s{2}&copy;2008 Fonality/
119119
print_status "Trixbox #{$1} detected!"

modules/exploits/windows/scada/procyon_core_server.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def initialize(info={})
3232
'Version' => '$Revision$',
3333
'Author' =>
3434
[
35-
'Knud Højgaard <keh[at]nsense.dk>', # Initial discovery
35+
'Knud Hojgaard <keh[at]nsense.dk>', # Initial discovery
3636
'mr_me <steventhomasseeley[at]gmail.com>', # Initial discovery & poc/msf
3737
],
3838
'References' =>

tools/msftidy.rb

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Check (recursively) for style compliance violations and other
44
# tree inconsistencies.
55
#
6-
# by jduck
6+
# by jduck and friends
77
#
88

99
##
@@ -82,6 +82,7 @@ def check_single_file(dparts, fparts, f_rel)
8282
spaces = 0
8383
bi = []
8484
ll = []
85+
bc = []
8586
cr = 0
8687
url_ok = true
8788
nbo = 0 # non-bin open
@@ -113,6 +114,9 @@ def check_single_file(dparts, fparts, f_rel)
113114
src_ended = true if ln =~ /^__END__$/
114115
next if src_ended
115116

117+
if ln =~ /[\x00-\x08\x0b\x0c\x0e-\x19\x7f-\xff]/
118+
bc << [ idx, ln.inspect]
119+
end
116120

117121
if (ln.length > LONG_LINE_LENGTH)
118122
ll << [ idx, ln ]
@@ -156,6 +160,14 @@ def check_single_file(dparts, fparts, f_rel)
156160
}
157161
end
158162

163+
if bc.length > 0
164+
puts "%s ... probably has unicode: %u" % [f, bc.length]
165+
bc.each { |ec|
166+
ec[1] = ec[1].inspect
167+
puts ' %8d: %s' % ec
168+
}
169+
end
170+
159171
show_count(f, 'carriage return EOL', cr)
160172
show_missing(f, 'incorrect URL to framework site', url_ok)
161173
show_missing(f, 'writes to stdout', no_stdio)

0 commit comments

Comments
 (0)