#518 explicitly override the cfdictionary for cfcookie/@name.

cflint · Jan 1, 2018 · 10a892c · 10a892c
1 parent 184aa39
commit 10a892c
Show file tree

Hide file tree

Showing 4 changed files with 129 additions and 106 deletions.
diff --git a/src/main/java/com/cflint/CF.java b/src/main/java/com/cflint/CF.java
@@ -174,6 +174,10 @@ public class CF {
      * CFProcParam Tag.
      */
     public static final String CFPROCPARAM = "cfprocparam";
+    /**
+     * CFProcParam Tag.
+     */
+    public static final String CFCOOKIE = "cfcookie";
 
     /**
      * CFProcResult Tag.

diff --git a/src/main/java/com/cflint/tools/CFMLTagInfo.java b/src/main/java/com/cflint/tools/CFMLTagInfo.java
@@ -1,106 +1,109 @@
-package com.cflint.tools;
-
-import cfml.dictionary.Parameter;
-import cfml.dictionary.Return;
-import cfml.dictionary.SyntaxDictionary;
-import cfml.dictionary.Tag;
-import com.cflint.CF;
-import net.htmlparser.jericho.Element;
-
-public class CFMLTagInfo {
-
-    private final SyntaxDictionary dictionary;
-
-    public CFMLTagInfo(final SyntaxDictionary dictionary) {
-        this.dictionary = dictionary;
-    }
-
-    /**
-     * 
-     * @param element           the element
-     * @param attributeName     the attribute name
-     * @return true when the tag/attribute combination represents a variable
-     *         assignment.
-     */
-    public boolean isAssignmentAttribute(final Element element, final String attributeName) {
-        if (element != null) {
-            return isAssignmentAttribute(element.getName(), attributeName);
-        }
-        return false;
-    }
-
-    /**
-     * 
-     * @param elementName       the element
-     * @param attributeName     the attribute name
-     * @return true when the tag/attribute combination represents a variable
-     *         assignment.
-     */
-    public boolean isAssignmentAttribute(final String elementName, final String attributeName) {
-        if (elementName != null && attributeName != null) {
-            // Hardcoded exceptions to the dictionary
-            if (elementName.equalsIgnoreCase(CF.CFPROCPARAM)) {
-                return "variable".equalsIgnoreCase(attributeName);
-            }
-            final Tag tag = dictionary.getTag(elementName.toLowerCase());
-            if (tag != null) {
-                for (final Object retObj : tag.getReturns()) {
-                    final Return ret = (Return) retObj;
-                    if (attributeName.equalsIgnoreCase(ret.getParameterName())) {
-                        return true;
-                    }
-                }
-                for (final Object paramObj : tag.getParameters()) {
-                    final Parameter param = (Parameter) paramObj;
-                    if (attributeName.equalsIgnoreCase(param.getName())) {
-                        return "variablename".equalsIgnoreCase(param.getReturnVarType());
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 
-     * @param element           the element
-     * @param attributeName     the attribute name
-     * @return true when the tag/attribute combination represents a variable
-     *         reference.
-     */
-    public boolean isExpressionAttribute(final Element element, final String attributeName) {
-        if (element != null) {
-            return isExpressionAttribute(element.getName(), attributeName);
-        }
-        return false;
-    }
-
-    /**
-     * 
-     * @param elementName       the element
-     * @param attributeName     the attribute name
-     * @return true when the tag/attribute combination represents a variable
-     *         reference.
-     */
-    public boolean isExpressionAttribute(final String elementName, final String attributeName) {
-        if (isAssignmentAttribute(elementName, attributeName)) {
-            return true;
-        }
-        if ((elementName != null) && (attributeName != null)) {
-            final Tag tag = dictionary.getTag(elementName.toLowerCase());
-            if (tag != null) {
-                for (final Object paramObj : tag.getParameters()) {
-                    final Parameter param = (Parameter) paramObj;
-                    if (attributeName.equalsIgnoreCase(param.getName())) {
-                        return "query".equalsIgnoreCase(param.getType())
-                                || "variableName".equalsIgnoreCase(param.getType())
-                                || "array".equalsIgnoreCase(param.getType())
-                                || "struct".equalsIgnoreCase(param.getType())
-                                || "any".equalsIgnoreCase(param.getType());
-                    }
-                }
-            }
-        }
-        return false;
-    }
-}
+package com.cflint.tools;
+
+import cfml.dictionary.Parameter;
+import cfml.dictionary.Return;
+import cfml.dictionary.SyntaxDictionary;
+import cfml.dictionary.Tag;
+import com.cflint.CF;
+import net.htmlparser.jericho.Element;
+
+public class CFMLTagInfo {
+
+    private final SyntaxDictionary dictionary;
+
+    public CFMLTagInfo(final SyntaxDictionary dictionary) {
+        this.dictionary = dictionary;
+    }
+
+    /**
+     * 
+     * @param element           the element
+     * @param attributeName     the attribute name
+     * @return true when the tag/attribute combination represents a variable
+     *         assignment.
+     */
+    public boolean isAssignmentAttribute(final Element element, final String attributeName) {
+        if (element != null) {
+            return isAssignmentAttribute(element.getName(), attributeName);
+        }
+        return false;
+    }
+
+    /**
+     * 
+     * @param elementName       the element
+     * @param attributeName     the attribute name
+     * @return true when the tag/attribute combination represents a variable
+     *         assignment.
+     */
+    public boolean isAssignmentAttribute(final String elementName, final String attributeName) {
+        if (elementName != null && attributeName != null) {
+            // Hardcoded exceptions to the dictionary
+            if (elementName.equalsIgnoreCase(CF.CFPROCPARAM)) {
+                return "variable".equalsIgnoreCase(attributeName);
+            }
+            if (elementName.equalsIgnoreCase(CF.CFCOOKIE) && "name".equalsIgnoreCase(attributeName)) {
+                return false;
+            }
+            final Tag tag = dictionary.getTag(elementName.toLowerCase());
+            if (tag != null) {
+                for (final Object retObj : tag.getReturns()) {
+                    final Return ret = (Return) retObj;
+                    if (attributeName.equalsIgnoreCase(ret.getParameterName())) {
+                        return true;
+                    }
+                }
+                for (final Object paramObj : tag.getParameters()) {
+                    final Parameter param = (Parameter) paramObj;
+                    if (attributeName.equalsIgnoreCase(param.getName())) {
+                        return "variablename".equalsIgnoreCase(param.getReturnVarType());
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 
+     * @param element           the element
+     * @param attributeName     the attribute name
+     * @return true when the tag/attribute combination represents a variable
+     *         reference.
+     */
+    public boolean isExpressionAttribute(final Element element, final String attributeName) {
+        if (element != null) {
+            return isExpressionAttribute(element.getName(), attributeName);
+        }
+        return false;
+    }
+
+    /**
+     * 
+     * @param elementName       the element
+     * @param attributeName     the attribute name
+     * @return true when the tag/attribute combination represents a variable
+     *         reference.
+     */
+    public boolean isExpressionAttribute(final String elementName, final String attributeName) {
+        if (isAssignmentAttribute(elementName, attributeName)) {
+            return true;
+        }
+        if ((elementName != null) && (attributeName != null)) {
+            final Tag tag = dictionary.getTag(elementName.toLowerCase());
+            if (tag != null) {
+                for (final Object paramObj : tag.getParameters()) {
+                    final Parameter param = (Parameter) paramObj;
+                    if (attributeName.equalsIgnoreCase(param.getName())) {
+                        return "query".equalsIgnoreCase(param.getType())
+                                || "variableName".equalsIgnoreCase(param.getType())
+                                || "array".equalsIgnoreCase(param.getType())
+                                || "struct".equalsIgnoreCase(param.getType())
+                                || "any".equalsIgnoreCase(param.getType());
+                    }
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/test/resources/com/cflint/tests/VarScoper/cfcookie_518.cfc b/src/test/resources/com/cflint/tests/VarScoper/cfcookie_518.cfc
@@ -0,0 +1,5 @@
+<cfcomponent>
+ <cffunction name="foo">
+  <cfcookie name="_dist" value="" expires="now" httponly="true">
+ </cffunction>
+</cfcomponent>
diff --git a/src/test/resources/com/cflint/tests/VarScoper/cfcookie_518.expected.txt b/src/test/resources/com/cflint/tests/VarScoper/cfcookie_518.expected.txt
@@ -0,0 +1,11 @@
+{
+  "version" : "",
+  "timestamp" : 0,
+  "issues" : [ ],
+  "counts" : {
+    "totalFiles" : 0,
+    "totalLines" : 0,
+    "countByCode" : [ ],
+    "countBySeverity" : [ ]
+  }
+}