From 749077f0cfbde180bac85b141080fdd7fe248455 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Wed, 1 Feb 2017 14:18:33 +0100 Subject: [PATCH] validate cover extension server-side --- apps/wiki/forms.py | 18 +++++++++++++++++- lib/librarian | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py index 3ea36a32..4f5f7aa4 100644 --- a/apps/wiki/forms.py +++ b/apps/wiki/forms.py @@ -60,9 +60,25 @@ class DocumentTextSaveForm(forms.Form): def clean_text(self): text = self.cleaned_data['text'] try: - Document.from_string(text) + doc = Document.from_string(text) except ValueError as e: raise ValidationError(e.message) + + from librarian import SSTNS, DCNS + root_elem = doc.edoc.getroot() + if len(root_elem) < 1 or root_elem[0].tag != SSTNS('metadata'): + raise ValidationError("The first tag in section should be metadata") + if len(root_elem) < 2 or root_elem[1].tag != SSTNS('header'): + raise ValidationError("The first tag after metadata should be header") + header = root_elem[1] + if not getattr(header, 'text', None) or not header.text.strip(): + raise ValidationError( + "The first header should contain the title in plain text (no links, emphasis etc.) and cannot be empty") + + ext = doc.meta.get_one(DCNS('relation.coverimage.url')).rsplit('.', 1)[-1].lower() + if ext not in ('jpg', 'jpeg', 'png', 'gif', 'tif', 'tiff'): + raise ValidationError('Invalid cover image format, should be an image file (jpg, png, gif). ' + 'Change it in Metadata.') return text diff --git a/lib/librarian b/lib/librarian index dc310ddf..30a74b43 160000 --- a/lib/librarian +++ b/lib/librarian @@ -1 +1 @@ -Subproject commit dc310ddf91e20a927cd1fc1db72e1c8cd803756d +Subproject commit 30a74b436b8a81adbdbeea5a9b2f99dfc2e4949f -- 2.20.1