dc14308700
* refactor: Update parsers/base.py for Python3 * style: Black * refactor: Remove mime type check from FileParser * refactor: Validate that submission is UTF-8 The mime check distinguished us-ascii from UTF-8, but as far as I can tell the code relying on it treated both as equally valid. * feat: Clear error when file is not valid XML * chore: Remove unused import * test: Update tests to match changes * fix: Count bytes starting from 1 * test: Add tests of FileParser validations * fix: Fix / simplify regexp * test: Test error caused by bad XML submission --------- Co-authored-by: Robert Sparks <rjsparks@nostrum.com>
59 lines
2.4 KiB
Python
59 lines
2.4 KiB
Python
# Copyright The IETF Trust 2011-2020, All Rights Reserved
|
|
|
|
|
|
import re
|
|
|
|
import debug # pyflakes:ignore
|
|
|
|
from ietf.submit.parsers.base import FileParser
|
|
|
|
|
|
class PlainParser(FileParser):
|
|
ext = 'txt'
|
|
|
|
def __init__(self, fd):
|
|
super(PlainParser, self).__init__(fd)
|
|
|
|
# If some error is found after this method invocation
|
|
# no other file parsing is recommended
|
|
def critical_parse(self):
|
|
super(PlainParser, self).critical_parse()
|
|
self.parse_name()
|
|
return self.parsed_info
|
|
|
|
def parse_name(self):
|
|
self.fd.file.seek(0)
|
|
draftre = re.compile(r'(draft-\S+)')
|
|
revisionre = re.compile(r'.*-(\d+)$')
|
|
limit = 80
|
|
while limit:
|
|
limit -= 1
|
|
try:
|
|
line = self.fd.readline().decode(self.encoding)
|
|
except UnicodeDecodeError:
|
|
return
|
|
match = draftre.search(line)
|
|
if not match:
|
|
continue
|
|
name = match.group(1)
|
|
name = re.sub(r'^[^\w]+', '', name)
|
|
name = re.sub(r'[^\w]+$', '', name)
|
|
name = re.sub(r'\.txt$', '', name)
|
|
extra_chars = re.sub(r'[0-9a-z\-]', '', name)
|
|
if extra_chars:
|
|
if len(extra_chars) == 1:
|
|
self.parsed_info.add_error(('The document name on the first page, "%s", contains a disallowed character with byte code: %s ' % (name, ord(extra_chars[0]))) +
|
|
'(see https://www.ietf.org/id-info/guidelines.html#naming for details).')
|
|
else:
|
|
self.parsed_info.add_error(('The document name on the first page, "%s", contains disallowed characters with byte codes: %s ' % (name, (', '.join([ str(ord(c)) for c in extra_chars] )))) +
|
|
'(see https://www.ietf.org/id-info/guidelines.html#naming for details).')
|
|
match_revision = revisionre.match(name)
|
|
if match_revision:
|
|
self.parsed_info.metadata.rev = match_revision.group(1)
|
|
else:
|
|
self.parsed_info.add_error('The name found on the first page of the document does not contain a revision: "%s"' % (name,))
|
|
name = re.sub(r'-\d+$', '', name)
|
|
self.parsed_info.metadata.name = name
|
|
return
|
|
self.parsed_info.add_error('The first page of the document does not contain a legitimate name that starts with draft-*')
|