mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-03 03:23:23 +08:00
226cfa0378
Linux and works. So that is at least a good sign. =) 20010122 - (bal) OpenBSD Resync - markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by markus [servconf.c ssh.h sshd.c] only auth-chall.c needs #ifdef SKEY - markus@cvs.openbsd.org 2001/01/19 15:55:10 GMT 2001 by markus [auth-krb4.c auth-options.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth1.c auth2.c channels.c clientloop.c dh.c dispatch.c nchan.c packet.c pathname.h readconf.c scp.c servconf.c serverloop.c session.c ssh-add.c ssh-keygen.c ssh-keyscan.c ssh.c ssh.h ssh1.h sshconnect1.c sshd.c ttymodes.c] move ssh1 definitions to ssh1.h, pathnames to pathnames.h - markus@cvs.openbsd.org 2001/01/19 16:48:14 [sshd.8] fix typo; from stevesk@ - markus@cvs.openbsd.org 2001/01/19 16:50:58 [ssh-dss.c] clear and free digest, make consistent with other code (use dlen); from stevesk@ - markus@cvs.openbsd.org 2001/01/20 15:55:20 GMT 2001 by markus [auth-options.c auth-options.h auth-rsa.c auth2.c] pass the filename to auth_parse_options() - markus@cvs.openbsd.org 2001/01/20 17:59:40 GMT 2001 [readconf.c] fix SIGSEGV from -o ""; problem noted by jehsom@togetherweb.com - stevesk@cvs.openbsd.org 2001/01/20 18:20:29 [sshconnect2.c] dh_new_group() does not return NULL. ok markus@ - markus@cvs.openbsd.org 2001/01/20 21:33:42 [ssh-add.c] do not loop forever if askpass does not exist; from andrew@pimlott.ne.mediaone.net - djm@cvs.openbsd.org 2001/01/20 23:00:56 [servconf.c] Check for NULL return from strdelim; ok markus - djm@cvs.openbsd.org 2001/01/20 23:02:07 [readconf.c] KNF; ok markus - jakob@cvs.openbsd.org 2001/01/21 9:00:33 [ssh-keygen.1] remove -R flag; ok markus@ - markus@cvs.openbsd.org 2001/01/21 19:05:40 [atomicio.c automicio.h auth-chall.c auth-krb4.c auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c bufaux.c bufaux.h buffer.c canahost.c canahost.h channels.c cipher.c cli.c clientloop.c clientloop.h compat.c compress.c deattack.c dh.c dispatch.c groupaccess.c hmac.c hostfile.c kex.c key.c key.h log-client.c log-server.c log.c log.h login.c login.h match.c misc.c misc.h nchan.c packet.c pty.c radix.h readconf.c readpass.c readpass.h rsa.c scp.c servconf.c serverloop.c serverloop.h session.c sftp-server.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c ssh-rsa.c ssh.c ssh.h sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c sshd.c tildexpand.c tildexpand.h ttysmodes.c uidswap.c xmalloc.c] split ssh.h and try to cleanup the #include mess. remove unnecessary #includes. rename util.[ch] -> misc.[ch] - (bal) renamed 'PIDDIR' to '_PATH_SSH_PIDDIR' to match OpenBSD tree - (bal) Moved #ifdef KRB4 in auth-krb4.c above the #include to resolve conflict when compiling for non-kerb install - (bal) removed the #ifdef SKEY in auth1.c to match Markus' changes on 1/19.
168 lines
4.2 KiB
C
168 lines
4.2 KiB
C
#include "includes.h"
|
|
RCSID("$Id: auth2-pam.c,v 1.6 2001/01/22 05:34:40 mouring Exp $");
|
|
|
|
#ifdef USE_PAM
|
|
#include <security/pam_appl.h>
|
|
|
|
#include "ssh.h"
|
|
#include "ssh2.h"
|
|
#include "auth.h"
|
|
#include "packet.h"
|
|
#include "xmalloc.h"
|
|
#include "dispatch.h"
|
|
#include "log.h"
|
|
|
|
struct {
|
|
int finished, num_received, num_expected;
|
|
int *prompts;
|
|
struct pam_response *responses;
|
|
} context_pam2 = {0, 0, 0, NULL};
|
|
|
|
static int do_conversation2(int num_msg, const struct pam_message **msg,
|
|
struct pam_response **resp, void *appdata_ptr);
|
|
|
|
static struct pam_conv
|
|
conv2 = {
|
|
do_conversation2,
|
|
NULL,
|
|
};
|
|
|
|
void input_userauth_info_response_pam(int type, int plen, void *ctxt);
|
|
|
|
int
|
|
auth2_pam(Authctxt *authctxt)
|
|
{
|
|
int retval = -1;
|
|
|
|
if (authctxt->user == NULL)
|
|
fatal("auth2_pam: internal error: no user");
|
|
|
|
conv2.appdata_ptr = authctxt;
|
|
pam_set_conv(&conv2);
|
|
|
|
dispatch_set(SSH2_MSG_USERAUTH_INFO_RESPONSE,
|
|
&input_userauth_info_response_pam);
|
|
retval = (do_pam_authenticate(0) == PAM_SUCCESS);
|
|
dispatch_set(SSH2_MSG_USERAUTH_INFO_RESPONSE, NULL);
|
|
|
|
return retval;
|
|
}
|
|
|
|
static int
|
|
do_conversation2(int num_msg, const struct pam_message **msg,
|
|
struct pam_response **resp, void *appdata_ptr)
|
|
{
|
|
int echo = 0, i = 0, j = 0, done = 0;
|
|
char *tmp = NULL, *text = NULL;
|
|
|
|
context_pam2.finished = 0;
|
|
context_pam2.num_received = 0;
|
|
context_pam2.num_expected = 0;
|
|
context_pam2.prompts = xmalloc(sizeof(int) * num_msg);
|
|
context_pam2.responses = xmalloc(sizeof(struct pam_response) * num_msg);
|
|
memset(context_pam2.responses, 0, sizeof(struct pam_response) * num_msg);
|
|
|
|
packet_start(SSH2_MSG_USERAUTH_INFO_REQUEST);
|
|
packet_put_cstring(""); /* Name */
|
|
packet_put_cstring(""); /* Instructions */
|
|
packet_put_cstring(""); /* Language */
|
|
for (i = 0, j = 0; i < num_msg; i++) {
|
|
if((PAM_MSG_MEMBER(msg, i, msg_style) == PAM_PROMPT_ECHO_ON) ||
|
|
(PAM_MSG_MEMBER(msg, i, msg_style) == PAM_PROMPT_ECHO_OFF) ||
|
|
(i == num_msg - 1)) {
|
|
j++;
|
|
}
|
|
}
|
|
packet_put_int(j); /* Number of prompts. */
|
|
context_pam2.num_expected = j;
|
|
for (i = 0, j = 0; i < num_msg; i++) {
|
|
switch(PAM_MSG_MEMBER(msg, i, msg_style)) {
|
|
case PAM_PROMPT_ECHO_ON:
|
|
echo = 1;
|
|
break;
|
|
case PAM_PROMPT_ECHO_OFF:
|
|
echo = 0;
|
|
break;
|
|
default:
|
|
echo = 0;
|
|
break;
|
|
}
|
|
if(text) {
|
|
tmp = xmalloc(strlen(text) + strlen(PAM_MSG_MEMBER(msg, i, msg)) + 2);
|
|
strcpy(tmp, text);
|
|
strcat(tmp, "\n");
|
|
strcat(tmp, PAM_MSG_MEMBER(msg, i, msg));
|
|
xfree(text);
|
|
text = tmp;
|
|
tmp = NULL;
|
|
} else {
|
|
text = xstrdup(PAM_MSG_MEMBER(msg, i, msg));
|
|
}
|
|
if((PAM_MSG_MEMBER(msg, i, msg_style) == PAM_PROMPT_ECHO_ON) ||
|
|
(PAM_MSG_MEMBER(msg, i, msg_style) == PAM_PROMPT_ECHO_OFF) ||
|
|
(i == num_msg - 1)) {
|
|
debug("sending prompt ssh-%d(pam-%d) = \"%s\"",
|
|
j, i, text);
|
|
context_pam2.prompts[j++] = i;
|
|
packet_put_cstring(text);
|
|
packet_put_char(echo);
|
|
xfree(text);
|
|
text = NULL;
|
|
}
|
|
}
|
|
packet_send();
|
|
packet_write_wait();
|
|
|
|
/* Grabbing control of execution and spinning until we get what
|
|
* we want is probably rude, but it seems to work properly, and
|
|
* the client *should* be in lock-step with us, so the loop should
|
|
* only be traversed once. */
|
|
while(context_pam2.finished == 0) {
|
|
done = 1;
|
|
dispatch_run(DISPATCH_BLOCK, &done, appdata_ptr);
|
|
if(context_pam2.finished == 0) {
|
|
debug("extra packet during conversation");
|
|
}
|
|
}
|
|
|
|
if(context_pam2.num_received == context_pam2.num_expected) {
|
|
*resp = context_pam2.responses;
|
|
return PAM_SUCCESS;
|
|
} else {
|
|
return PAM_CONV_ERR;
|
|
}
|
|
}
|
|
|
|
void
|
|
input_userauth_info_response_pam(int type, int plen, void *ctxt)
|
|
{
|
|
Authctxt *authctxt = ctxt;
|
|
unsigned int nresp = 0, rlen = 0, i = 0;
|
|
char *resp;
|
|
|
|
if (authctxt == NULL)
|
|
fatal("input_userauth_info_response_pam: no authentication context");
|
|
|
|
if (authctxt->attempt++ >= AUTH_FAIL_MAX)
|
|
packet_disconnect("too many failed userauth_requests");
|
|
|
|
nresp = packet_get_int(); /* Number of responses. */
|
|
debug("got %d responses", nresp);
|
|
|
|
for (i = 0; i < nresp; i++) {
|
|
int j = context_pam2.prompts[i];
|
|
resp = packet_get_string(&rlen);
|
|
debug("response ssh-%d(pam-%d) = \"%s\"", i, j, resp);
|
|
context_pam2.responses[j].resp_retcode = PAM_SUCCESS;
|
|
context_pam2.responses[j].resp = xstrdup(resp);
|
|
xfree(resp);
|
|
context_pam2.num_received++;
|
|
}
|
|
|
|
context_pam2.finished = 1;
|
|
|
|
packet_done();
|
|
}
|
|
|
|
#endif
|