mirrors
/
xrdp
mirror of https://github.com/neutrinolabs/xrdp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move session_list to struct list * 

This commit now uses the standard list module to manage the active
session list, rather than having special code to do this.
This commit is contained in:
matt335672 2023-03-22 16:25:28 +00:00
parent 1a9d15bef0
commit 3d95954d87
4 changed files with 376 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
sesman/scp_process.c
View File

@ -209,8 +209,8 @@ allocate_and_start_session(struct auth_info *auth_info,
const struct session_parameters *params)
{
int pid = 0;
struct session_chain *temp = (struct session_chain *)NULL;
enum scp_screate_status status;
struct session_item *si;
/* check to limit concurrent sessions */
if (session_list_get_count() >= (unsigned int)g_cfg->sess.max_sessions)
@ -220,22 +220,11 @@ allocate_and_start_session(struct auth_info *auth_info,
return E_SCP_SCREATE_MAX_REACHED;
}
temp = (struct session_chain *)g_malloc(sizeof(struct session_chain), 0);
if (temp == 0)
si = session_new();
if (si == NULL)
{
LOG(LOG_LEVEL_ERROR, "Out of memory error: cannot create new session "
"chain element - user %s", username);
return E_SCP_SCREATE_NO_MEMORY;
}
temp->item = (struct session_item *)g_malloc(sizeof(struct session_item), 0);
if (temp->item == 0)
{
g_free(temp);
LOG(LOG_LEVEL_ERROR, "Out of memory error: cannot create new session "
"item - user %s", username);
"element - user %s", username);
return E_SCP_SCREATE_NO_MEMORY;
}
@ -252,23 +241,26 @@ allocate_and_start_session(struct auth_info *auth_info,
LOG(LOG_LEVEL_INFO, "++ created session: username %s", username);
}
temp->item->pid = pid;
temp->item->display = params->display;
temp->item->width = params->width;
temp->item->height = params->height;
temp->item->bpp = params->bpp;
temp->item->auth_info = auth_info;
g_strncpy(temp->item->start_ip_addr, ip_addr,
sizeof(temp->item->start_ip_addr) - 1);
temp->item->uid = params->uid;
temp->item->guid = params->guid;
si->pid = pid;
si->display = params->display;
si->width = params->width;
si->height = params->height;
si->bpp = params->bpp;
si->auth_info = auth_info;
g_strncpy(si->start_ip_addr, ip_addr,
sizeof(si->start_ip_addr) - 1);
si->uid = params->uid;
si->guid = params->guid;
temp->item->start_time = g_time1();
si->start_time = g_time1();
temp->item->type = params->type;
temp->item->status = SESMAN_SESSION_STATUS_ACTIVE;
session_list_add(temp);
si->type = params->type;
si->status = SESMAN_SESSION_STATUS_ACTIVE;
}
else
{
// Remove session item from the list
session_list_kill(-1);
}
return status;

8
sesman/sesman.c
View File

@ -35,6 +35,7 @@
#include "sesman_auth.h"
#include "sesman_config.h"
#include "session_list.h"
#include "lock_uds.h"
#include "os_calls.h"
#include "scp.h"
@ -966,7 +967,12 @@ main(int argc, char **argv)
g_chmod_hex("/tmp/.X11-unix", 0x1777);
}
error = sesman_main_loop();
error = session_module_init();
if (error == 0)
{
error = sesman_main_loop();
session_module_cleanup();
}
/* clean up PID file on exit */
if (daemon)

597
sesman/session_list.c
View File

@ -44,119 +44,100 @@
#include "string_calls.h"
#include "xrdp_sockets.h"
static struct session_chain *g_sessions;
static int g_session_count;
static struct list *g_session_list = NULL;
#define SESSION_IN_USE(si) \
((si) != NULL && \
(si)->display >= 0 && \
(si)->pid > 0)
/******************************************************************************/
int
session_module_init(void)
{
int rv = 1;
if (g_session_list == NULL)
{
g_session_list = list_create_sized(g_cfg->sess.max_sessions);
}
if (g_session_list == NULL)
{
LOG(LOG_LEVEL_ERROR, "Can't allocate session list");
}
else
{
g_session_list->auto_free = 0;
rv = 0;
}
return rv;
}
/******************************************************************************/
/**
* Frees resources allocated to a session_item
*
* @param si Session item
*
* @note Any pointer to this item on g_session_list will be invalid
* after this call.
*/
static void
free_session(struct session_item *si)
{
if (si != NULL)
{
if (si->auth_info != NULL)
{
auth_end(si->auth_info);
}
g_free(si);
}
}
/******************************************************************************/
void
session_module_cleanup(void)
{
if (g_session_list != NULL)
{
int i;
for (i = 0 ; i < g_session_list->count ; ++i)
{
struct session_item *si;
si = (struct session_item *)list_get_item(g_session_list, i);
free_session(si);
}
list_delete(g_session_list);
g_session_list = NULL;
}
}
/******************************************************************************/
unsigned int
session_list_get_count(void)
{
return g_session_count;
}
/******************************************************************************/
void
session_list_add(struct session_chain *element)
{
element->next = g_sessions;
g_sessions = element;
g_session_count++;
return g_session_list->count;
}
/******************************************************************************/
struct session_item *
session_list_get_bydata(uid_t uid,
enum scp_session_type type,
unsigned short width,
unsigned short height,
unsigned char bpp,
const char *ip_addr)
session_new(void)
{
char policy_str[64];
struct session_chain *tmp;
int policy = g_cfg->sess.policy;
if ((policy & SESMAN_CFG_SESS_POLICY_DEFAULT) != 0)
struct session_item *result = g_new0(struct session_item, 1);
if (result != NULL)
{
/* In the past (i.e. xrdp before v0.9.14), the default
* session policy varied by type. If this is needed again
* in the future, here is the place to add it */
policy = SESMAN_CFG_SESS_POLICY_U | SESMAN_CFG_SESS_POLICY_B;
result->pid = -1;
result->display = -1;
if (!list_add_item(g_session_list, (tintptr)result))
{
g_free(result);
result = NULL;
}
}
config_output_policy_string(policy, policy_str, sizeof(policy_str));
LOG(LOG_LEVEL_DEBUG,
"%s: search policy=%s type=%s U=%d B=%d D=(%dx%d) I=%s",
__func__,
policy_str, SCP_SESSION_TYPE_TO_STR(type),
uid, bpp, width, height,
ip_addr);
/* 'Separate' policy never matches */
if (policy & SESMAN_CFG_SESS_POLICY_SEPARATE)
{
LOG(LOG_LEVEL_DEBUG, "%s: No matches possible", __func__);
return NULL;
}
for (tmp = g_sessions ; tmp != 0 ; tmp = tmp->next)
{
struct session_item *item = tmp->item;
LOG(LOG_LEVEL_DEBUG,
"%s: try %p type=%s U=%d B=%d D=(%dx%d) I=%s",
__func__,
item,
SCP_SESSION_TYPE_TO_STR(item->type),
item->uid,
item->bpp,
item->width, item->height,
item->start_ip_addr);
if (item->type != type)
{
LOG(LOG_LEVEL_DEBUG, "%s: Type doesn't match", __func__);
continue;
}
if ((policy & SESMAN_CFG_SESS_POLICY_U) && (int)uid != item->uid)
{
LOG(LOG_LEVEL_DEBUG,
"%s: UID doesn't match for 'U' policy", __func__);
continue;
}
if ((policy & SESMAN_CFG_SESS_POLICY_B) && item->bpp != bpp)
{
LOG(LOG_LEVEL_DEBUG,
"%s: bpp doesn't match for 'B' policy", __func__);
continue;
}
if ((policy & SESMAN_CFG_SESS_POLICY_D) &&
(item->width != width || item->height != height))
{
LOG(LOG_LEVEL_DEBUG,
"%s: Dimensions don't match for 'D' policy", __func__);
continue;
}
if ((policy & SESMAN_CFG_SESS_POLICY_I) &&
g_strcmp(item->start_ip_addr, ip_addr) != 0)
{
LOG(LOG_LEVEL_DEBUG,
"%s: IPs don't match for 'I' policy", __func__);
continue;
}
LOG(LOG_LEVEL_DEBUG,
"%s: Got match, display=%d", __func__, item->display);
return item;
}
LOG(LOG_LEVEL_DEBUG, "%s: No matches found", __func__);
return 0;
return result;
}
/******************************************************************************/
@ -261,56 +242,211 @@ x_server_running_check_ports(int display)
}
/******************************************************************************/
/* called with the main thread
returns boolean */
/* Helper function for get_sorted_display_list():qsort() */
static int
is_display_in_chain(int display)
icmp(const void *i1, const void *i2)
{
struct session_chain *chain;
struct session_item *item;
return *(const unsigned int *)i2 - *(const unsigned int *)i1;
}
chain = g_sessions;
/******************************************************************************/
/**
* Get a sorted array of all the displays allocated to sessions
* @param[out] cnt Count of displays in list
* @return Allocated array of displays or NULL for no memory
*
* Result must always be freed, even if cnt == 0
*/
while (chain != 0)
static unsigned int *
get_sorted_session_displays(unsigned int *cnt)
{
unsigned int *displays;
*cnt = 0;
displays = g_new(unsigned int, session_list_get_count() + 1);
if (displays == NULL)
{
item = chain->item;
LOG(LOG_LEVEL_ERROR, "Can't allocate memory for display list");
}
else if (g_session_list != NULL)
{
int i;
if (item->display == display)
for (i = 0 ; i < g_session_list->count ; ++i)
{
return 1;
const struct session_item *si;
si = (const struct session_item *)list_get_item(g_session_list, i);
if (SESSION_IN_USE(si) && si->display >= 0)
{
displays[(*cnt)++] = si->display;
}
}
chain = chain->next;
qsort(displays, *cnt, sizeof(displays[0]), icmp);
}
return 0;
return displays;
}
/******************************************************************************/
int
session_list_get_available_display(void)
{
int display;
int rv = -1;
unsigned int max_alloc = 0;
display = g_cfg->sess.x11_display_offset;
while ((display - g_cfg->sess.x11_display_offset) <= g_cfg->sess.max_sessions)
// Find all displays already allocated. We do this to prevent
// unnecessary file system accesses, and also to prevent us allocating
// the same display number to two callers who call in quick
// succession i.e. if the first caller has not created its X server
// by the time we service the second request
unsigned int *allocated_displays = get_sorted_session_displays(&max_alloc);
if (allocated_displays != NULL)
{
if (!is_display_in_chain(display))
unsigned int i = 0;
unsigned int display;
for (display = g_cfg->sess.x11_display_offset;
display <= g_cfg->sess.max_display_number;
++display)
{
// Have we already allocated this one?
while (i < max_alloc && display > allocated_displays[i])
{
++i;
}
if (i < max_alloc && display == allocated_displays[i])
{
continue; // Already allocated
}
if (!x_server_running_check_ports(display))
{
return display;
break;
}
}
display++;
g_free(allocated_displays);
if (display > g_cfg->sess.max_display_number)
{
LOG(LOG_LEVEL_ERROR,
"X server -- no display in range (%d to %d) is available",
g_cfg->sess.x11_display_offset,
g_cfg->sess.max_display_number);
}
else
{
rv = display;
}
}
LOG(LOG_LEVEL_ERROR, "X server -- no display in range (%d to %d) is available",
g_cfg->sess.x11_display_offset,
g_cfg->sess.x11_display_offset + g_cfg->sess.max_sessions);
return 0;
return rv;
}
/******************************************************************************/
struct session_item *
session_list_get_bydata(uid_t uid,
enum scp_session_type type,
unsigned short width,
unsigned short height,
unsigned char bpp,
const char *ip_addr)
{
char policy_str[64];
int policy = g_cfg->sess.policy;
int i;
if (ip_addr == NULL)
{
ip_addr = "";
}
if ((policy & SESMAN_CFG_SESS_POLICY_DEFAULT) != 0)
{
/* Before xrdp v0.9.14, the default
* session policy varied by type. If this is needed again
* in the future, here is the place to add it */
policy = SESMAN_CFG_SESS_POLICY_U | SESMAN_CFG_SESS_POLICY_B;
}
config_output_policy_string(policy, policy_str, sizeof(policy_str));
LOG(LOG_LEVEL_DEBUG,
"%s: search policy=%s type=%s U=%d B=%d D=(%dx%d) I=%s",
__func__,
policy_str, SCP_SESSION_TYPE_TO_STR(type),
uid, bpp, width, height,
ip_addr);
/* 'Separate' policy never matches */
if (policy & SESMAN_CFG_SESS_POLICY_SEPARATE)
{
LOG(LOG_LEVEL_DEBUG, "%s: No matches possible", __func__);
return NULL;
}
for (i = 0 ; i < g_session_list->count ; ++i)
{
struct session_item *si;
si = (struct session_item *)list_get_item(g_session_list, i);
if (!SESSION_IN_USE(si))
{
continue;
}
LOG(LOG_LEVEL_DEBUG,
"%s: try %p type=%s U=%d B=%d D=(%dx%d) I=%s",
__func__,
si,
SCP_SESSION_TYPE_TO_STR(si->type),
si->uid, si->bpp,
si->width, si->height,
si->start_ip_addr);
if (si->type != type)
{
LOG(LOG_LEVEL_DEBUG, "%s: Type doesn't match", __func__);
continue;
}
if ((policy & SESMAN_CFG_SESS_POLICY_U) && (int)uid != si->uid)
{
LOG(LOG_LEVEL_DEBUG,
"%s: UID doesn't match for 'U' policy", __func__);
continue;
}
if ((policy & SESMAN_CFG_SESS_POLICY_B) && si->bpp != bpp)
{
LOG(LOG_LEVEL_DEBUG,
"%s: bpp doesn't match for 'B' policy", __func__);
continue;
}
if ((policy & SESMAN_CFG_SESS_POLICY_D) &&
(si->width != width || si->height != height))
{
LOG(LOG_LEVEL_DEBUG,
"%s: Dimensions don't match for 'D' policy", __func__);
continue;
}
if ((policy & SESMAN_CFG_SESS_POLICY_I) &&
g_strcmp(si->start_ip_addr, ip_addr) != 0)
{
LOG(LOG_LEVEL_DEBUG,
"%s: IPs don't match for 'I' policy", __func__);
continue;
}
LOG(LOG_LEVEL_DEBUG,
"%s: Got match, display=%d", __func__, si->display);
return si;
}
LOG(LOG_LEVEL_DEBUG, "%s: No matches found", __func__);
return NULL;
}
/******************************************************************************/
@ -344,172 +480,83 @@ username_from_uid(int uid, char *uname, int uname_len)
enum session_kill_status
session_list_kill(int pid)
{
struct session_chain *tmp;
struct session_chain *prev;
int i = 0;
enum session_kill_status status = SESMAN_SESSION_KILL_NOTFOUND;
tmp = g_sessions;
prev = 0;
while (tmp != 0)
while (i < g_session_list->count)
{
if (tmp->item == 0)
struct session_item *si;
si = (struct session_item *)list_get_item(g_session_list, i);
if (si->pid == pid)
{
LOG(LOG_LEVEL_ERROR, "session descriptor for "
"pid %d is null!", pid);
if (prev == 0)
status = SESMAN_SESSION_KILL_OK;
if (pid > 0)
{
/* prev does no exist, so it's the first element - so we set
g_sessions */
g_sessions = tmp->next;
}
else
{
prev->next = tmp->next;
}
char username[256];
username_from_uid(si->uid, username, sizeof(username));
return SESMAN_SESSION_KILL_NULLITEM;
}
/* Log the deletion */
if (si->auth_info != NULL)
{
LOG(LOG_LEVEL_INFO,
"Calling auth_end for pid %d from pid %d",
pid, g_getpid());
}
if (tmp->item->pid == pid)
{
char username[256];
username_from_uid(tmp->item->uid, username, sizeof(username));
/* deleting the session */
if (tmp->item->auth_info != NULL)
{
LOG(LOG_LEVEL_INFO,
"Calling auth_end for pid %d from pid %d",
pid, g_getpid());
auth_end(tmp->item->auth_info);
tmp->item->auth_info = NULL;
}
LOG(LOG_LEVEL_INFO,
"++ terminated session: UID %d (%s), display :%d.0, "
"session_pid %d, ip %s",
tmp->item->uid, username, tmp->item->display,
tmp->item->pid, tmp->item->start_ip_addr);
g_free(tmp->item);
if (prev == 0)
{
/* prev does no exist, so it's the first element - so we set
g_sessions */
g_sessions = tmp->next;
}
else
{
prev->next = tmp->next;
"++ terminated session: UID %d (%s), display :%d.0, "
"session_pid %d, ip %s",
si->uid, username, si->display,
si->pid, si->start_ip_addr);
}
g_free(tmp);
g_session_count--;
return SESMAN_SESSION_KILL_OK;
free_session(si);
}
else
{
++i;
}
/* go on */
prev = tmp;
tmp = tmp->next;
}
return SESMAN_SESSION_KILL_NOTFOUND;
return status;
}
/******************************************************************************/
void
session_list_sigkill_all(void)
{
struct session_chain *tmp;
int i;
tmp = g_sessions;
while (tmp != 0)
for (i = 0 ; i < g_session_list->count ; ++i)
{
if (tmp->item == 0)
struct session_item *si;
si = (struct session_item *)list_get_item(g_session_list, i);
if (si->pid > 0)
{
LOG(LOG_LEVEL_ERROR, "found null session descriptor!");
g_sigterm(si->pid);
}
else
{
g_sigterm(tmp->item->pid);
}
/* go on */
tmp = tmp->next;
}
}
/******************************************************************************/
struct session_item *
session_list_get_bypid(int pid)
{
struct session_chain *tmp;
struct session_item *dummy;
dummy = g_new0(struct session_item, 1);
if (0 == dummy)
{
LOG(LOG_LEVEL_ERROR, "session_get_bypid: out of memory");
return 0;
}
tmp = g_sessions;
while (tmp != 0)
{
if (tmp->item == 0)
{
LOG(LOG_LEVEL_ERROR, "session descriptor for pid %d is null!", pid);
g_free(dummy);
return 0;
}
if (tmp->item->pid == pid)
{
g_memcpy(dummy, tmp->item, sizeof(struct session_item));
return dummy;
}
/* go on */
tmp = tmp->next;
}
g_free(dummy);
return 0;
}
/******************************************************************************/
struct scp_session_info *
session_list_get_byuid(int uid, unsigned int *cnt, unsigned char flags)
{
struct session_chain *tmp;
int i;
struct scp_session_info *sess;
int count;
int index;
count = 0;
tmp = g_sessions;
LOG(LOG_LEVEL_DEBUG, "searching for session by UID: %d", uid);
while (tmp != 0)
for (i = 0 ; i < g_session_list->count ; ++i)
{
if (uid == tmp->item->uid)
const struct session_item *si;
si = (const struct session_item *)list_get_item(g_session_list, i);
if (SESSION_IN_USE(si) && uid == si->uid && (si->status & flags) != 0)
{
LOG(LOG_LEVEL_DEBUG, "session_list_get_byuid: status=%d, flags=%d, "
"result=%d", (tmp->item->status), flags,
((tmp->item->status) & flags));
if ((tmp->item->status) & flags)
{
count++;
}
count++;
}
/* go on */
tmp = tmp->next;
}
if (count == 0)
@ -527,38 +574,32 @@ session_list_get_byuid(int uid, unsigned int *cnt, unsigned char flags)
return 0;
}
tmp = g_sessions;
index = 0;
while (tmp != 0 && index < count)
for (i = 0 ; i < g_session_list->count ; ++i)
{
if (uid == tmp->item->uid)
const struct session_item *si;
si = (const struct session_item *)list_get_item(g_session_list, i);
if (SESSION_IN_USE(si) && uid == si->uid && (si->status & flags) != 0)
{
if ((tmp->item->status) & flags)
(sess[index]).sid = si->pid;
(sess[index]).display = si->display;
(sess[index]).type = si->type;
(sess[index]).height = si->height;
(sess[index]).width = si->width;
(sess[index]).bpp = si->bpp;
(sess[index]).start_time = si->start_time;
(sess[index]).uid = si->uid;
(sess[index]).start_ip_addr = g_strdup(si->start_ip_addr);
/* Check for string allocation failures */
if ((sess[index]).start_ip_addr == NULL)
{
(sess[index]).sid = tmp->item->pid;
(sess[index]).display = tmp->item->display;
(sess[index]).type = tmp->item->type;
(sess[index]).height = tmp->item->height;
(sess[index]).width = tmp->item->width;
(sess[index]).bpp = tmp->item->bpp;
(sess[index]).start_time = tmp->item->start_time;
(sess[index]).uid = tmp->item->uid;
(sess[index]).start_ip_addr = g_strdup(tmp->item->start_ip_addr);
/* Check for string allocation failures */
if ((sess[index]).start_ip_addr == NULL)
{
free_session_info_list(sess, *cnt);
(*cnt) = 0;
return 0;
}
index++;
free_session_info_list(sess, *cnt);
(*cnt) = 0;
return 0;
}
index++;
}
/* go on */
tmp = tmp->next;
}
(*cnt) = count;

49
sesman/session_list.h
View File

@ -47,7 +47,6 @@ struct session_parameters;
enum session_kill_status
{
SESMAN_SESSION_KILL_OK = 0,
SESMAN_SESSION_KILL_NULLITEM,
SESMAN_SESSION_KILL_NOTFOUND
};
@ -78,11 +77,20 @@ struct session_item
struct guid guid;
};
struct session_chain
{
struct session_chain *next;
struct session_item *item;
};
/**
* Initialise the module
* @return 0 for success
*
* Errors are logged
*/
int
session_module_init(void);
/**
* Clean up the module on program exit
*/
void
session_module_cleanup(void);
/**
* Returns the number of sessions currently active
@ -92,10 +100,21 @@ unsigned int
session_list_get_count(void);
/**
* Adds a new session item to the chain
* Allocates a new session
*
* The PID and display for the allocated session will be -1 and all other
* fields will be blank
*
* @return pointer to new session object or NULL for no memory
*
* After allocating the session successfully, you must initialise the
* PID and display fields with valid numbers.
*
* If you allocate a session and want to remove it due to other problems,
* use session_kill_pid(-1);
*/
void
session_list_add(struct session_chain *element);
struct session_item *
session_new(void);
/**
* Get the next available display
@ -103,7 +122,6 @@ session_list_add(struct session_chain *element);
int
session_list_get_available_display(void);
/**
*
* @brief finds a session matching the supplied parameters
@ -138,17 +156,6 @@ void
session_list_sigkill_all(void);
/**
*
* @brief retrieves a session's descriptor
* @param pid the session pid
* @return a pointer to the session descriptor on success, NULL otherwise
*
*/
struct session_item *
session_list_get_bypid(int pid);
/**
*
* @brief retrieves session descriptions
* @param UID the UID for the descriptions
* @return A block of session descriptions