Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 7267c1d

Browse files
Added support to run regression tests without libxml2
- Annotated regression tests that depend on libxml2 support - Added Windows build without libxml2
1 parent 124a434 commit 7267c1d

10 files changed

+24
-3
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ jobs:
8484
- {label: "full", opt: "" }
8585
- {label: "wo lmdb", opt: "-DWITHOUT_LMDB=ON" }
8686
- {label: "wo lua", opt: "-DWITHOUT_LUA=ON" }
87+
- {label: "wo libxml2", opt: "-WITHOUT_LIBXML2=ON" }
8788
- {label: "wo maxmind", opt: "-DWITHOUT_MAXMIND=ON" }
8889
- {label: "wo curl", opt: "-DWITHOUT_CURL=ON" }
8990
steps:

‎test/regression/regression.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -486,15 +486,12 @@ int main(int argc, char **argv) {
486486
#if defined(WITH_GEOIP) or defined(WITH_MAXMIND)
487487
resources.push_back("geoip-or-maxmind");
488488
#endif
489-
490489
#if defined(WITH_MAXMIND)
491490
resources.push_back("maxmind");
492491
#endif
493-
494492
#if defined(WITH_GEOIP)
495493
resources.push_back("geoip");
496494
#endif
497-
498495
#ifdef WITH_CURL
499496
resources.push_back("curl");
500497
#endif
@@ -504,6 +501,9 @@ int main(int argc, char **argv) {
504501
#ifdef WITH_LUA
505502
resources.push_back("lua");
506503
#endif
504+
#ifdef WITH_LIBXML2
505+
resources.push_back("libxml2");
506+
#endif
507507

508508
#ifdef NO_LOGS
509509
std::cout << "Test utility cannot work without logging support." \

‎test/test-cases/regression/action-ctl_request_body_processor.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{
33
"enabled":1,
44
"version_min":300000,
5+
"resource":"libxml2",
56
"title":"Testing CtlRequestBodyProcessor=XML (1)",
67
"expected":{
78
"debug_log": "Registered XML namespace href \"http://schemas.xmlsoap.org/soap/envelope/\" prefix \"soap\""
@@ -71,6 +72,7 @@
7172
{
7273
"enabled":1,
7374
"version_min":300000,
75+
"resource":"libxml2",
7476
"title":"Testing CtlRequestBodyProcessor=XML (2)",
7577
"expected":{
7678
"debug_log": "Rule returned 0"
@@ -139,6 +141,7 @@
139141
{
140142
"enabled":1,
141143
"version_min":300000,
144+
"resource":"libxml2",
142145
"title":"Testing CtlRequestBodyProcessor=XML (3)",
143146
"expected":{
144147
"debug_log": "XML: Failed parsing document."

‎test/test-cases/regression/action-xmlns.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
{
3939
"enabled":1,
4040
"version_min":300000,
41+
"resource":"libxml2",
4142
"title":"Testing XML request body parser (validate ok)",
4243
"expected":{
4344
"debug_log": "Target value: \"39.95\" \\(Variable: XML:\/bookstore\/book\/price\\[text\\(\\)\\]\\)"

‎test/test-cases/regression/config-body_limits.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,7 @@
578578
{
579579
"enabled":1,
580580
"version_min":300000,
581+
"resource":"libxml2",
581582
"title":"SecRequestBodyNoFilesLimit - xml, limit exceeded",
582583
"client":{
583584
"ip":"200.249.12.31",
@@ -626,6 +627,7 @@
626627
{
627628
"enabled":1,
628629
"version_min":300000,
630+
"resource":"libxml2",
629631
"title":"SecRequestBodyNoFilesLimit - xml, limit not exceeded",
630632
"client":{
631633
"ip":"200.249.12.31",

‎test/test-cases/regression/config-xml_external_entity.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{
33
"enabled":1,
44
"version_min":300000,
5+
"resource":"libxml2",
56
"title":"Testing SecXMLExternalEntity/XXE 1",
67
"expected":{
78
"debug_log": "Target value: \" jo smith\""
@@ -47,6 +48,7 @@
4748
{
4849
"enabled":1,
4950
"version_min":300000,
51+
"resource":"libxml2",
5052
"title":"Testing SecXMLExternalEntity/XXE 2",
5153
"expected":{
5254
"debug_log": "XML: Failed to load DTD: test-cases/data/SoapEnvelope.dtd",
@@ -94,6 +96,7 @@
9496
{
9597
"enabled":1,
9698
"version_min":300000,
99+
"resource":"libxml2",
97100
"title":"Testing SecXMLExternalEntity/XXE 3",
98101
"expected":{
99102
"debug_log": "XML Error: No declaration for element bookstore",

‎test/test-cases/regression/request-body-parser-xml-validade-dtd.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{
33
"enabled":1,
44
"version_min":300000,
5+
"resource":"libxml2",
56
"title":"Testing XML request body parser - validateDTD (validate ok)",
67
"expected":{
78
"debug_log": "XML: Successfully validated payload against DTD: test-cases/data/SoapEnvelope.dtd"
@@ -47,6 +48,7 @@
4748
{
4849
"enabled":1,
4950
"version_min":300000,
51+
"resource":"libxml2",
5052
"title":"Testing XML request body parser - validateDTD (validation failed)",
5153
"expected":{
5254
"debug_log": "XML Error: No declaration for element xBody",
@@ -93,6 +95,7 @@
9395
{
9496
"enabled":1,
9597
"version_min":300000,
98+
"resource":"libxml2",
9699
"title":"Testing XML request body parser - validateDTD (bad XML)",
97100
"expected":{
98101
"debug_log": "XML: DTD validation failed because content is not well formed",
@@ -139,6 +142,7 @@
139142
{
140143
"enabled":1,
141144
"version_min":300000,
145+
"resource":"libxml2",
142146
"title":"Testing XML request body parser - validateDTD (bad DTD)",
143147
"expected":{
144148
"debug_log": "Failed to load DTD: test-cases/data/SoapEnvelope-bad.dtd",

‎test/test-cases/regression/request-body-parser-xml.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{
33
"enabled":1,
44
"version_min":300000,
5+
"resource":"libxml2",
56
"title":"Testing XML request body parser (validate ok)",
67
"expected":{
78
"debug_log": "XML: Successfully validated payload against Schema:"
@@ -51,6 +52,7 @@
5152
{
5253
"enabled":1,
5354
"version_min":300000,
55+
"resource":"libxml2",
5456
"title":"Testing XML request body parser (validate attribute value failed)",
5557
"expected":{
5658
"debug_log": "'badval' is not a valid value of the local atomic type",
@@ -101,6 +103,7 @@
101103
{
102104
"enabled":1,
103105
"version_min":300000,
106+
"resource":"libxml2",
104107
"title":"Testing XML request body parser (validate failed)",
105108
"expected":{
106109
"debug_log": "This element is not expected. Expected is one of",
@@ -151,6 +154,7 @@
151154
{
152155
"enabled":1,
153156
"version_min":300000,
157+
"resource":"libxml2",
154158
"title":"Testing XML request body parser (bad XML)",
155159
"expected":{
156160
"debug_log": "XML Error: Element '{http://schemas.xmlsoap.org/soap/envelope/}xBody'",
@@ -201,6 +205,7 @@
201205
{
202206
"enabled":1,
203207
"version_min":300000,
208+
"resource":"libxml2",
204209
"title":"Testing XML request body parser (bad schema)",
205210
"expected":{
206211
"debug_log": "XML: Failed to load Schema: test-cases/data/SoapEnvelope-bad.xsd. XML Error: Failed to parse the XML resource 'test-cases/data/SoapEnvelope-bad.xsd",

‎test/test-cases/regression/variable-REQBODY_PROCESSOR_ERROR.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{
33
"enabled":1,
44
"version_min":300000,
5+
"resource":"libxml2",
56
"title":"Testing Variables :: REQBODY_PROCESSOR_ERROR_MSG (1/2)",
67
"client":{
78
"ip":"200.249.12.31",

‎test/test-cases/regression/variable-XML.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{
33
"enabled":1,
44
"version_min":300000,
5+
"resource":"libxml2",
56
"title":"Testing XPath expression with equals sign",
67
"expected":{
78
"http_code": 403

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /