Check if any files matching the submitted draft name and revision already exists on disk in the active drafts or archived drafts directories, and if so reject the submission. Fixes issue ietf-tools#2908

 - Legacy-Id: 17498

Author: levkowetz

ietf/submit/forms.py

@@ -339,6 +339,10 @@ def format_messages(where, e, log):
             except (UnicodeDecodeError, LookupError) as e:
                 self.add_error('txt', 'Failed decoding the uploaded file: "%s"' % str(e))
 
+        rev_error = validate_submission_rev(self.filename, self.revision)
+        if rev_error:
+            raise forms.ValidationError(rev_error)
+
         # The following errors are likely noise if we have previous field
         # errors:
         if self.errors:

ietf/submit/tests.py

@@ -1120,6 +1120,38 @@ def test_submit_bad_file_ps(self):
         self.assertIn('Expected the PS file to have extension ".ps"', m)
         self.assertIn('Expected an PS file of type "application/postscript"', m)
 
+    def test_submit_file_in_archive(self):
+        name = "draft-authorname-testing-file-exists"
+        rev = '00'
+        formats = ['txt', 'xml']
+        group = None
+
+        # break early in case of missing configuration
+        self.assertTrue(os.path.exists(settings.IDSUBMIT_IDNITS_BINARY))
+
+        # get
+        url = urlreverse('ietf.submit.views.upload_submission')
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+
+        # submit
+        for dir in [self.repository_dir, self.archive_dir, ]:
+            files = {}
+            for format in formats:
+                fn = os.path.join(dir, "%s-%s.%s" % (name, rev, format))
+                with io.open(fn, 'w') as f:
+                    f.write("a" * 2000)
+                files[format], author = submission_file(name, rev, group, format, "test_submission.%s" % format)
+
+            r = self.client.post(url, files)
+
+            self.assertEqual(r.status_code, 200)
+            q = PyQuery(r.content)
+            m = q('div.alert-danger').text()
+
+            self.assertIn('Unexpected files already in the archive', m)
+
     def test_submit_nonascii_name(self):
         name = "draft-authorname-testing-nonascii"
         rev = "00"

ietf/submit/utils.py

@@ -7,6 +7,7 @@
 import datetime
 import io
 import os
+import pathlib
 import re
 import six                              # pyflakes:ignore
 if six.PY3:
@@ -142,6 +143,15 @@ def validate_submission_rev(name, rev):
         if rev != expected:
             return 'Invalid revision (revision %02d is expected)' % expected
 
+        for dirname in [settings.INTERNET_DRAFT_PATH, settings.INTERNET_DRAFT_ARCHIVE_DIR, ]:
+            dir = pathlib.Path(dirname)
+            pattern = '%s-%02d.*' % (name, rev)
+            existing = list(dir.glob(pattern))
+            if existing:
+                plural = '' if len(existing) == 1 else 's'
+                files  = ', '.join([ f.name for f in existing ])
+                return 'Unexpected file%s already in the archive: %s' % (plural, files)
+
     replaced_by=has_been_replaced_by(name)
     if replaced_by:
         return 'This document has been replaced by %s' % ",".join(rd.name for rd in replaced_by)