Refactor ospd #120

bjoernricks · 2019-07-30T09:09:42Z

add type hints
cleanup OSPDaemon class
Improve OSPDaemon initalization (add init method)

Debug the osp command which is going to be processed.

Extract initalizing the logging into an own function. Initialize logging before the daemon is started. Create server class depending on the parsed arguments. Don't convert common args. Instead use Namespace object from argparser directly.

* Use print function again to add newlines automatically * Reformat version outputs * Move copyright info into a module variable

Display version switch info as second item if help is displayed.

The init method will be called before the check and run methods. So the new call flow is -> constructor (__init__) -> init -> check -> run The init method can be used to move expensive intialization code (like loading nvts) out of the constructor.

Imho wrapper is a bad name for a specific OSPDaemon instance.

The OSPDaemon, arguments parsing and main function have changed a lot. Therefore indicate the changes with an incremented version number.

Add ca cert validation function to server module and check passed ca cert file.

The files need to validated at the code where they are used too.

* don't log errors to stderr * update to new parser behavior

bjoernricks added 19 commits July 29, 2019 15:21

Add type hints to create_args_parser function

59f3bd7

Store bind-address argument in address property

4091c68

Allow to use -f fore --foreground too

11b9b88

Drop unnecessary arguments from OSPDaemon

7a4cd7b

Remove unused new_client_stream method from OSPDaemon

2d71bc3

Add debug statement for handling a command

38ab2a8

Debug the osp command which is going to be processed.

Refactor main function

c25d21f

Extract initalizing the logging into an own function. Initialize logging before the daemon is started. Create server class depending on the parsed arguments. Don't convert common args. Instead use Namespace object from argparser directly.

Drop unused get_common_args function

60ebefb

Improve print_version function

5e8901e

* Use print function again to add newlines automatically * Reformat version outputs * Move copyright info into a module variable

Move version switch to the top

ac30909

Display version switch info as second item if help is displayed.

Add a init method to OSPDaemon

dba3373

The init method will be called before the check and run methods. So the new call flow is -> constructor (__init__) -> init -> check -> run The init method can be used to move expensive intialization code (like loading nvts) out of the constructor.

Rename wrapper variable to daemon

67f4ba1

Imho wrapper is a bad name for a specific OSPDaemon instance.

Call daemon.init in main function

483a888

Increment version

85f7021

The OSPDaemon, arguments parsing and main function have changed a lot. Therefore indicate the changes with an incremented version number.

Validate ca cert for TlsServer

2c8ec57

Add ca cert validation function to server module and check passed ca cert file.

Remove validation of files from parser

56b5412

The files need to validated at the code where they are used too.

Export Arguments variable for type hints

40d9345

Update parser tests

17081eb

* don't log errors to stderr * update to new parser behavior

Update DummyWrapper to OSPDaemon constructor changes

8a79cf9

bjoernricks requested a review from jjnicola as a code owner July 30, 2019 09:09

jjnicola approved these changes Jul 30, 2019

View reviewed changes

bjoernricks merged commit 5d4c622 into greenbone:master Jul 30, 2019

bjoernricks deleted the refactor-ospd branch July 30, 2019 10:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor ospd #120

Refactor ospd #120

bjoernricks commented Jul 30, 2019

Refactor ospd #120

Refactor ospd #120

Conversation

bjoernricks commented Jul 30, 2019