Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Amended if clauses for the Test if the ssh_elevate_credential differs from the ssh_credential (backport #1586) #1589

Merged
merged 8 commits into from
Jun 28, 2021
Merged

Amended if clauses for the Test if the ssh_elevate_credential differs from the ssh_credential (backport #1586) #1589

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0a15e6b
Amended if clauses for ssh_elevate_credential/ssh_credential Test
jhelmold Jun 24, 2021
5f6b56c
CHANGELOG entry: Amendment ssh_elevate_credential / ssh_credential Test.
jhelmold Jun 24, 2021
9b23218
Changed CHANGELOG entry : Amendment ssh_elevate_credential / ssh_cred…
jhelmold Jun 24, 2021
cc66cd7
Changed CHANGELOG entry: Amendment ssh_elevate_credential / ssh_crede…
jhelmold Jun 24, 2021
b6ff36e
Changed if statement for ssh_elevate_credential/ssh_credential check.
jhelmold Jun 24, 2021
dca03c3
Changed if statement for ssh_elevate_credential/ssh_credential check …
jhelmold Jun 25, 2021
ae4c31f
Clean up CHANGELOG.md entries, resolve conflict
timopollmeier Jun 28, 2021
4e89963
Merge branch 'master' into mergify/bp/master/pr-1586
timopollmeier Jun 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 25 additions & 18 deletions src/manage_sql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30658,7 +30658,7 @@ create_target (const char* name, const char* asset_hosts_filter,
if (ssh_elevate_credential && (!ssh_credential))
return 14;

if (ssh_elevate_credential == ssh_credential)
if (ssh_credential && (ssh_elevate_credential == ssh_credential))
return 15;

sql_begin_immediate ();
Expand Down Expand Up @@ -31108,7 +31108,9 @@ delete_target (const char *target_id, int ultimate)
* 18 invalid SSH credential type, 19 invalid SMB credential type,
* 20 invalid ESXi credential type, 21 invalid SNMP credential type,
* 22 failed to find SSH elevate cred, 23 invalid SSH elevate
* credential type, 99 permission denied, -1 error.
* credential type, 24 SSH elevate credential without SSH credential,
* 25 SSH elevate credential equals SSH credential,
* 99 permission denied, -1 error.
*/
int
modify_target (const char *target_id, const char *name, const char *hosts,
Expand All @@ -31122,6 +31124,8 @@ modify_target (const char *target_id, const char *name, const char *hosts,
const char *allow_simultaneous_ips)
{
target_t target;
credential_t ssh_credential = 0;
credential_t ssh_elevate_credential = 0;

assert (target_id);

Expand All @@ -31141,18 +31145,6 @@ modify_target (const char *target_id, const char *name, const char *hosts,
return 13;
}

if (ssh_elevate_credential_id && (!ssh_credential_id))
{
sql_rollback ();
return 24;
}

if (ssh_elevate_credential_id == ssh_credential_id)
{
sql_rollback ();
return 25;
}

target = 0;
if (find_target_with_permission (target_id, &target, "modify_target"))
{
Expand Down Expand Up @@ -31273,8 +31265,6 @@ modify_target (const char *target_id, const char *name, const char *hosts,

if (ssh_credential_id)
{
credential_t ssh_credential;

if (target_in_use (target))
{
sql_rollback ();
Expand Down Expand Up @@ -31329,8 +31319,6 @@ modify_target (const char *target_id, const char *name, const char *hosts,

if (ssh_elevate_credential_id)
{
credential_t ssh_elevate_credential;

if (target_in_use (target))
{
sql_rollback ();
Expand Down Expand Up @@ -31495,6 +31483,25 @@ modify_target (const char *target_id, const char *name, const char *hosts,
set_target_login_data (target, "snmp", 0, 0);
}

if (ssh_credential_id || ssh_elevate_credential_id)
{
if (!ssh_credential_id)
ssh_credential = target_ssh_credential (target);
if (!ssh_elevate_credential_id)
ssh_elevate_credential = target_ssh_elevate_credential (target);

if (ssh_elevate_credential && !ssh_credential)
{
sql_rollback ();
return 24;
}
if (ssh_credential && (ssh_credential == ssh_elevate_credential))
{
sql_rollback ();
return 25;
}
}

if (exclude_hosts)
{
gchar *quoted_exclude_hosts, *quoted_hosts, *clean, *clean_exclude;
Expand Down