ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-03-03 18:52:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

channel.h: make definition extern

Browse Source 
svr-authpam.c: be smarter comparing pam prompts

--HG--
extra : convert_revision : 6962b52a31b14eb017c838d5242f476e1726f84c
This commit is contained in:
Matt Johnston 2005-07-29 05:37:20 +00:00
parent b8e28df43a
commit 20ceb493b6
2 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channel.h
View File

@ -119,7 +119,7 @@ void common_recv_msg_channel_data(struct Channel *channel, int fd,
circbuffer * buf); circbuffer * buf);
#ifdef DROPBEAR_CLIENT #ifdef DROPBEAR_CLIENT
const struct ChanType clichansess; extern const struct ChanType clichansess;
#endif #endif
#if defined(USING_LISTENERS) || defined(DROPBEAR_CLIENT) #if defined(USING_LISTENERS) || defined(DROPBEAR_CLIENT)

50
svr-authpam.c
View File

@ -54,34 +54,58 @@ pamConvFunc(int num_msg,
int rc = PAM_SUCCESS; int rc = PAM_SUCCESS;
struct pam_response* resp = NULL; struct pam_response* resp = NULL;
struct UserDataS* userDatap = (struct UserDataS*) appdata_ptr; struct UserDataS* userDatap = (struct UserDataS*) appdata_ptr;
unsigned int msg_len = 0;
unsigned int i = 0;
const char* message = (*msg)->msg; const char* message = (*msg)->msg;
// make a copy we can strip
char * compare_message = m_strdup(message);
TRACE(("enter pamConvFunc")) TRACE(("enter pamConvFunc"))
if (num_msg != 1) { if (num_msg != 1) {
/* If you're getting here - Dropbear probably can't support your pam /* If you're getting here - Dropbear probably can't support your pam
* modules. This whole file is a bit of a hack around lack of * modules. This whole file is a bit of a hack around lack of
* asynchronocity in PAM anyway */ * asynchronocity in PAM anyway. */
dropbear_log(LOG_INFO, "pamConvFunc() called with >1 messages: not supported."); dropbear_log(LOG_INFO, "pamConvFunc() called with >1 messages: not supported.");
return PAM_CONV_ERR; return PAM_CONV_ERR;
} }
TRACE(("msg_style is %d", (*msg)->msg_style)) TRACE(("msg_style is %d", (*msg)->msg_style))
if (message) { if (compare_message) {
TRACE(("message is '%s'", message)) TRACE(("message is '%s'", compare_message))
} else { } else {
TRACE(("null message")) TRACE(("null message"))
} }
// Make the string lowercase.
msg_len = strlen(compare_message);
for (i = 0; i < msg_len; i++) {
compare_message[i] = tolower(compare_message[i]);
}
// If the string ends with ": ", remove the space.
// ie "login: " vs "login:"
if (msg_len > 2
&& compare_message[msg_len-2] == ':'
&& compare_message[msg_len-1] == ' ') {
compare_message[msg_len-1] = '\0';
}
switch((*msg)->msg_style) { switch((*msg)->msg_style) {
case PAM_PROMPT_ECHO_OFF: case PAM_PROMPT_ECHO_OFF:
if (strcmp(message, "Password:") != 0) { if (!(strcmp(compare_message, "password:") == 0)) {
TRACE(("PAM_PROMPT_ECHO_OFF: unrecognized prompt")) // We don't recognise the prompt as asking for a password,
rc = PAM_CONV_ERR; // so can't handle it. Add more above as required for
break; // different pam modules/implementations
dropbear_log(LOG_NOTICE, "PAM unknown prompt %s (no echo)",
compare_message);
rc = PAM_CONV_ERR;
break;
} }
/* You have to read the PAM module-writers' docs (do we look like /* You have to read the PAM module-writers' docs (do we look like
@ -99,10 +123,13 @@ pamConvFunc(int num_msg,
case PAM_PROMPT_ECHO_ON: case PAM_PROMPT_ECHO_ON:
if ((strcmp(message, "login: " ) != 0) if (!((strcmp(compare_message, "login:" ) == 0)
&& (strcmp(message, "login:" ) != 0) || (strcmp(compare_message, "please enter username:") == 0))) {
&& (strcmp(message, "Please enter username: " ) != 0)) { // We don't recognise the prompt as asking for a username,
TRACE(("PAM_PROMPT_ECHO_ON: unrecognized prompt")) // so can't handle it. Add more above as required for
// different pam modules/implementations
dropbear_log(LOG_NOTICE, "PAM unknown prompt %s (with echo)",
compare_message);
rc = PAM_CONV_ERR; rc = PAM_CONV_ERR;
break; break;
} }
@ -125,6 +152,7 @@ pamConvFunc(int num_msg,
break; break;
} }
m_free(compare_message);
TRACE(("leave pamConvFunc, rc %d", rc)) TRACE(("leave pamConvFunc, rc %d", rc))
return rc; return rc;