Skip to content

Change: move add_users to dedicated users files #2711

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

Merged
greenbonebot merged 2 commits into from
Jan 13, 2026
+275 −261
Merged

Change: move add_users to dedicated users files #2711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9535336
Fix: remove stray headers
mattmundell Jan 12, 2026
da6304d
Change: move add_users to dedicated users files
mattmundell Jan 12, 2026
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
17 changes: 0 additions & 17 deletions src/manage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5558,23 +5558,6 @@ manage_read_info (gchar *type, gchar *uid, gchar *name, gchar **result)

/* Users. */

/**
*
* @brief Validates a username.
*
* @param[in] name The name.
*
* @return 0 if the username is valid, 1 if not.
*/
int
validate_username (const gchar * name)
{
if (g_regex_match_simple ("^[[:alnum:]_.-]+$", name, 0, 0))
return 0;
else
return 1;
}


/* Resource aggregates. */

Expand Down
6 changes: 0 additions & 6 deletions src/manage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3208,12 +3208,6 @@ manage_set_password (GSList *, const db_conn_info_t *, const gchar *,
gchar *
manage_user_hash (const gchar *);

gchar *
manage_user_uuid (const gchar *, auth_method_t);

int
manage_user_exists (const gchar *, auth_method_t);

int
copy_user (const char*, const char*, const char*, user_t*);

Expand Down
239 changes: 2 additions & 237 deletions src/manage_sql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,6 @@ int delete_reports (task_t);
int
stop_task_internal (task_t);

int
validate_username (const gchar *);


/* Static headers. */

Expand Down Expand Up @@ -5666,35 +5663,12 @@ manage_user_hash (const gchar *username)
return hash;
}

/**
* @brief Get user uuid.
*
* @param[in] username User name.
* @param[in] method Authentication method.
*
* @return UUID.
*/
static gchar *
user_uuid_method (const gchar *username, auth_method_t method)
{
gchar *uuid, *quoted_username, *quoted_method;
quoted_username = sql_quote (username);
quoted_method = sql_quote (auth_method_name (method));
uuid = sql_string ("SELECT uuid FROM users"
" WHERE name = '%s' AND method = '%s';",
quoted_username,
quoted_method);
g_free (quoted_username);
g_free (quoted_method);
return uuid;
}

/**
* @brief Check whether LDAP is enabled.
*
* @return 0 no, else yes.
*/
static int
int
ldap_auth_enabled ()
{
if (gvm_auth_ldap_enabled ())
Expand All @@ -5709,7 +5683,7 @@ ldap_auth_enabled ()
*
* @return 0 no, else yes.
*/
static int
int
radius_auth_enabled ()
{
if (gvm_auth_radius_enabled ())
Expand All @@ -5719,54 +5693,6 @@ radius_auth_enabled ()
return 0;
}


/**
* @brief Check if user exists.
*
* @param[in] name User name.
* @param[in] method Auth method.
*
* @return 1 yes, 0 no.
*/
static int
user_exists_method (const gchar *name, auth_method_t method)
{
gchar *quoted_name, *quoted_method;
int ret;

quoted_name = sql_quote (name);
quoted_method = sql_quote (auth_method_name (method));
ret = sql_int ("SELECT count (*) FROM users"
" WHERE name = '%s' AND method = '%s';",
quoted_name,
quoted_method);
g_free (quoted_name);
g_free (quoted_method);

return ret;
}

/**
* @brief Get user uuid, trying all authentication methods.
*
* @param[in] name User name.
*
* @return UUID.
*/
static gchar *
user_uuid_any_method (const gchar *name)
{
if (ldap_auth_enabled ()
&& user_exists_method (name, AUTHENTICATION_METHOD_LDAP_CONNECT))
return user_uuid_method (name, AUTHENTICATION_METHOD_LDAP_CONNECT);
if (radius_auth_enabled ()
&& user_exists_method (name, AUTHENTICATION_METHOD_RADIUS_CONNECT))
return user_uuid_method (name, AUTHENTICATION_METHOD_RADIUS_CONNECT);
if (user_exists_method (name, AUTHENTICATION_METHOD_FILE))
return user_uuid_method (name, AUTHENTICATION_METHOD_FILE);
return NULL;
}

/**
* @brief Ensure the user exists in the database.
*
Expand Down Expand Up @@ -5817,25 +5743,6 @@ user_ensure_in_db (const gchar *name, const gchar *method)
return 0;
}

/**
* @brief Check if user exists.
*
* @param[in] name User name.
*
* @return 1 yes, 0 no.
*/
static int
user_exists (const gchar *name)
{
if (ldap_auth_enabled ()
&& user_exists_method (name, AUTHENTICATION_METHOD_LDAP_CONNECT))
return 1;
if (radius_auth_enabled ()
&& user_exists_method (name, AUTHENTICATION_METHOD_RADIUS_CONNECT))
return 1;
return user_exists_method (name, AUTHENTICATION_METHOD_FILE);
}

/**
* @brief Set credentials for authenticate.
*
Expand Down Expand Up @@ -37915,148 +37822,6 @@ manage_default_ca_cert ()

/* Users. */

/**
* @brief Add users to a group or role.
*
* Caller must take care of transaction.
*
* @param[in] type Type.
* @param[in] resource Group or role.
* @param[in] users List of users.
*
* @return 0 success, 2 failed to find user, 4 user name validation failed,
* 99 permission denied, -1 error.
*/
int
add_users (const gchar *type, resource_t resource, const char *users)
{
if (users)
{
gchar **split, **point;
GList *added;

/* Add each user. */

added = NULL;
split = g_strsplit_set (users, " ,", 0);
point = split;

while (*point)
{
user_t user;
gchar *name;

name = *point;

g_strstrip (name);

if (strcmp (name, "") == 0)
{
point++;
continue;
}

if (g_list_find_custom (added, name, (GCompareFunc) strcmp))
{
point++;
continue;
}

added = g_list_prepend (added, name);

if (user_exists (name) == 0)
{
g_list_free (added);
g_strfreev (split);
return 2;
}

if (find_user_by_name (name, &user))
{
g_list_free (added);
g_strfreev (split);
return -1;
}

if (user == 0)
{
gchar *uuid;

if (validate_username (name))
{
g_list_free (added);
g_strfreev (split);
return 4;
}

uuid = user_uuid_any_method (name);

if (uuid == NULL)
{
g_list_free (added);
g_strfreev (split);
return -1;
}

if (sql_int ("SELECT count(*) FROM users WHERE uuid = '%s';",
uuid)
== 0)
{
gchar *quoted_name;
quoted_name = sql_quote (name);
sql ("INSERT INTO users"
" (uuid, name, creation_time, modification_time)"
" VALUES"
" ('%s', '%s', m_now (), m_now ());",
uuid,
quoted_name);
g_free (quoted_name);

user = sql_last_insert_id ();
}
else
{
/* find_user_by_name should have found it. */
assert (0);
g_free (uuid);
g_list_free (added);
g_strfreev (split);
return -1;
}

g_free (uuid);
}

if (find_user_by_name_with_permission (name, &user, "get_users"))
{
g_list_free (added);
g_strfreev (split);
return -1;
}

if (user == 0)
{
g_list_free (added);
g_strfreev (split);
return 99;
}

sql ("INSERT INTO %s_users (\"%s\", \"user\") VALUES (%llu, %llu);",
type,
type,
resource,
user);

point++;
}

g_list_free (added);
g_strfreev (split);
}

return 0;
}

/**
* @brief Create the given user.
*
Expand Down
5 changes: 4 additions & 1 deletion src/manage_sql.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,9 @@ int
vector_find_filter (const gchar **, const gchar *);

int
add_users (const gchar *, resource_t, const char *);
ldap_auth_enabled ();

int
radius_auth_enabled ();

#endif /* not _GVMD_MANAGE_SQL_H */
1 change: 1 addition & 0 deletions src/manage_sql_groups.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "manage_sql_groups.h"
#include "manage_acl.h"
#include "manage_sql.h"
#include "manage_sql_users.h"
#include "sql.h"

/**
Expand Down
1 change: 1 addition & 0 deletions src/manage_sql_roles.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "manage_sql_roles.h"
#include "manage_acl.h"
#include "manage_sql.h"
#include "manage_sql_users.h"
#include "sql.h"

/**
Expand Down
Loading
Loading