mirror of
git://anongit.mindrot.org/openssh.git
synced 2025-01-16 06:30:58 +00:00
874d77bb13
- markus@cvs.openbsd.org 2000/09/30 10:27:44 [log.c] allow loglevel debug - markus@cvs.openbsd.org 2000/10/03 11:59:57 [packet.c] hmac->mac - markus@cvs.openbsd.org 2000/10/03 12:03:03 [auth-krb4.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth1.c] move fake-auth from auth1.c to individual auth methods, disables s/key in debug-msg - markus@cvs.openbsd.org 2000/10/03 12:16:48 ssh.c do not resolve canonname, i have no idea why this was added oin ossh - markus@cvs.openbsd.org 2000/10/09 15:30:44 ssh-keygen.1 ssh-keygen.c -X now reads private ssh.com DSA keys, too. - markus@cvs.openbsd.org 2000/10/09 15:32:34 auth-options.c clear options on every call. - markus@cvs.openbsd.org 2000/10/09 15:51:00 authfd.c authfd.h interop with ssh-agent2, from <res@shore.net> - markus@cvs.openbsd.org 2000/10/10 14:20:45 compat.c use rexexp for version string matching - provos@cvs.openbsd.org 2000/10/10 22:02:18 [kex.c kex.h myproposal.h ssh.h ssh2.h sshconnect2.c sshd.c dh.c dh.h] First rough implementation of the diffie-hellman group exchange. The client can ask the server for bigger groups to perform the diffie-hellman in, thus increasing the attack complexity when using ciphers with longer keys. University of Windsor provided network, T the company. - markus@cvs.openbsd.org 2000/10/11 13:59:52 [auth-rsa.c auth2.c] clear auth options unless auth sucessfull - markus@cvs.openbsd.org 2000/10/11 14:00:27 [auth-options.h] clear auth options unless auth sucessfull - markus@cvs.openbsd.org 2000/10/11 14:03:27 [scp.1 scp.c] support 'scp -o' with help from mouring@pconline.com - markus@cvs.openbsd.org 2000/10/11 14:11:35 [dh.c] Wall - markus@cvs.openbsd.org 2000/10/11 14:14:40 [auth.h auth2.c readconf.c readconf.h readpass.c servconf.c servconf.h] [ssh.h sshconnect2.c sshd_config auth2-skey.c cli.c cli.h] add support for s/key (kbd-interactive) to ssh2, based on work by mkiernan@avantgo.com and me - markus@cvs.openbsd.org 2000/10/11 14:27:24 [auth.c auth1.c auth2.c authfile.c cipher.c cipher.h kex.c kex.h] [myproposal.h packet.c readconf.c session.c ssh.c ssh.h sshconnect1.c] [sshconnect2.c sshd.c] new cipher framework - markus@cvs.openbsd.org 2000/10/11 14:45:21 [cipher.c] remove DES - markus@cvs.openbsd.org 2000/10/12 03:59:20 [cipher.c cipher.h sshconnect1.c sshconnect2.c sshd.c] enable DES in SSH-1 clients only - markus@cvs.openbsd.org 2000/10/12 08:21:13 [kex.h packet.c] remove unused - markus@cvs.openbsd.org 2000/10/13 12:34:46 [sshd.c] Kludge for F-Secure Macintosh < 1.0.2; appro@fy.chalmers.se - markus@cvs.openbsd.org 2000/10/13 12:59:15 [cipher.c cipher.h myproposal.h rijndael.c rijndael.h] rijndael/aes support - markus@cvs.openbsd.org 2000/10/13 13:10:54 [sshd.8] more info about -V - markus@cvs.openbsd.org 2000/10/13 13:12:02 [myproposal.h] prefer no compression
232 lines
6.3 KiB
C
232 lines
6.3 KiB
C
/*
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
* All rights reserved
|
|
* RSA-based authentication. This code determines whether to admit a login
|
|
* based on RSA authentication. This file also contains functions to check
|
|
* validity of the host key.
|
|
*
|
|
* As far as I am concerned, the code I have written for this software
|
|
* can be used freely for any purpose. Any derived versions of this
|
|
* software must be clearly marked as such, and if the derived work is
|
|
* incompatible with the protocol description in the RFC file, it must be
|
|
* called by a name other than "ssh" or "Secure Shell".
|
|
*/
|
|
|
|
#include "includes.h"
|
|
RCSID("$OpenBSD: auth-options.c,v 1.5 2000/10/09 21:32:34 markus Exp $");
|
|
|
|
#include "ssh.h"
|
|
#include "packet.h"
|
|
#include "xmalloc.h"
|
|
#include "match.h"
|
|
|
|
/* Flags set authorized_keys flags */
|
|
int no_port_forwarding_flag = 0;
|
|
int no_agent_forwarding_flag = 0;
|
|
int no_x11_forwarding_flag = 0;
|
|
int no_pty_flag = 0;
|
|
|
|
/* "command=" option. */
|
|
char *forced_command = NULL;
|
|
|
|
/* "environment=" options. */
|
|
struct envstring *custom_environment = NULL;
|
|
|
|
void
|
|
auth_clear_options(void)
|
|
{
|
|
no_agent_forwarding_flag = 0;
|
|
no_port_forwarding_flag = 0;
|
|
no_pty_flag = 0;
|
|
no_x11_forwarding_flag = 0;
|
|
while (custom_environment) {
|
|
struct envstring *ce = custom_environment;
|
|
custom_environment = ce->next;
|
|
xfree(ce->s);
|
|
xfree(ce);
|
|
}
|
|
if (forced_command) {
|
|
xfree(forced_command);
|
|
forced_command = NULL;
|
|
}
|
|
}
|
|
|
|
/* return 1 if access is granted, 0 if not. side effect: sets key option flags */
|
|
int
|
|
auth_parse_options(struct passwd *pw, char *options, unsigned long linenum)
|
|
{
|
|
const char *cp;
|
|
if (!options)
|
|
return 1;
|
|
|
|
/* reset options */
|
|
auth_clear_options();
|
|
|
|
while (*options && *options != ' ' && *options != '\t') {
|
|
cp = "no-port-forwarding";
|
|
if (strncmp(options, cp, strlen(cp)) == 0) {
|
|
packet_send_debug("Port forwarding disabled.");
|
|
no_port_forwarding_flag = 1;
|
|
options += strlen(cp);
|
|
goto next_option;
|
|
}
|
|
cp = "no-agent-forwarding";
|
|
if (strncmp(options, cp, strlen(cp)) == 0) {
|
|
packet_send_debug("Agent forwarding disabled.");
|
|
no_agent_forwarding_flag = 1;
|
|
options += strlen(cp);
|
|
goto next_option;
|
|
}
|
|
cp = "no-X11-forwarding";
|
|
if (strncmp(options, cp, strlen(cp)) == 0) {
|
|
packet_send_debug("X11 forwarding disabled.");
|
|
no_x11_forwarding_flag = 1;
|
|
options += strlen(cp);
|
|
goto next_option;
|
|
}
|
|
cp = "no-pty";
|
|
if (strncmp(options, cp, strlen(cp)) == 0) {
|
|
packet_send_debug("Pty allocation disabled.");
|
|
no_pty_flag = 1;
|
|
options += strlen(cp);
|
|
goto next_option;
|
|
}
|
|
cp = "command=\"";
|
|
if (strncmp(options, cp, strlen(cp)) == 0) {
|
|
int i;
|
|
options += strlen(cp);
|
|
forced_command = xmalloc(strlen(options) + 1);
|
|
i = 0;
|
|
while (*options) {
|
|
if (*options == '"')
|
|
break;
|
|
if (*options == '\\' && options[1] == '"') {
|
|
options += 2;
|
|
forced_command[i++] = '"';
|
|
continue;
|
|
}
|
|
forced_command[i++] = *options++;
|
|
}
|
|
if (!*options) {
|
|
debug("%.100s, line %lu: missing end quote",
|
|
SSH_USER_PERMITTED_KEYS, linenum);
|
|
packet_send_debug("%.100s, line %lu: missing end quote",
|
|
SSH_USER_PERMITTED_KEYS, linenum);
|
|
continue;
|
|
}
|
|
forced_command[i] = 0;
|
|
packet_send_debug("Forced command: %.900s", forced_command);
|
|
options++;
|
|
goto next_option;
|
|
}
|
|
cp = "environment=\"";
|
|
if (strncmp(options, cp, strlen(cp)) == 0) {
|
|
int i;
|
|
char *s;
|
|
struct envstring *new_envstring;
|
|
options += strlen(cp);
|
|
s = xmalloc(strlen(options) + 1);
|
|
i = 0;
|
|
while (*options) {
|
|
if (*options == '"')
|
|
break;
|
|
if (*options == '\\' && options[1] == '"') {
|
|
options += 2;
|
|
s[i++] = '"';
|
|
continue;
|
|
}
|
|
s[i++] = *options++;
|
|
}
|
|
if (!*options) {
|
|
debug("%.100s, line %lu: missing end quote",
|
|
SSH_USER_PERMITTED_KEYS, linenum);
|
|
packet_send_debug("%.100s, line %lu: missing end quote",
|
|
SSH_USER_PERMITTED_KEYS, linenum);
|
|
continue;
|
|
}
|
|
s[i] = 0;
|
|
packet_send_debug("Adding to environment: %.900s", s);
|
|
debug("Adding to environment: %.900s", s);
|
|
options++;
|
|
new_envstring = xmalloc(sizeof(struct envstring));
|
|
new_envstring->s = s;
|
|
new_envstring->next = custom_environment;
|
|
custom_environment = new_envstring;
|
|
goto next_option;
|
|
}
|
|
cp = "from=\"";
|
|
if (strncmp(options, cp, strlen(cp)) == 0) {
|
|
int mname, mip;
|
|
char *patterns = xmalloc(strlen(options) + 1);
|
|
int i;
|
|
options += strlen(cp);
|
|
i = 0;
|
|
while (*options) {
|
|
if (*options == '"')
|
|
break;
|
|
if (*options == '\\' && options[1] == '"') {
|
|
options += 2;
|
|
patterns[i++] = '"';
|
|
continue;
|
|
}
|
|
patterns[i++] = *options++;
|
|
}
|
|
if (!*options) {
|
|
debug("%.100s, line %lu: missing end quote",
|
|
SSH_USER_PERMITTED_KEYS, linenum);
|
|
packet_send_debug("%.100s, line %lu: missing end quote",
|
|
SSH_USER_PERMITTED_KEYS, linenum);
|
|
continue;
|
|
}
|
|
patterns[i] = 0;
|
|
options++;
|
|
/*
|
|
* Deny access if we get a negative
|
|
* match for the hostname or the ip
|
|
* or if we get not match at all
|
|
*/
|
|
mname = match_hostname(get_canonical_hostname(),
|
|
patterns, strlen(patterns));
|
|
mip = match_hostname(get_remote_ipaddr(),
|
|
patterns, strlen(patterns));
|
|
xfree(patterns);
|
|
if (mname == -1 || mip == -1 ||
|
|
(mname != 1 && mip != 1)) {
|
|
log("Authentication tried for %.100s with correct key but not from a permitted host (host=%.200s, ip=%.200s).",
|
|
pw->pw_name, get_canonical_hostname(),
|
|
get_remote_ipaddr());
|
|
packet_send_debug("Your host '%.200s' is not permitted to use this key for login.",
|
|
get_canonical_hostname());
|
|
/* deny access */
|
|
return 0;
|
|
}
|
|
/* Host name matches. */
|
|
goto next_option;
|
|
}
|
|
next_option:
|
|
/*
|
|
* Skip the comma, and move to the next option
|
|
* (or break out if there are no more).
|
|
*/
|
|
if (!*options)
|
|
fatal("Bugs in auth-options.c option processing.");
|
|
if (*options == ' ' || *options == '\t')
|
|
break; /* End of options. */
|
|
if (*options != ',')
|
|
goto bad_option;
|
|
options++;
|
|
/* Process the next option. */
|
|
}
|
|
/* grant access */
|
|
return 1;
|
|
|
|
bad_option:
|
|
log("Bad options in %.100s file, line %lu: %.50s",
|
|
SSH_USER_PERMITTED_KEYS, linenum, options);
|
|
packet_send_debug("Bad options in %.100s file, line %lu: %.50s",
|
|
SSH_USER_PERMITTED_KEYS, linenum, options);
|
|
/* deny access */
|
|
return 0;
|
|
}
|