altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

DoS Tresholds. Retrieve WG in a previous stage. Fixes #592

Browse source 
- Legacy-Id: 2837
This commit is contained in:
Emilio A. Sánchez López 2011-02-09 20:12:12 +00:00
parent 6aa16f2762
commit 63d78edc0d
6 changed files with 109 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ietf/settings.py
View file

@ -197,6 +197,15 @@ STAGING_PATH = '/a/www/www6s/staging/'
IDNITS_PATH = '/a/www/ietf-datatracker/release/idnits'
MAX_PLAIN_DRAFT_SIZE = 6291456 # Max size of the txt draft in bytes
# DOS THRESHOLDS PER DAY (Sizes are in MB)
MAX_SAME_DRAFT_NAME = 20
MAX_SAME_DRAFT_NAME_SIZE = 50
MAX_SAME_SUBMITTER = 50
MAX_SAME_SUBMITTER_SIZE = 150
MAX_SAME_WG_DRAFT = 150
MAX_SAME_WG_DRAFT_SIZE = 450
MAX_DAILY_SUBMISSION = 1000
MAX_DAILY_SUBMISSION_SIZE = 2000
# End of ID Submission Tool settings
# Put SECRET_KEY in here, or any other sensitive or site-specific

84
ietf/submit/forms.py
View file

@ -5,8 +5,9 @@ import datetime
from django import forms
from django.conf import settings
from django.template.loader import render_to_string
from django.utils.html import mark_safe
from ietf.idtracker.models import InternetDraft
from ietf.idtracker.models import InternetDraft, IETFWG
from ietf.proceedings.models import Meeting
from ietf.submit.models import IdSubmissionDetail, TempIdAuthors
from ietf.submit.parsers.pdf_parser import PDFParser
@ -32,16 +33,19 @@ class UploadForm(forms.Form):
css = {'all': ("/css/liaisons.css", )}
def __init__(self, *args, **kwargs):
self.request=kwargs.pop('request', None)
self.remote_ip=self.request.META.get('REMOTE_ADDR', None)
super(UploadForm, self).__init__(*args, **kwargs)
self.in_first_cut_off = False
self.idnits_message = None
self.shutdown = False
self.draft = None
self.filesize = None
self.group = None
self.read_dates()
def read_dates(self):
now = datetime.datetime.now()
now = datetime.datetime.utcnow()
first_cut_off = Meeting.get_first_cut_off()
second_cut_off = Meeting.get_second_cut_off()
ietf_monday = Meeting.get_ietf_monday()
@ -120,6 +124,51 @@ class UploadForm(forms.Form):
def clean(self):
if self.shutdown:
raise forms.ValidationError('The tool is shut down')
self.check_paths()
if self.cleaned_data.get('txt', None):
self.get_draft()
self.group=self.get_working_group()
self.check_previous_submission()
self.check_tresholds()
return super(UploadForm, self).clean()
def check_tresholds(self):
filename = self.draft.filename
revision = self.draft.revision
remote_ip = self.remote_ip
today = datetime.date.today()
# Same draft by name
same_name = IdSubmissionDetail.objects.filter(filename=filename, revision=revision, submission_date=today)
if same_name.count() > settings.MAX_SAME_DRAFT_NAME:
raise forms.ValidationError('A same I-D cannot be submitted more than %s times a day' % settings.MAX_SAME_DRAFT_NAME)
if sum([i.filesize for i in same_name]) > (settings.MAX_SAME_DRAFT_NAME_SIZE * 1048576):
raise forms.ValidationError('A same I-D submission cannot exceed more than %s MByte a day' % settings.MAX_SAME_DRAFT_NAME_SIZE)
# Total from same ip
same_ip = IdSubmissionDetail.objects.filter(remote_ip=remote_ip, submission_date=today)
if same_ip.count() > settings.MAX_SAME_SUBMITTER:
raise forms.ValidationError('The same submitter cannot submit more than %s I-Ds a day' % settings.MAX_SAME_SUBMITTER)
if sum([i.filesize for i in same_ip]) > (settings.MAX_SAME_SUBMITTER_SIZE * 1048576):
raise forms.ValidationError('The same submitter cannot exceed more than %s MByte a day' % settings.MAX_SAME_SUBMITTER_SIZE)
# Total in same group
if self.group:
same_group = IdSubmissionDetail.objects.filter(group_acronym=self.group, submission_date=today)
if same_group.count() > settings.MAX_SAME_WG_DRAFT:
raise forms.ValidationError('A same working group I-Ds cannot be submitted more than %s times a day' % settings.MAX_SAME_WG_DRAFT)
if sum([i.filesize for i in same_group]) > (settings.MAX_SAME_WG_DRAFT_SIZE * 1048576):
raise forms.ValidationError('Total size of same working group I-Ds cannot exceed %s MByte a day' % settings.MAX_SAME_WG_DRAFT_SIZE)
# Total drafts for today
total_today = IdSubmissionDetail.objects.filter(submission_date=today)
if total_today.count() > settings.MAX_DAILY_SUBMISSION:
raise forms.ValidationError('The total number of today\'s submission has reached the maximum number of submission per day')
if sum([i.filesize for i in total_today]) > (settings.MAX_DAILY_SUBMISSION_SIZE * 1048576):
raise forms.ValidationError('The total size of today\'s submission has reached the maximum size of submission per day')
def check_paths(self):
self.staging_path = getattr(settings, 'STAGING_PATH', None)
self.idnits = getattr(settings, 'IDNITS_PATH', None)
if not self.staging_path:
@ -130,10 +179,6 @@ class UploadForm(forms.Form):
raise forms.ValidationError('IDNITS_PATH not defined on settings.py')
if not os.path.exists(self.idnits):
raise forms.ValidationError('IDNITS_PATH defined on settings.py does not exist')
if self.cleaned_data.get('txt', None):
self.get_draft()
self.check_previous_submission()
return super(UploadForm, self).clean()
def check_previous_submission(self):
filename = self.draft.filename
@ -141,7 +186,7 @@ class UploadForm(forms.Form):
existing = IdSubmissionDetail.objects.filter(filename=filename, revision=revision,
status__pk__gte=0, status__pk__lt=100)
if existing:
raise forms.ValidationError('Duplicate Internet-Draft submission is currently in process.')
raise forms.ValidationError('Duplicate Internet-Draft submission is currently in process')
def get_draft(self):
if self.draft:
@ -170,6 +215,29 @@ class UploadForm(forms.Form):
p = subprocess.Popen([self.idnits, '--submitcheck', '--nitcount', filepath], stdout=subprocess.PIPE)
self.idnits_message = p.stdout.read()
def get_working_group(self):
filename = self.draft.filename
existing_draft = InternetDraft.objects.filter(filename=filename)
if existing_draft:
group = existing_draft[0].group and existing_draft[0].group.ietfwg or None
if group and group.pk != 1027:
return group
else:
return None
else:
if filename.startswith('draft-ietf-'):
# Extra check for WG that contains dashes
for group in IETFWG.objects.filter(group_acronym__acronym__contains='-'):
if filename.startswith('draft-ietf-%s-' % group.group_acronym.acronym):
return group
group_acronym = filename.split('-')[2]
try:
return IETFWG.objects.get(group_acronym__acronym=group_acronym)
except IETFWG.DoesNotExist:
raise forms.ValidationError('There is no active group with acronym \'%s\', please rename your draft' % group_acronym)
else:
return None
def save_draft_info(self, draft):
document_id = 0
existing_draft = InternetDraft.objects.filter(filename=draft.filename)
@ -185,6 +253,8 @@ class UploadForm(forms.Form):
submission_date=datetime.date.today(),
idnits_message=self.idnits_message,
temp_id_document_tag=document_id,
group_acronym=self.group,
remote_ip=self.remote_ip,
first_two_pages=''.join(draft.pages[:2]),
status_id=1, # Status 1 - upload
)

7
ietf/submit/models.py
View file

@ -1,5 +1,8 @@
from django.db import models
from ietf.idtracker.models import IETFWG
class IdSubmissionStatus(models.Model):
status_id = models.IntegerField(primary_key=True)
status_value = models.CharField(blank=True, max_length=255)
@ -7,6 +10,7 @@ class IdSubmissionStatus(models.Model):
class Meta:
db_table = 'id_submission_status'
class IdSubmissionDetail(models.Model):
submission_id = models.AutoField(primary_key=True)
temp_id_document_tag = models.IntegerField(null=True, blank=True)
@ -14,7 +18,7 @@ class IdSubmissionDetail(models.Model):
last_updated_date = models.DateField(null=True, blank=True)
last_updated_time = models.CharField(blank=True, max_length=25)
id_document_name = models.CharField(blank=True, max_length=255)
group_acronym_id = models.IntegerField(null=True, blank=True)
group_acronym = models.ForeignKey(IETFWG, null=True, blank=True)
filename = models.CharField(blank=True, max_length=255)
creation_date = models.DateField(null=True, blank=True)
submission_date = models.DateField(null=True, blank=True)
@ -41,6 +45,7 @@ class IdSubmissionDetail(models.Model):
class Meta:
db_table = 'id_submission_detail'
class TempIdAuthors(models.Model):
id = models.AutoField(primary_key=True)
id_document_tag = models.IntegerField()

32
ietf/submit/utils.py
View file

@ -1,4 +1,5 @@
import re
import datetime
from ietf.idtracker.models import InternetDraft, EmailAddress
@ -17,24 +18,9 @@ class DraftValidation(object):
return passes_idnits
def get_working_group(self):
filename = self.draft.filename
existing_draft = InternetDraft.objects.filter(filename=filename)
if existing_draft:
return existing_draft[0].group and existing_draft[0].group.ietfwg or None
else:
if filename.startswith('draft-ietf-'):
# Extra check for WG that contains dashes
for group in IETFWG.objects.filter(group_acronym__acronym__contains='-'):
if filename.startswith('draft-ietf-%s-' % group.group_acronym.acronym):
return group
group_acronym = filename.split('-')[2]
try:
return IETFWG.objects.get(group_acronym__acronym=group_acronym)
except IETFWG.DoesNotExist:
self.add_warning('group', 'Invalid WG ID: %s' % group_acronym)
return None
else:
return None
if self.draft.group_acronym and self.draft.group_acronym.pk == 1027:
return None
return self.draft.group_acronym
def check_idnits_success(self, idnits_message):
success_re = re.compile('\s+Summary:\s+0\s+|No nits found')
@ -54,6 +40,7 @@ class DraftValidation(object):
def validate_metadata(self):
self.validate_revision()
self.validate_authors()
self.validate_creation_date()
def add_warning(self, key, value):
self.warnings.update({key: value})
@ -71,6 +58,15 @@ class DraftValidation(object):
if not self.authors:
self.add_warning('authors', 'No authors found')
def validate_creation_date(self):
date = self.draft.creation_date
if not date:
self.add_warning('creation_date', 'Creation Date field is empty or the creation date is not in a proper format.')
return
submit_date = self.draft.submission_date
if date + datetime.timedelta(days=3) > submit_date:
self.add_warning('creation_date', 'Creation Date must be within 3 days of submission date.')
def get_authors(self):
tmpauthors = self.draft.tempidauthors_set.all().order_by('author_order')
authors = []

4
ietf/submit/views.py
View file

@ -12,12 +12,12 @@ from ietf.submit.utils import DraftValidation
def submit_index(request):
if request.method == 'POST':
form = UploadForm(data=request.POST, files=request.FILES)
form = UploadForm(request=request, data=request.POST, files=request.FILES)
if form.is_valid():
submit = form.save()
return HttpResponseRedirect(reverse(draft_status, None, kwargs={'submission_id': submit.submission_id}))
else:
form = UploadForm()
form = UploadForm(request=request)
return render_to_response('submit/submit_index.html',
{'selected': 'index',
'form': form},

2
ietf/templates/submit/draft_status.html
View file

@ -114,7 +114,7 @@ returned to the submitter.
<tr{% if validation.warnings.revision %} class="warning"{% endif %}><th>Revision</th><td>{{ detail.revision }}<div class="warn_message">{{ validation.warnings.revision }}</div></td></tr>
<tr><th>Submission date</th><td>{{ detail.submission_date }}</td></tr>
<tr><th>Title</th><td>{{ detail.id_document_name }}</td></tr>
<tr{% if validation.warnings.group %} class="warning"{% endif %}><th>WG</th><td>{{ validation.wg|default:"" }}<div class="warn_message">{{ validation.warnings.group }}</td></tr>
<tr{% if validation.warnings.group %} class="warning"{% endif %}><th>WG</th><td>{{ validation.wg|default:"Individual Submission" }}<div class="warn_message">{{ validation.warnings.group }}</td></tr>
<tr><th>File size</th><td>{{ detail.filesize|filesizeformat }}</td></tr>
<tr{% if validation.warnings.creation_date %} class="warning"{% endif %}><th>Creation date</th><td>{{ detail.creation_date }}<div class="warn_message">{{ validation.warnings.creation_date }}</td></tr>
<tr{% if validation.warnings.authors %} class="warning"{% endif %}><th colspan="2">Author(s) information</th></tr>