#214 tags in HTML attribute strings are ignored

casid · Apr 26, 2023 · fc59606 · fc59606
1 parent 7171519
commit fc59606
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 3 deletions.
diff --git a/jte/src/main/java/gg/jte/compiler/TemplateParser.java b/jte/src/main/java/gg/jte/compiler/TemplateParser.java
@@ -704,7 +704,7 @@ private void interceptHtmlTags() {
                         outputPrevented = false;
                     }
                 }
-            } else if (!currentHtmlTag.attributesProcessed && regionMatches("/>")) {
+            } else if (!currentHtmlTag.attributesProcessed && !currentHtmlTag.isInAttributeString() && regionMatches("/>")) {
                 if (currentHtmlTag.intercepted) {
                     extractTextPart(i - 1, null);
                     lastIndex = i - 1;
@@ -713,7 +713,7 @@ private void interceptHtmlTags() {
                 currentHtmlTag.attributesProcessed = true;
 
                 popHtmlTag();
-            } else if (!currentHtmlTag.attributesProcessed && currentChar == '>') {
+            } else if (!currentHtmlTag.attributesProcessed && !currentHtmlTag.isInAttributeString() && currentChar == '>') {
                 if (tagClosed) {
                     tagClosed = false;
                 } else {
@@ -728,7 +728,7 @@ private void interceptHtmlTags() {
                         popHtmlTag();
                     }
                 }
-            } else if (regionMatches("</")) {
+            } else if (currentHtmlTag.attributesProcessed && regionMatches("</")) {
                 if (templateCode.startsWith(currentHtmlTag.name, i + 1)) {
                     if (!currentHtmlTag.bodyIgnored) {
                         if (currentHtmlTag.intercepted) {
@@ -1158,6 +1158,15 @@ public boolean isInAttribute() {
             return currentAttribute != null && currentAttribute.quoteCount < 2;
         }
 
+        public boolean isInAttributeString() {
+            if (attributesProcessed) {
+                return false;
+            }
+
+            HtmlAttribute currentAttribute = getCurrentAttribute();
+            return currentAttribute != null && currentAttribute.quoteCount == 1;
+        }
+
         public boolean isInStringLiteral() {
             return stringLiteralQuote != 0;
         }

diff --git a/jte/src/test/java/gg/jte/TemplateEngine_HtmlOutputEscapingTest.java b/jte/src/test/java/gg/jte/TemplateEngine_HtmlOutputEscapingTest.java
@@ -48,6 +48,42 @@ void unclosedTag() {
         assertThat(throwable).isInstanceOf(TemplateException.class).hasMessage("Failed to compile unclosed.jte, error at line 1: Unclosed tag <a>, expected </a>, got </span>.");
     }
 
+    @Test
+    void unclosedTag_worksWithHyperScript() {
+        codeResolver.givenCode("closed.jte", "<body>\n" +
+                "<p _=\"on load log 'hello world from console'\">Hello world</p>\n" +
+                "\n" +
+                "<form action=\"/login\" method=\"post\" _=\"on submit toggle @disabled on <button[type='submit']/>\">\n" +
+                "    <input type=\"email\" name=\"username\">\n" +
+                "    <input type=\"password\" name=\"password\">\n" +
+                "\n" +
+                "    <button type=\"submit\">Login</button>\n" +
+                "</form>\n" +
+                "</body>");
+
+        Throwable throwable = catchThrowable(() -> templateEngine.render("closed.jte", null, output));
+
+        assertThat(throwable).isNull();
+    }
+
+    @Test
+    void unclosedTag_worksWithHtmlInAttribute() {
+        codeResolver.givenCode("closed.jte", "<form><input name=\">\" disabled=\"${true}\"></form>");
+
+        templateEngine.render("closed.jte", null, output);
+
+        assertThat(output.toString()).isEqualTo("<form><input name=\">\" disabled></form>"); // tag processing must not end after name=">", otherwise disabled="true" instead of just disabled would be the output.
+    }
+
+    @Test
+    void unclosedTag_worksWithClosingHtmlInAttribute() {
+        codeResolver.givenCode("closed.jte", "<form><input text=\"</form>\"></form>");
+
+        templateEngine.render("closed.jte", null, output);
+
+        assertThat(output.toString()).isEqualTo("<form><input text=\"</form>\"></form>");
+    }
+
     @Test
     void codeInTag() {
         codeResolver.givenCode("template.jte", "@param String tag\n\n<span><${tag}/></span>");