Add logtest modules to framework by vicferpoy · Pull Request #5870 · wazuh/wazuh

vicferpoy · 2020-09-01T06:57:00Z

Hello team, this closes #5590 .

This PR adds new modules to use the logtest tool from the framework. The new logtest endpoints will use these modules.

It includes the addition of a new action/resource to RBAC and new unit tests for these modules.

You can see examples of the new functions here: #5590 (comment)

Tests results

==================================================================================== test session starts ====================================================================================
platform linux -- Python 3.8.5, pytest-5.4.3, py-1.8.2, pluggy-0.13.1
rootdir: /home/vicferpoy/Desktop/Git/wazuh/framework
plugins: asyncio-0.12.0
collected 6 items                                                                                                                                                                           

wazuh/tests/test_logtest.py ......                                                                                                                                                    [100%]

===================================================================================== 6 passed in 0.08s =====================================================================================

==================================================================================== test session starts ====================================================================================
platform linux -- Python 3.8.5, pytest-5.4.3, py-1.8.2, pluggy-0.13.1
rootdir: /home/vicferpoy/Desktop/Git/wazuh/framework
plugins: asyncio-0.12.0
collected 2 items                                                                                                                                                                           

wazuh/core/tests/test_logtest.py ..                                                                                                                                                   [100%]

===================================================================================== 2 passed in 0.03s =====================================================================================

==================================================================================== test session starts ====================================================================================
platform linux -- Python 3.8.5, pytest-5.4.3, py-1.8.2, pluggy-0.13.1
rootdir: /home/vicferpoy/Desktop/Git/wazuh/framework
plugins: asyncio-0.12.0
collected 20 items                                                                                                                                                                          

wazuh/core/tests/test_wazuh_socket.py ....................                                                                                                                            [100%]

==================================================================================== 20 passed in 0.07s =====================================================================================

Regards.

Declare main functions and structures for wazuh-logtest

… wazuh-logtest development.

…hem.

… of logtest configuration

- Change type of w_logtest_conf.enabled to boolean - Change warning messages to error messages in Read_Logtest - Change debug2 messages to warning messages in Read_Logtest - Change type of w_logtest_conf.threads and w_logtest_conf.max_sessions to int

- Document accumulator.h, logtest.h and fts.h

- Modify decoders and cdb list flow to work with wazuh-logtest - Document the CDB list, rules list, and decoders list

* Remove errors and warnings Remove merror and mwarn from ReadDecodeXML, Rules_OP_ReadRules and other functions for internal use, instead, errors are returned by parameters

* Implement the logs processing in wazuh-logtest

* Fix to wazuh-logtest to support socket header

…-logtest-framework

davidjiglesias

Add CHANGELOG update

…-logtest-framework

Lopuiz and others added 30 commits July 14, 2020 14:14

Declare main functions and structures for wazuh-logtest (#5372)

d870f0f

Declare main functions and structures for wazuh-logtest

Added structures as parameters in Decoders, Rules and CDBlist functions.

20e3087

Modify functions and structures of rules, decoders, and CDB lists for…

75f55b1

… wazuh-logtest development.

Change variables names of rules, decoders, and cdblist and document t…

69ecd8a

…hem.

add wazuh-logtest configuration

b3ddb00

add function tu get rule_test configuration

43b8068

Added test for logtest.c file

9942493

Added test for Read_Logtest function

f12a7a4

add limits to rule_test configuration

f3968e5

Fixed test for Read_Logtest function

2f42fed

Fixed memory leak and unit tests

654bf9d

Added tests for getRuleTestConfig

4b50df6

Fixed unit tests after the merge

ed216bd

Use function get_nproc instead of get_nprocs and modify variable name…

53796c0

… of logtest configuration

comply with style guide

9b242f0

Minor fixes:

4ddc59c

- Change type of w_logtest_conf.enabled to boolean - Change warning messages to error messages in Read_Logtest - Change debug2 messages to warning messages in Read_Logtest - Change type of w_logtest_conf.threads and w_logtest_conf.max_sessions to int

Fixed unit tests after review

16a624d

Changed warning messages to warning_menssage.h

d9e943f

Remove unnecessary mutex

e52adcd

Modified EventList structure

8ee9d43

Modified Rules hash table structures and functions

9565c04

Modify FTS functions and variables to works with wazuh-logtest

0541ecd

Modify accumulate functions and variables to works with wazuh-logtest

8aa052b

- Add function to initialize FTS engine in Wazuh Logtest

7dde433

- Document accumulator.h, logtest.h and fts.h

Checked inactive sessions

72cf5d1

- Implement function to initialize and remove Logtest client session

f1098a5

- Modify decoders and cdb list flow to work with wazuh-logtest - Document the CDB list, rules list, and decoders list

ReadDecodeXML & Rules_OP_ReadRules - Remove error and warning (#5532)

7b89e90

* Remove errors and warnings Remove merror and mwarn from ReadDecodeXML, Rules_OP_ReadRules and other functions for internal use, instead, errors are returned by parameters

Merge branch 'develop' into feature/5337-logtest-enhancement

327a2a8

Fix compilation error in old versions of GCC

fbfecd6

Fix cmake for Analysisd test

281aacc

juliancnn and others added 10 commits September 1, 2020 09:47

wazuh-logtest: handle max session

ec694a5

Added w_logtest_remove_old_session function

6c103a5

Logtest max session, doxygen doc

8b3eab8

fix memory leak when load analysisd config

9e2955b

Change to free str array shared library

4996e1b

Logs processing in wazuh-logtest (#5680)

a7270d7

* Implement the logs processing in wazuh-logtest

Logtest-memleak-rule-dont-match

1cb4bfe

Logtest remove client on demand

346b2bb

Add header to socket messages (#5857)

63767af

* Fix to wazuh-logtest to support socket header

Merge branch 'feature/5337-logtest-enhancement' into feature/5590-dev…

bad561f

…-logtest-framework

vikman90 changed the base branch from develop to master September 25, 2020 08:02

vicferpoy added 5 commits October 7, 2020 15:42

Merge branch 'feature/5337-logtest-enhancement' into feature/5590-dev…

e7bb234

…-logtest-framework

Add generic function to build wazuh socket messages

23b3287

Update logtest modules with the new socket request/response structure

1c619a8

Merge branch 'feature/5337-logtest-enhancement' into feature/5590-dev…

f99102b

…-logtest-framework

Refactor logtest modules with the communication protocol

18a502c

vicferpoy force-pushed the feature/5590-dev-logtest-framework branch from 1fe0f87 to 18a502c Compare October 14, 2020 14:34

vicferpoy added 2 commits October 14, 2020 16:34

Update logtest framework unit tests

5b81041

Add create_wazuh_socket_message unit tests

46b124e

vicferpoy changed the base branch from master to feature/5337-logtest-enhancement October 19, 2020 10:55

davidjiglesias requested changes Oct 19, 2020

View reviewed changes

Update changelog

71dfede

vicferpoy requested a review from davidjiglesias October 19, 2020 14:01

Merge branch 'feature/5337-logtest-enhancement' into feature/5590-dev…

021f8e9

…-logtest-framework

davidjiglesias requested changes Oct 22, 2020

View reviewed changes

Comment thread framework/wazuh/core/exception.py Outdated

Comment thread framework/wazuh/core/exception.py Outdated

Comment thread framework/wazuh/logtest.py Outdated

Comment thread framework/wazuh/core/wazuh_socket.py

Add PR requested changes

be0fcde

vicferpoy requested a review from davidjiglesias October 22, 2020 08:53

davidjiglesias approved these changes Oct 22, 2020

View reviewed changes

davidjiglesias merged commit 59b37c2 into feature/5337-logtest-enhancement Oct 22, 2020

davidjiglesias deleted the feature/5590-dev-logtest-framework branch October 22, 2020 09:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add logtest modules to framework#5870

Add logtest modules to framework#5870
davidjiglesias merged 144 commits intofeature/5337-logtest-enhancementfrom
feature/5590-dev-logtest-framework

vicferpoy commented Sep 1, 2020 •

edited

Loading

Uh oh!

davidjiglesias left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

vicferpoy commented Sep 1, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Tests results

Uh oh!

davidjiglesias left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

vicferpoy commented Sep 1, 2020 •

edited

Loading