From 768ca0b45efbc41e406c546455f564af93ff54ed Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Wed, 21 Jun 2017 13:10:05 +0000
Subject: [PATCH] Catch bad module names in the Yang checker (they are not
 currently flagged by xym).  - Legacy-Id: 13700

---
 ietf/submit/checkers.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ietf/submit/checkers.py b/ietf/submit/checkers.py
index ba4fa6784..d0f8382b7 100644
--- a/ietf/submit/checkers.py
+++ b/ietf/submit/checkers.py
@@ -1,4 +1,5 @@
 # Copyright The IETF Trust 2016, All Rights Reserved
+from __future__ import unicode_literals, print_function
 
 import os
 import re
@@ -124,11 +125,12 @@ class DraftIdnitsChecker(object):
 class DraftYangChecker(object):
 
     name = "yang validation"
-    symbol = u'<span class="large">\u262f</span>'
+    symbol = '<span class="large">\u262f</span>'
 
     def check_file_txt(self, path):
         name = os.path.basename(path)
         workdir = tempfile.mkdtemp()
+        model_name_re = r'^[A-Za-z_][A-Za-z0-9_.-]*(@\d\d\d\d-\d\d-\d\d)?\.yang$'
         errors = 0
         warnings = 0
         message = ""
@@ -161,11 +163,16 @@ class DraftYangChecker(object):
             # Found no yang modules, don't deliver any YangChecker result
             return None, "", 0, 0, []
 
+        for n in model_list:
+            if not re.search(model_name_re, n):
+                debug.debug = True
+                code += 1
+                err += "Error: Bad extracted model name: '%s'\n" % n
+
         command = "xym"
         cmd_version = VersionInfo.objects.get(command=command).version
         message = "%s:\n%s\n\n" % (cmd_version, out.replace('\n\n','\n').strip() if code == 0 else err)
 
-        
         results.append({
             "name": name,
             "passed":  passed,