Extension for a new privilege escalation credential field for targets in GMP (backport #1535) #1542
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}
for the creation and modification of targets. In file gmp.c: Extended the structs create_target_data_t and modify_target_data_t and the enum client_state_t. Adjusted the functions gmp_xml_handle_start_element and gmp_xml_handle_end_element. Adjusted the function call of modify_target and create_target in gmp_xml_handle_end_element. In file manage_sql.c: Extended the functions create_target and modify_target with the new field ssh_elevate_credential and added the required functionality. (cherry picked from commit 049b4de)
Added documentation of the parameter ssh_elevate_credential at the call of create_target. Added documentation of the parameter ssh_elevate_credential_id at the call of modify_target. (cherry picked from commit a40fa21)
in file gmp.c: Added the necessary data structures and code to get the new credential to the function handle_get_targets(). in manage_sql.c: Extended the TARGET_ITERATOR_COLUMNS and TARGET_ITERATOR_FILTER_COLUMNS for the new credential. Added the functions target_iterator_ssh_elevate_credential(), target_iterator_ssh_elevate_trash() and target_ssh_elevate_credential(). (cherry picked from commit 133eecd)
…tial (cherry picked from commit 605b24c) # Conflicts: # CHANGELOG.md
(cherry picked from commit 999d56f)
(cherry picked from commit e7281cf)
(cherry picked from commit 4b4862d)
(cherry picked from commit db13a38)
(cherry picked from commit 3df5829)
in manage_sql.c: Added a check, if there is a ssh_credential when a ssh_elevate_credential is given, in the functions create_target() und modify_target(). If there is no ssh_credential an error code is returned. in gmp.c: Added the according error messages to the error messages sections behind the call of create_target() and modify_target(). (cherry picked from commit 371ed32)
in manage_sql.c: Adjusted and added the documentation of the return values concerned by the new SSH Elevate Credential in the Doxygen-comments of the functions create_target() and modify_target(). (cherry picked from commit dca05f3)
mergify
bot
added
the
conflicts
jhelmold
added
conflicts-resolved
timopollmeier
approved these changes
Jun 2, 2021
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 #1535 done by Mergify.
Cherry-pick of 605b24c has failed:
To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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/