Merge pull request #38 from treblereel/UNDERTOW-1319

[UNDERTOW-1319] Partial use of scriptlet expression in jsp:include do…
undertow-io · Sep 4, 2018 · b8f24dc · b8f24dc
2 parents a192df2 + 3a7f68c
commit b8f24dc
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/src/main/java/org/apache/jasper/compiler/Validator.java b/src/main/java/org/apache/jasper/compiler/Validator.java
@@ -1337,6 +1337,11 @@ private Node.JspAttribute getJspAttribute(TagAttributeInfo tai,
                     result = new Node.JspAttribute(tai, qName, uri, localName,
                             value.substring(3, value.length() - 2), true, null,
                             dynamic);
+                }else if(!n.getRoot().isXmlSyntax()
+                        && value.contains("<%=") && value.contains("%>") && (value.indexOf("<%=") < value.indexOf("%>"))) {
+                    result = new Node.JspAttribute(tai, qName, uri, localName,
+                            partialScriptletExpression(value), true, null,
+                            dynamic);
                 } else {
                     if (!pageInfo.isELIgnored()) {
                     // The attribute can contain expressions but is not a
@@ -1417,6 +1422,16 @@ private Node.JspAttribute getJspAttribute(TagAttributeInfo tai,
             return result;
         }
 
+        // [UNDERTOW-1319]
+        private String partialScriptletExpression(String url) {
+            String result = "\"" + url.replaceAll("<%=", "\"+").replaceAll("%>", "+\"");
+            if (result.lastIndexOf("+\"") == result.length() - 2) {
+                return result.substring(0, result.length() - 2);
+            } else {
+                return result + "\"";
+            }
+        }
+
 
         private static class XmlEscapeNonELVisitor extends ELParser.TextBuilder {