Merge branch 'owasp-modsecurity:v3/master' into v3/remove_this_throw_call_transaction_h

gberkes · web-flow · commit e55cd9f906e8 · 2024-04-25T11:13:22.000+02:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "test/test-cases/secrules-language-tests"]
 	path = test/test-cases/secrules-language-tests
-	url = https://github.com/SpiderLabs/secrules-language-tests
+	url = https://github.com/owasp-modsecurity/secrules-language-tests
 [submodule "others/libinjection"]
 	path = others/libinjection
 	url = https://github.com/libinjection/libinjection.git
 [submodule "bindings/python"]
 	path = bindings/python
-	url = https://github.com/SpiderLabs/ModSecurity-Python-bindings.git
+	url = https://github.com/owasp-modsecurity/ModSecurity-Python-bindings.git
diff --git a/src/operators/rbl.h b/src/operators/rbl.h
@@ -71,9 +71,9 @@ class Rbl : public Operator {
                 m_demandsPassword = true;
                 m_provider = RblProvider::httpbl;
             } else if (m_service.find("uribl.com") != std::string::npos) {
-                m_provider = RblProvider::httpbl;
+                m_provider = RblProvider::uribl;
             } else if (m_service.find("spamhaus.org") != std::string::npos) {
-                m_provider = RblProvider::httpbl;
+                m_provider = RblProvider::spamhaus;
             }
         }
     bool evaluate(Transaction *transaction, RuleWithActions *rule,

Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,9 @@ class Rbl : public Operator {`
`71`	`71`	`m_demandsPassword = true;`
`72`	`72`	`m_provider = RblProvider::httpbl;`
`73`	`73`	`} else if (m_service.find("uribl.com") != std::string::npos) {`
`74`		`- m_provider = RblProvider::httpbl;`
	`74`	`+ m_provider = RblProvider::uribl;`
`75`	`75`	`} else if (m_service.find("spamhaus.org") != std::string::npos) {`
`76`		`- m_provider = RblProvider::httpbl;`
	`76`	`+ m_provider = RblProvider::spamhaus;`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`bool evaluate(Transaction transaction, RuleWithActions rule,`