3044 Commits

Author SHA1 Message Date
Felipe Zimmerle
60d89608be
Replaces getKeyWithCollection with getName on VariableValue 2021-01-12 13:01:23 -03:00
Felipe Zimmerle
c5beb0d15a
Removes unecessary ptr copy form VariableValue 2021-01-12 13:01:23 -03:00
Felipe Zimmerle
5fc3ed1e23
Delays variable name resolution to whenever it is necessary 2021-01-12 13:01:23 -03:00
Felipe Zimmerle
759fc1eabe
Cosmetics: Using VariableValues instead of std::vector<...>
Making the code more readable.
2021-01-12 13:01:22 -03:00
Felipe Zimmerle
6c79e716e7
Refactoring on variables::Variable
Using the references on key and collection as shared pointers
2021-01-12 13:01:22 -03:00
WGH
bac54787af
Use std::shared_ptr for variable resolution
AnchoredSetVariable::resolve is called for every rule
(see RuleWithOperator::evaluate). The previous implementation allocated
a new copy of every variable, which quickly added up. In my tests,
AnchoredSetVariable::resolve function consumed 7.8% of run time.

AnchoredSetVariable (which is a multimap) values are never changed,
only added. This means it's safe to store them in std::shared_ptr,
and make resolve return shared_ptr pointing to the same object.

Other resolve implementation could also use this optimization by not
allocating new objects, however, they are not hot spots, so this
optimization was not implemented there.

In my benchmark, this raises performance from 117 requests per second to
131 RPS, and overhead is lowered from 7.8% to 2.4%.

As a bonus, replacing plain pointer with smart pointers make code
cleaner, since using smart pointers makes manual deletes no longer necessary.

Additionally, VariableOrigin is now stored in plain std::vector,
since it's wasteful to store structure containing just two integer
values using std::list<std::unique_ptr<T>>.
2021-01-12 13:01:22 -03:00
Felipe Zimmerle
5a7f3b97a2
Having RunTimeString in a better shape
This is an effort towards better understanding the issues
reported on #2376
2021-01-12 13:01:22 -03:00
Felipe Zimmerle
f5b6df5abd
Removes init from SetVar 2021-01-12 13:01:22 -03:00
Felipe Zimmerle
5c1095e4e9
Use 'equal_range' instead of full scan for rule exceptions
The original author was @WGH-, this change was proposed at #2370
2021-01-12 13:01:22 -03:00
WGH
e2c622d7db
Remove unnecessary copying in transformations
In C++11, string data is always null-terminated[1], and can be
freely modified[2].

[1] https://stackoverflow.com/questions/6077189/will-stdstring-always-be-null-terminated-in-c11
[2] https://stackoverflow.com/questions/38875623/is-it-permitted-to-modify-the-internal-stdstring-buffer-returned-by-operator
2021-01-12 13:01:21 -03:00
WGH
592c8f0b19
Make all "rule id" variables of type RuleId
Previously, ModSecurity inconsistently used RuleId, int and double for
rule id variables in different places.
2021-01-12 13:01:21 -03:00
Felipe Zimmerle
bf98e3424f
Makes RuleWithActions const in run time operations 2021-01-12 13:01:21 -03:00
Felipe Zimmerle
6a5ff56c8e
Introduces ActionWithExecution 2021-01-12 13:01:21 -03:00
Felipe Zimmerle
838ff53ed4
Makes Lua::run const 2021-01-12 13:01:21 -03:00
Felipe Zimmerle
4c1ca56259
Removes method isDisruptive from Action class 2021-01-12 13:01:21 -03:00
Felipe Zimmerle
a79bfa5c28
Action: make sure that null constructor is not used 2021-01-12 13:01:20 -03:00
Felipe Zimmerle
c7813a1973
Computes auditlog during rules load time 2021-01-12 13:01:20 -03:00
Felipe Zimmerle
d6e8352873
actions: Removes Rule parameter from runtime execute
Generals organization on the Action class
2021-01-12 13:01:20 -03:00
Felipe Zimmerle
1b705aeb54
actions: Compute the rule association during rules load 2021-01-12 13:01:20 -03:00
Felipe Zimmerle
6ea4340a15
tests: Romoves unused header from a test case 2021-01-12 13:01:20 -03:00
Felipe Zimmerle
65f73442e7
tests: Prints test number on segfault 2021-01-12 13:01:20 -03:00
Felipe Zimmerle
69d1112da3
Replaces lower case implementation 2021-01-12 13:01:20 -03:00
Felipe Zimmerle
1d33015934
Makes operator to use string_view 2021-01-12 13:01:19 -03:00
Felipe Zimmerle
9699ec7f44
Improves rules dump for better testing 2021-01-12 13:01:19 -03:00
Felipe Zimmerle
62d894f98e
Better error handling when loading configurations 2021-01-12 13:01:19 -03:00
Felipe Zimmerle
303a4a3b2e
Adds method getVariableNames to variables 2021-01-12 13:01:19 -03:00
Felipe Zimmerle
7d03e3505a
Cosmetics: Defining a type for RuleId 2021-01-12 13:01:19 -03:00
Felipe Zimmerle
1071fadfd7
Moves rule* headers to src/ 2021-01-12 13:01:19 -03:00
Felipe Zimmerle
8191b7efc8
Cleanup on Action class 2021-01-12 13:01:19 -03:00
Felipe Zimmerle
73dfd3aa5f
Removes RuleMessage from action execute signature 2021-01-12 13:01:18 -03:00
Felipe Zimmerle
7640f7b40b
Refactoring: Makes transformations to work with new execute signature 2021-01-12 13:01:18 -03:00
nikolas
3c0c4a8ba0
Move travis to use a new version of Ubuntu 2021-01-12 13:01:18 -03:00
Felipe Zimmerle
08e63662e8
Cosmetics: fix some cppcheck complains 2021-01-12 13:01:18 -03:00
Felipe Zimmerle
affdc49a9e
Refactoring: rename evaluate to execute on actions 2021-01-12 13:01:18 -03:00
Felipe Zimmerle
47ec32fba8
Refactoring in the Rule class to make it more elegant 2021-01-12 13:01:18 -03:00
Felipe Zimmerle
ff79de3237
Rule: isMarker is no longer necessary 2021-01-12 13:01:17 -03:00
Felipe Zimmerle
be4d242a75
Adds new method for rule merge
IMPORTANT: SecDefaultAction specified on a child configuration will
overwrite the ones specified on the parent; Previously it was
concatenating.
2021-01-12 13:01:17 -03:00
Felipe Zimmerle
7d1c37a42b
Moves default actions to be part of the rules 2021-01-12 13:01:17 -03:00
martinhsv
89c63387f2
Fix: FILES variable does not use multipart part name for key 2021-01-12 13:01:17 -03:00
marshal09
409c5e491d
Add new transformation call phpArgsNames 2021-01-12 13:01:17 -03:00
LEI BAO
310cbf899b Fix the typo 2021-01-06 08:44:42 -03:00
Felipe Zimmerle
f18595f428
Makes regular expression selection on collections key case insensitive
This issue was initially reported by @michaelgranzow-avi on #2296.

@airween made an initial attempt to provide a fixed at #2107; As a
consequence of the pull request review - provided by @victorhora,
@zimmerle, and @michaelgranzow-avi - @airween made a second attempt
at #2297. After reviewing by @martinhsv, @zimmerle, I have absorbed
the essential pieces from @airween patch into this one.

This patch differs from @airween's because @airween's patches were
partially working: Key exclusions with regex weren't covered, same
for anchored variables (e.g. ARGS). During the review, I have
highlighted the importance of having elementary test cases. A simple
test case on ARGS could spot the issue. Since that is an important
fix, I don't want to hold this for one more review cycle; therefore,
I am committing the fix myself.

Thank you all involved in the solution of this very own issue.
2020-12-10 10:05:07 -03:00
David Carlier
560f81200f Adding DragonFlyBSD support. 2020-12-10 09:51:03 -03:00
Aleks
afefda53c6 Fix Path to projekt logo 2020-11-16 09:15:26 -03:00
martinhsv
d72be1c470
Fix: Only delete Multipart tmp files after rules have run 2020-11-04 13:50:07 -03:00
Michael Granzow
1b7aa42c77
Issue-2423: Meta-actions like 'msg' should be applied at end of chain 2020-10-29 10:33:02 -03:00
martinhsv
2672db103e
Add support for new operator rxGlobal 2020-10-26 08:55:07 -03:00
Felipe Zimmerle
785958f9b5
Fix maxminddb link on FreeBSD
Issue #2131
2020-10-23 14:44:54 -03:00
Felipe Zimmerle
4b425850cf
Cosmetics: fix cppcheck warnings 2020-10-23 08:29:07 -03:00
martinhsv
8da787a390
Merge pull request #2424 from martinhsv/v3/master
Fix IP address logging in Section A
2020-10-19 09:09:05 -04:00