mirror of
https://github.com/samba-team/samba.git
synced 2025-01-11 05:18:09 +03:00
fccb105e07
Unicode has format control characters that affect the appearance — including the apparent order — of other characters. Some of these, like the bidi controls (for mixing left-to-right scripts with right-to-left scripts) can be used make text that means one thing look very much like it means another thing. The potential for duplicity using these characters has recently been publicised under the name “Trojan Source”, and CVE-2021-42694. A specific example, as it affects the Rust language is CVE-2021-42574. We don't have many format control characters in our code — in fact, just the non-breaking space (\u200b) and the redundant BOM thing (\ufeff), and this test aims to ensure we keep it that way. The test uses a series of allow-lists and deny-lists to check most text files for unknown format control characters. The filtering is fairly conservative but not exhaustive. For example, XML and text files are checked, but UTF-16 files are not. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Ralph Boehme <slow@samba.org>
253 lines
7.4 KiB
Python
253 lines
7.4 KiB
Python
# Unix SMB/CIFS implementation.
|
|
#
|
|
# Copyright (C) Catalyst.Net Ltd. 2021
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
import subprocess
|
|
import os
|
|
import sys
|
|
from collections import Counter
|
|
from samba.colour import c_RED, c_GREEN, c_DARK_YELLOW, switch_colour_off
|
|
import re
|
|
import unicodedata as u
|
|
from samba.tests import TestCase
|
|
|
|
if not sys.stdout.isatty():
|
|
switch_colour_off()
|
|
|
|
|
|
def _find_root():
|
|
try:
|
|
p = subprocess.run(['git', 'rev-parse', '--show-toplevel'],
|
|
stdout=subprocess.PIPE,
|
|
stderr=subprocess.PIPE,
|
|
timeout=10)
|
|
except subprocess.SubprocessError as e:
|
|
print(c_RED(f"Error running git (is this a git tree?): {e}"))
|
|
print("This test is only useful in a git working tree")
|
|
sys.exit(1)
|
|
|
|
root = p.stdout.decode().strip()
|
|
|
|
should_be_roots = (
|
|
os.path.abspath(os.path.join(os.path.dirname(__file__),
|
|
"../../..")),
|
|
os.path.abspath(os.path.join(os.path.dirname(__file__),
|
|
"../../../..")),
|
|
)
|
|
if root not in should_be_roots:
|
|
print(c_RED("It looks like we have found the wrong git tree!"))
|
|
sys.exit(1)
|
|
return root
|
|
|
|
|
|
ROOT = _find_root()
|
|
|
|
|
|
IGNORED_FILES = {
|
|
'examples/validchars/validchr.com',
|
|
'examples/tridge/smb.conf',
|
|
'source3/selftest/ktest-krb5_ccache-2',
|
|
'source3/selftest/ktest-krb5_ccache-3',
|
|
'third_party/pep8/testsuite/latin-1.py',
|
|
}
|
|
|
|
IGNORED_EXTENSIONS = {
|
|
'cer',
|
|
'corrupt',
|
|
'crl',
|
|
'dat',
|
|
'dump',
|
|
'gpg',
|
|
'gz',
|
|
'ico',
|
|
'keytab',
|
|
'ldb',
|
|
'p12',
|
|
'pem',
|
|
'png',
|
|
'SAMBABACKUP',
|
|
'sxd',
|
|
'tdb',
|
|
'tif',
|
|
'reg',
|
|
}
|
|
|
|
|
|
# This list is by no means exhaustive -- these are just the format
|
|
# characters we actually use.
|
|
SAFE_FORMAT_CHARS = {
|
|
'\u200b',
|
|
'\ufeff'
|
|
}
|
|
|
|
|
|
def get_git_files():
|
|
try:
|
|
p = subprocess.run(['git',
|
|
'-C', ROOT,
|
|
'ls-files',
|
|
'-z'],
|
|
stdout=subprocess.PIPE,
|
|
stderr=subprocess.PIPE,
|
|
timeout=10)
|
|
except subprocess.SubprocessError as e:
|
|
print(c_RED(f"Error running git (is this a git tree?): {e}"))
|
|
print("This test is only useful in a git working tree")
|
|
return []
|
|
|
|
filenames = p.stdout.split(b'\x00')
|
|
return [x.decode() for x in filenames[:-1]]
|
|
|
|
|
|
def iter_source_files():
|
|
filenames = get_git_files()
|
|
|
|
for name in filenames:
|
|
if name in IGNORED_FILES:
|
|
print(c_DARK_YELLOW(f"ignoring {name}"))
|
|
continue
|
|
|
|
if '.' in name:
|
|
ext = name.rsplit('.', 1)[1]
|
|
if ext in IGNORED_EXTENSIONS:
|
|
print(c_DARK_YELLOW(f"ignoring {name}"))
|
|
continue
|
|
|
|
yield name
|
|
|
|
|
|
def is_latin1_file(name):
|
|
for pattern in (
|
|
r'^source3/modules/vfs_acl_common.h$',
|
|
r'^source4/setup/ad-schema/\w+.ldf$',
|
|
r'^source4/setup/display-specifiers/D[\w-]+.txt$',
|
|
r'^testprogs/blackbox/test_samba-tool_ntacl.sh$',
|
|
r'^third_party/pep8/testsuite/latin-1.py$',
|
|
r'^source4/auth/gensec/gensec_krb5_heimdal.c$',
|
|
r'^source4/heimdal/HEIMDAL-LICENCE.txt$',
|
|
r'^source4/heimdal/lib/asn1/asn1-template.h$',
|
|
r'^source4/heimdal/lib/asn1/gen_template.c$',
|
|
r'^source4/heimdal/lib/hdb/hdb-keytab.c$',
|
|
r'^lib/replace/timegm.c$',
|
|
):
|
|
if re.match(pattern, name):
|
|
return True
|
|
return False
|
|
|
|
|
|
def is_bad_latin1_file(fullname):
|
|
# In practice, the few latin-1 files we have have single non-ASCII
|
|
# byte islands in a sea of ASCII. The utf-8 sequences we are
|
|
# concerned about involve sequences of 3 high bytes. We can say a
|
|
# file is safe latin-1 if it has only individual high bytes.
|
|
with open(fullname, 'rb') as f:
|
|
b = f.read()
|
|
in_seq = False
|
|
for c in b:
|
|
if c > 0x7f:
|
|
if in_seq:
|
|
return True
|
|
in_seq = True
|
|
else:
|
|
in_seq = False
|
|
return False
|
|
|
|
|
|
def is_bad_char(c):
|
|
if u.category(c) != 'Cf':
|
|
return False
|
|
if c in SAFE_FORMAT_CHARS:
|
|
return False
|
|
return True
|
|
|
|
|
|
class CharacterTests(TestCase):
|
|
def test_no_unexpected_format_chars(self):
|
|
"""This test tries to ensure that no source file has unicode control
|
|
characters that can change the apparent order of other
|
|
characters. These characters could make code appear to have
|
|
different semantic meaning it really does.
|
|
|
|
This issue is sometimes called "Trojan Source", "CVE-2021-42574",
|
|
or "CVE-2021-42694".
|
|
"""
|
|
for name in iter_source_files():
|
|
fullname = os.path.join(ROOT, name)
|
|
try:
|
|
with open(fullname) as f:
|
|
s = f.read()
|
|
except UnicodeDecodeError as e:
|
|
# probably a latin-1 encoding, which we tolerate in a few
|
|
# files for historical reasons, though we check that there
|
|
# are not long sequences of high bytes.
|
|
if is_latin1_file(name):
|
|
if is_bad_latin1_file(fullname):
|
|
self.fail(f"latin-1 file {name} has long sequences "
|
|
"of high bytes")
|
|
else:
|
|
self.fail(f"could not decode {name}: {e}")
|
|
|
|
for c in set(s):
|
|
if is_bad_char(c):
|
|
self.fail(f"{name} has potentially bad format characters!")
|
|
|
|
|
|
def check_file_text():
|
|
"""If called directly as a script, count the found characters."""
|
|
counts = Counter()
|
|
for name in iter_source_files():
|
|
fullname = os.path.join(ROOT, name)
|
|
try:
|
|
with open(fullname) as f:
|
|
s = f.read()
|
|
except UnicodeDecodeError as e:
|
|
if is_latin1_file(name):
|
|
if is_bad_latin1_file(fullname):
|
|
print(c_RED(f"latin-1 file {name} has long sequences "
|
|
"of high bytes"))
|
|
else:
|
|
print(c_GREEN(f"latin-1 file {name} is fine"))
|
|
else:
|
|
print(c_RED(f"can't read {name}: {e}"))
|
|
|
|
counts.update(s)
|
|
chars = set(s)
|
|
for c in chars:
|
|
if u.category(c) == 'Cf':
|
|
print(c_GREEN(f"{name} has {u.name(c)}"))
|
|
|
|
print(len(counts))
|
|
controls = []
|
|
formats = []
|
|
others = []
|
|
for x in counts:
|
|
c = u.category(x)
|
|
if c == 'Cc':
|
|
controls.append(x)
|
|
elif c == 'Cf':
|
|
formats.append(x)
|
|
elif c[0] == 'C':
|
|
others.append(x)
|
|
|
|
print("normal control characters {controls}")
|
|
print("format characters {formats}")
|
|
print("other control characters {others}")
|
|
|
|
|
|
if __name__ == '__main__':
|
|
check_file_text()
|