C++: Clean up the tests, make them a bit more realistic, and add many more test cases.

cpp/ql/test/query-tests/Security/CWE/CWE-611/tests.cpp

@@ -1,41 +1,170 @@
+// test cases for rule CWE-611
+
+#include "tests.h"
+
+// ---
+
+class SecurityManager;
+class InputSource;
+
 class AbstractDOMParser {
-    public:
-    AbstractDOMParser();
-    void setDisableDefaultEntityResolution(bool);
-    void setCreateEntityReferenceNodes(bool);
-    void setSecurityManager();
-    void parse();
-}
+public:
+	AbstractDOMParser();
+
+	void setDisableDefaultEntityResolution(bool); // default is false (bad)
+	void setCreateEntityReferenceNodes(bool); // default is true (good)
+	void setSecurityManager(SecurityManager *const manager);
+	void parse(const InputSource &data);
+};
 
 class XercesDOMParser: public AbstractDOMParser {
-    public:
-    XercesDOMParser();
-}
+public:
+	XercesDOMParser();
+};
 
 class LSParser: public AbstractDOMParser {
+};
 
+LSParser *createLSParser();
+
+// ---
+
+void test1(InputSource &data) {
+	XercesDOMParser *p = new XercesDOMParser();
+
+	p->parse(data); // BAD (parser not correctly configured)
 }
 
-LSParser createLSParser();
+void test2(InputSource &data) {
+	XercesDOMParser *p = new XercesDOMParser();
 
-void test1() {
-    XercesDOMParser p = new XercesDOMParser();
-    p.parse() // BAD
+	p->setDisableDefaultEntityResolution(true);
+	p->parse(data); // GOOD
 }
 
-void test2() {
-    XercesDOMParser p = new XercesDOMParser();
-    p.setDisableDefaultEntityResolution(true);
-    p.parse() // GOOD
+void test3(InputSource &data) {
+	XercesDOMParser *p = new XercesDOMParser();
+
+	p->setDisableDefaultEntityResolution(false);
+	p->parse(data); // BAD (parser not correctly configured)
 }
 
-void test3() {
-    LSParser p = createLSParser();
-    p.parse() // BAD
+void test4(InputSource &data) {
+	XercesDOMParser *p = new XercesDOMParser();
+
+	p->setDisableDefaultEntityResolution(true);
+	p->setCreateEntityReferenceNodes(false);
+	p->parse(data); // BAD (parser not correctly configured)
 }
 
-void test2() {
-    LSParser p = createLSParser();
-    p.setDisableDefaultEntityResolution(true);
-    p.parse() // GOOD
+void test5(InputSource &data) {
+	XercesDOMParser *p = new XercesDOMParser();
+
+	p->setDisableDefaultEntityResolution(true);
+	p->setCreateEntityReferenceNodes(true);
+	p->parse(data); // GOOD
+}
+
+void test6(InputSource &data) {
+	XercesDOMParser *p = new XercesDOMParser();
+
+	p->setDisableDefaultEntityResolution(true);
+	p->parse(data); // GOOD
+	p->setDisableDefaultEntityResolution(false);
+	p->parse(data); // BAD (parser not correctly configured)
+	p->setDisableDefaultEntityResolution(true);
+	p->parse(data); // GOOD
+	p->setCreateEntityReferenceNodes(false);
+	p->parse(data); // BAD (parser not correctly configured)
+	p->setCreateEntityReferenceNodes(true);
+	p->parse(data); // GOOD
+}
+
+void test7(InputSource &data, bool cond) {
+	XercesDOMParser *p = new XercesDOMParser();
+
+	p->setDisableDefaultEntityResolution(cond);
+	p->parse(data); // BAD (parser may not be correctly configured)
+}
+
+void test8(InputSource &data, bool cond) {
+	XercesDOMParser *p = new XercesDOMParser();
+
+	if (cond)
+	{
+		p->setDisableDefaultEntityResolution(true);
+	}
+
+	p->parse(data); // BAD (parser may not be correctly configured)
+}
+
+void test9(InputSource &data) {
+	{
+		XercesDOMParser *p = new XercesDOMParser();
+		XercesDOMParser &q = *p;
+
+		q.parse(data); // BAD (parser not correctly configured)
+	}
+
+	{
+		XercesDOMParser *p = new XercesDOMParser();
+		XercesDOMParser &q = *p;
+
+		q.setDisableDefaultEntityResolution(true);
+		q.parse(data); // GOOD
+	}
+
+	{
+		XercesDOMParser *p = new XercesDOMParser();
+		XercesDOMParser &q = *p;
+
+		p->setDisableDefaultEntityResolution(true);
+		q.parse(data); // GOOD
+	}
+}
+
+void test10_doParseA(XercesDOMParser *p, InputSource &data) {
+	p->parse(data); // GOOD
+}
+
+void test10_doParseB(XercesDOMParser *p, InputSource &data) {
+	p->parse(data); // BAD (parser not correctly configured)
+}
+
+void test10_doParseC(XercesDOMParser *p, InputSource &data) {
+	p->parse(data); // BAD (parser may not be correctly configured)
+}
+
+void test10(InputSource &data) {
+	XercesDOMParser *p = new XercesDOMParser();
+	XercesDOMParser *q = new XercesDOMParser();
+
+	p->setDisableDefaultEntityResolution(true);
+	test10_doParseA(p, data);
+	test10_doParseB(q, data);
+	test10_doParseC(p, data);
+	test10_doParseC(q, data);
+}
+
+void test11(InputSource &data) {
+	LSParser *p = createLSParser();
+
+	p->parse(data); // BAD (parser not correctly configured)
+}
+
+void test12(InputSource &data) {
+	LSParser *p = createLSParser();
+
+	p->setDisableDefaultEntityResolution(true);
+	p->parse(data); // GOOD
+}
+
+LSParser *g_p1 = createLSParser();
+LSParser *g_p2 = createLSParser();
+InputSource *g_data;
+
+void test13() {
+	g_p1->setDisableDefaultEntityResolution(true);
+	g_p1->parse(*g_data); // GOOD
+	g_p2->parse(*g_data); // BAD (parser not correctly configured)
 }

cpp/ql/test/query-tests/Security/CWE/CWE-611/tests.h

@@ -0,0 +1,2 @@
+// library functions for rule CWE-611
+