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

Merge pull request from GHSA-f489-557v-47jq 

Check auth_start_session() result
This commit is contained in:
metalefty 2023-08-24 10:14:48 +09:00 committed by GitHub
parent 4b1482b5df 25a1fab5b6
commit a111a0fdfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sesman/libsesman/verify_user_pam.c
View File

@ -397,8 +397,8 @@ auth_uds(const char *user, enum scp_login_status *errorcode)
/******************************************************************************/ /******************************************************************************/
/* returns error */ /* returns error */
int static int
auth_start_session(struct auth_info *auth_info, int display_num) auth_start_session_private(struct auth_info *auth_info, int display_num)
{ {
int error; int error;
char display[256]; char display[256];
@ -436,6 +436,26 @@ auth_start_session(struct auth_info *auth_info, int display_num)
return 0; return 0;
} }
/******************************************************************************/
/**
* Main routine to start a session
*
* Calls the private routine and logs an additional error if the private
* routine fails
*/
int
auth_start_session(struct auth_info *auth_info, int display_num)
{
int result = auth_start_session_private(auth_info, display_num);
if (result != 0)
{
LOG(LOG_LEVEL_ERROR,
"Can't start PAM session. See PAM logging for more info");
}
return result;
}
/******************************************************************************/ /******************************************************************************/
/* returns error */ /* returns error */
static int static int

24
sesman/libsesman/verify_user_pam_userpass.c
View File

@ -207,8 +207,8 @@ auth_uds(const char *user, enum scp_login_status *errorcode)
/******************************************************************************/ /******************************************************************************/
/* returns error */ /* returns error */
int static int
auth_start_session(struct auth_info *auth_info, int display_num) auth_start_session_private(struct auth_info *auth_info, int display_num)
{ {
int error; int error;
char display[256]; char display[256];
@ -246,6 +246,26 @@ auth_start_session(struct auth_info *auth_info, int display_num)
return 0; return 0;
} }
/******************************************************************************/
/**
* Main routine to start a session
*
* Calls the private routine and logs an additional error if the private
* routine fails
*/
int
auth_start_session(struct auth_info *auth_info, int display_num)
{
int result = auth_start_session_private(auth_info, display_num);
if (result != 0)
{
LOG(LOG_LEVEL_ERROR,
"Can't start PAM session. See PAM logging for more info");
}
return result;
}
/******************************************************************************/ /******************************************************************************/
/* returns error */ /* returns error */
static int static int

7
sesman/sesexec/session.c
View File

@ -568,7 +568,12 @@ session_start_wrapped(struct login_info *login_info,
int window_manager_pid; int window_manager_pid;
enum scp_screate_status status = E_SCP_SCREATE_GENERAL_ERROR; enum scp_screate_status status = E_SCP_SCREATE_GENERAL_ERROR;
auth_start_session(login_info->auth_info, s->display); if (auth_start_session(login_info->auth_info, s->display) != 0)
{
// Errors are logged by the auth module, as they are
// specific to that module
return E_SCP_SCREATE_GENERAL_ERROR;
}
#ifdef USE_BSD_SETLOGIN #ifdef USE_BSD_SETLOGIN
/** /**
* Create a new session and process group since the 4.4BSD * Create a new session and process group since the 4.4BSD