Merge pull request #324 from ncats/codeCommentsHtmlValidator

code comments HTML validation
ncats · Apr 11, 2024 · 1c919bf · 1c919bf
2 parents de9fa82 + ffd3266
commit 1c919bf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/utils/HtmlUtil.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/utils/HtmlUtil.java
@@ -20,7 +20,7 @@
  * Created by epuzanov on 7/25/22.
  */
 public final class HtmlUtil {
-    private static final Set<String> safetags = Stream.of("i", "small", "sub", "sup").collect(Collectors.toSet());
+    private static final Set<String> safetags = Stream.of("br", "i", "small", "sub", "sup").collect(Collectors.toSet());
     private static class TruncateVisitor implements NodeVisitor {
         private int maxLen = 0;
         private Element dst;

diff --git a/...le-substances-core/src/main/java/ix/ginas/utils/validation/validators/CodesValidator.java b/...le-substances-core/src/main/java/ix/ginas/utils/validation/validators/CodesValidator.java
@@ -3,6 +3,7 @@
 
 import gsrs.module.substance.repository.ReferenceRepository;
 import gsrs.module.substance.repository.SubstanceRepository;
+import gsrs.module.substance.utils.HtmlUtil;
 import ix.core.models.Keyword;
 import ix.core.util.LogUtil;
 import ix.core.validator.GinasProcessingMessage;
@@ -119,6 +120,16 @@ public void validate(Substance s, Substance objold, ValidatorCallback callback)
                      callback.addMessage(mes);
                 }
 
+                if(cd.comments!=null && !cd.comments.isEmpty() && !HtmlUtil.isValid(cd.comments)) {
+                     cd.comments=HtmlUtil.clean(cd.comments, "UTF-8");
+                     GinasProcessingMessage mes = GinasProcessingMessage
+                                .WARNING_MESSAGE(
+                                        "Code '%s'[%s] code text: %s contains one or more forbidden html tags that will be removed",
+                                        cd.code, cd.codeSystem, cd.comments)
+                                .appliableChange(true);
+                     callback.addMessage(mes);
+                }
+
             } catch (Exception e) {
                 e.printStackTrace();
             }