Fix timeout preference handling (backport #486) #489
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
Scripts timeouts are special preferences and in the openvas side are treated in a especial way too. The timeout preference is in the 13th position in the script metadata in redis, and not with other preferences. Also, the timeout is stored in globals with format timeout.<SCRIPT-OID>|||<value>, while other script preferences have the form oid:name:id:type|||value. The user is allowed to send a custom timeout, even when the script has no default one set in the description block (use default 320sec). When the user send a custom timeout the preference is not found and ospd-openvas logs an error message. With this patch, the preference with ID:0 (timeout) is always handled and sent to openvas. (cherry picked from commit 1e90dfa) # Conflicts: # CHANGELOG.md
Codecov Report
@@ Coverage Diff @@
## ospd-openvas-20.08 #489 +/- ##
======================================================
- Coverage 80.43% 80.39% -0.04%
======================================================
Files 9 9
Lines 1559 1561 +2
======================================================
+ Hits 1254 1255 +1
- Misses 305 306 +1
Continue to review full report at Codecov.
|
|
Clossing here. It won't be backport to 20.08 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #486 done by Mergify.
Cherry-pick of 1e90dfa has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/