Fix #145

vijos · May 1, 2017 · 3a5e1ba · iceboy233 · May 1, 2017 · 3a5e1ba
1 parent 4fa65e7
commit 3a5e1ba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/vj4/model/adaptor/discussion.py b/vj4/model/adaptor/discussion.py
@@ -136,6 +136,10 @@ async def get(domain_id: str, did: document.convert_doc_id):
 
 
 async def edit(domain_id: str, did: document.convert_doc_id, **kwargs):
+  if 'title' in kwargs:
+      validator.check_title(kwargs['title'])
+  if 'content' in kwargs:
+      validator.check_content(kwargs['content'])
   return await document.set(domain_id, document.TYPE_DISCUSSION, did, **kwargs)
 
 

diff --git a/vj4/util/validator.py b/vj4/util/validator.py
@@ -74,7 +74,7 @@ def check_role(s):
 
 
 def is_title(s):
-  return bool(re.fullmatch(r'.{1,64}', s))
+  return bool(re.fullmatch(r'.{1,64}', s.strip()))
 
 
 def check_title(s):
@@ -91,7 +91,7 @@ def check_name(s):
 
 
 def is_content(s):
-  return isinstance(s, str) and len(str(s)) >= 2 and len(str(s)) <= 65536
+  return isinstance(s, str) and len(s.strip()) >= 2 and len(s.strip()) <= 65536
 
 
 def check_content(s):
@@ -100,7 +100,7 @@ def check_content(s):
 
 
 def is_description(s):
-  return isinstance(s, str) and len(str(s)) >= 1 and len(str(s)) <= 65536
+  return isinstance(s, str) and len(s.strip()) >= 1 and len(s.strip()) <= 65536
 
 
 def check_description(s):