Skip to content

Commit a88cc4c

Browse files
committed
remove check
1 parent e92da08 commit a88cc4c

3 files changed

Lines changed: 9 additions & 30 deletions

File tree

Mailman/Cgi/admin.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,7 @@ def main():
107107
if os.environ.get('REQUEST_METHOD') == 'POST':
108108
content_length = int(os.environ.get('CONTENT_LENGTH', 0))
109109
if content_length > 0:
110-
# Limit content length to prevent DoS
111-
if content_length > mm_cfg.MAX_CONTENT_LENGTH:
112-
print('Status: 413 Request Entity Too Large')
113-
doc.AddItem(Header(2, _("Error")))
114-
doc.AddItem(Bold(_('Request too large')))
115-
print(doc.Format())
116-
return
117-
form_data = sys.stdin.buffer.read(content_length).decode('utf-8')
110+
form_data = sys.stdin.read(content_length)
118111
cgidata = urllib.parse.parse_qs(form_data, keep_blank_values=True)
119112
else:
120113
cgidata = {}

Mailman/Cgi/listinfo.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,11 @@ def main():
101101
# See if the user want to see this page in other language
102102
try:
103103
if os.environ.get('REQUEST_METHOD') == 'POST':
104+
# Get the content length
104105
content_length = int(os.environ.get('CONTENT_LENGTH', 0))
105-
if content_length > 0:
106-
# Limit content length to prevent DoS
107-
if content_length > mm_cfg.MAX_CONTENT_LENGTH:
108-
print('Status: 413 Request Entity Too Large')
109-
listinfo_overview(_('Request too large'))
110-
return
111-
form_data = sys.stdin.buffer.read(content_length).decode('utf-8')
112-
cgidata = urllib.parse.parse_qs(form_data, keep_blank_values=True)
113-
else:
114-
cgidata = {}
106+
# Read the form data
107+
form_data = sys.stdin.read(content_length)
108+
cgidata = urllib.parse.parse_qs(form_data, keep_blank_values=True)
115109
else:
116110
query_string = os.environ.get('QUERY_STRING', '')
117111
cgidata = urllib.parse.parse_qs(query_string, keep_blank_values=True)

Mailman/Cgi/subscribe.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -118,19 +118,11 @@ def main():
118118
# for the results. If not, use the list's preferred language.
119119
try:
120120
if os.environ.get('REQUEST_METHOD') == 'POST':
121+
# Get the content length
121122
content_length = int(os.environ.get('CONTENT_LENGTH', 0))
122-
if content_length > 0:
123-
# Limit content length to prevent DoS
124-
if content_length > mm_cfg.MAX_CONTENT_LENGTH:
125-
print('Status: 413 Request Entity Too Large')
126-
doc.AddItem(Header(2, _("Error")))
127-
doc.AddItem(Bold(_('Request too large')))
128-
print(doc.Format())
129-
return
130-
form_data = sys.stdin.buffer.read(content_length).decode('utf-8')
131-
cgidata = urllib.parse.parse_qs(form_data, keep_blank_values=True)
132-
else:
133-
cgidata = {}
123+
# Read the form data
124+
form_data = sys.stdin.read(content_length)
125+
cgidata = urllib.parse.parse_qs(form_data, keep_blank_values=True)
134126
else:
135127
query_string = os.environ.get('QUERY_STRING', '')
136128
cgidata = urllib.parse.parse_qs(query_string, keep_blank_values=True)

0 commit comments

Comments
 (0)