external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-03 00:07:05 +00:00
Code Issues Releases Wiki Activity

Fix invalid escape sequences

Browse Source
This commit is contained in:
downtownallday 2024-03-05 08:56:39 -05:00
parent 38ad0d3cd6
commit da2d88e4f4
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
management/ssl_certificates.py
View File

@ -168,7 +168,7 @@ def get_domain_ssl_files(domain, ssl_certificates, env, allow_missing_cert=False
# it is hard-coded in some service configuration files. # it is hard-coded in some service configuration files.
return system_certificate return system_certificate
wildcard_domain = re.sub("^[^\.]+", "*", domain) wildcard_domain = re.sub("^[^\\.]+", "*", domain)
if domain in ssl_certificates: if domain in ssl_certificates:
return ssl_certificates[domain] return ssl_certificates[domain]
elif wildcard_domain in ssl_certificates: elif wildcard_domain in ssl_certificates:
@ -540,7 +540,7 @@ def check_certificate(domain, ssl_certificate, ssl_private_key, warn_if_expiring
# Check that the domain appears among the acceptable names, or a wildcard # Check that the domain appears among the acceptable names, or a wildcard
# form of the domain name (which is a stricter check than the specs but # form of the domain name (which is a stricter check than the specs but
# should work in normal cases). # should work in normal cases).
wildcard_domain = re.sub("^[^\.]+", "*", domain) wildcard_domain = re.sub("^[^\\.]+", "*", domain)
if domain not in certificate_names and wildcard_domain not in certificate_names: if domain not in certificate_names and wildcard_domain not in certificate_names:
return ("The certificate is for the wrong domain name. It is for %s." return ("The certificate is for the wrong domain name. It is for %s."
% ", ".join(sorted(certificate_names)), None) % ", ".join(sorted(certificate_names)), None)

20
tools/editconf.py
View File

@ -33,7 +33,7 @@
# lines while the lines start with whitespace, e.g.: # lines while the lines start with whitespace, e.g.:
# #
# NAME VAL # NAME VAL
# UE # UE
import sys, re import sys, re
@ -147,9 +147,9 @@ while len(input_lines) > 0:
name, val = (settings[i].name, settings[i].val) name, val = (settings[i].name, settings[i].val)
flags = re.S | (re.I if case_insensitive_names else 0) flags = re.S | (re.I if case_insensitive_names else 0)
m = re.match( m = re.match(
"(\s*)" "(\\s*)"
+ "(" + re.escape(comment_char) + "\s*)?" + "(" + re.escape(comment_char) + "\\s*)?"
+ re.escape(name) + delimiter_re + "(.*?)\s*$", + re.escape(name) + delimiter_re + "(.*?)\\s*$",
line, flags) line, flags)
if not m: continue if not m: continue
indent, is_comment, existing_val = m.groups() indent, is_comment, existing_val = m.groups()
@ -170,7 +170,7 @@ while len(input_lines) > 0:
buf += line buf += line
found.add(i) found.add(i)
break break
# comment-out the existing line (also comment any folded lines) # comment-out the existing line (also comment any folded lines)
if is_comment is None: if is_comment is None:
if val or not erase_setting or erase_setting_via_comment: if val or not erase_setting or erase_setting_via_comment:
@ -178,23 +178,23 @@ while len(input_lines) > 0:
else: else:
# the line is already commented, pass it through # the line is already commented, pass it through
buf += line buf += line
# if this option already is set don't add the setting again, # if this option already is set don't add the setting again,
# or if we're clearing the setting with -e, don't add it # or if we're clearing the setting with -e, don't add it
if (i in found) or (not val and erase_setting): if (i in found) or (not val and erase_setting):
break break
# add the new setting # add the new setting
buf += indent + name + delimiter + val + "\n" buf += indent + name + delimiter + val + "\n"
# note that we've applied this option # note that we've applied this option
found.add(i) found.add(i)
break break
else: else:
# If did not match any setting names, pass this line through. # If did not match any setting names, pass this line through.
buf += line buf += line
# Put any settings we didn't see at the end of the file, # Put any settings we didn't see at the end of the file,
# except settings being cleared. # except settings being cleared.
if not ini_section or cur_section == ini_section.lower(): if not ini_section or cur_section == ini_section.lower():