tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

last bits of old packet API / active_state global

This commit is contained in:
Damien Miller 2019-01-20 14:55:27 +11:00
parent 3f0786bbe7
commit 9b655dc9c9
15 changed files with 18 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audit-bsm.c
View File

@ -391,7 +391,7 @@ audit_session_close(struct logininfo *li)
} }
void void
audit_event(ssh_audit_event_t event) audit_event(struct ssh *ssh, ssh_audit_event_t event)
{ {
char textbuf[BSM_TEXTBUFSZ]; char textbuf[BSM_TEXTBUFSZ];
static int logged_in = 0; static int logged_in = 0;

4
audit-linux.c
View File

@ -97,10 +97,8 @@ audit_session_close(struct logininfo *li)
} }
void void
audit_event(ssh_audit_event_t event) audit_event(struct ssh *ssh, ssh_audit_event_t event)
{ {
struct ssh *ssh = active_state; /* XXX */
switch(event) { switch(event) {
case SSH_AUTH_SUCCESS: case SSH_AUTH_SUCCESS:
case SSH_CONNECTION_CLOSE: case SSH_CONNECTION_CLOSE:

2
audit.c
View File

@ -131,7 +131,7 @@ audit_connection_from(const char *host, int port)
* events and what they mean). * events and what they mean).
*/ */
void void
audit_event(ssh_audit_event_t event) audit_event(struct ssh *ssh, ssh_audit_event_t event)
{ {
debug("audit event euid %d user %s event %d (%s)", geteuid(), debug("audit event euid %d user %s event %d (%s)", geteuid(),
audit_username(), event, audit_event_lookup(event)); audit_username(), event, audit_event_lookup(event));

4
audit.h
View File

@ -27,6 +27,8 @@
#include "loginrec.h" #include "loginrec.h"
struct ssh;
enum ssh_audit_event_type { enum ssh_audit_event_type {
SSH_LOGIN_EXCEED_MAXTRIES, SSH_LOGIN_EXCEED_MAXTRIES,
SSH_LOGIN_ROOT_DENIED, SSH_LOGIN_ROOT_DENIED,
@ -46,7 +48,7 @@ enum ssh_audit_event_type {
typedef enum ssh_audit_event_type ssh_audit_event_t; typedef enum ssh_audit_event_type ssh_audit_event_t;
void audit_connection_from(const char *, int); void audit_connection_from(const char *, int);
void audit_event(ssh_audit_event_t); void audit_event(struct ssh *, ssh_audit_event_t);
void audit_session_open(struct logininfo *); void audit_session_open(struct logininfo *);
void audit_session_close(struct logininfo *); void audit_session_close(struct logininfo *);
void audit_run_command(const char *); void audit_run_command(const char *);

4
auth.c
View File

@ -367,7 +367,7 @@ auth_log(struct ssh *ssh, int authenticated, int partial,
#endif #endif
#ifdef SSH_AUDIT_EVENTS #ifdef SSH_AUDIT_EVENTS
if (authenticated == 0 && !authctxt->postponed) if (authenticated == 0 && !authctxt->postponed)
audit_event(audit_classify_auth(method)); audit_event(ssh, audit_classify_auth(method));
#endif #endif
} }
@ -605,7 +605,7 @@ getpwnamallow(struct ssh *ssh, const char *user)
auth_get_canonical_hostname(ssh, options.use_dns), "ssh"); auth_get_canonical_hostname(ssh, options.use_dns), "ssh");
#endif #endif
#ifdef SSH_AUDIT_EVENTS #ifdef SSH_AUDIT_EVENTS
audit_event(SSH_INVALID_USER); audit_event(ssh, SSH_INVALID_USER);
#endif /* SSH_AUDIT_EVENTS */ #endif /* SSH_AUDIT_EVENTS */
return (NULL); return (NULL);
} }

6
auth2.c
View File

@ -294,7 +294,7 @@ input_userauth_request(int type, u_int32_t seq, struct ssh *ssh)
/* Invalid user, fake password information */ /* Invalid user, fake password information */
authctxt->pw = fakepw(); authctxt->pw = fakepw();
#ifdef SSH_AUDIT_EVENTS #ifdef SSH_AUDIT_EVENTS
PRIVSEP(audit_event(SSH_INVALID_USER)); PRIVSEP(audit_event(ssh, SSH_INVALID_USER));
#endif #endif
} }
#ifdef USE_PAM #ifdef USE_PAM
@ -369,7 +369,7 @@ userauth_finish(struct ssh *ssh, int authenticated, const char *method,
!auth_root_allowed(ssh, method)) { !auth_root_allowed(ssh, method)) {
authenticated = 0; authenticated = 0;
#ifdef SSH_AUDIT_EVENTS #ifdef SSH_AUDIT_EVENTS
PRIVSEP(audit_event(SSH_LOGIN_ROOT_DENIED)); PRIVSEP(audit_event(ssh, SSH_LOGIN_ROOT_DENIED));
#endif #endif
} }
@ -430,7 +430,7 @@ userauth_finish(struct ssh *ssh, int authenticated, const char *method,
authctxt->failures++; authctxt->failures++;
if (authctxt->failures >= options.max_authtries) { if (authctxt->failures >= options.max_authtries) {
#ifdef SSH_AUDIT_EVENTS #ifdef SSH_AUDIT_EVENTS
PRIVSEP(audit_event(SSH_LOGIN_EXCEED_MAXTRIES)); PRIVSEP(audit_event(ssh, SSH_LOGIN_EXCEED_MAXTRIES));
#endif #endif
auth_maxtries_exceeded(ssh); auth_maxtries_exceeded(ssh);
} }

2
monitor.c
View File

@ -1628,7 +1628,7 @@ mm_answer_audit_event(struct ssh *ssh, int socket, struct sshbuf *m)
case SSH_LOGIN_ROOT_DENIED: case SSH_LOGIN_ROOT_DENIED:
case SSH_CONNECTION_CLOSE: case SSH_CONNECTION_CLOSE:
case SSH_INVALID_USER: case SSH_INVALID_USER:
audit_event(event); audit_event(ssh, event);
break; break;
default: default:
fatal("Audit event type %d not permitted", event); fatal("Audit event type %d not permitted", event);

2
monitor_wrap.c
View File

@ -867,7 +867,7 @@ mm_bsdauth_respond(void *ctx, u_int numresponses, char **responses)
#ifdef SSH_AUDIT_EVENTS #ifdef SSH_AUDIT_EVENTS
void void
mm_audit_event(ssh_audit_event_t event) mm_audit_event(struct ssh *ssh, ssh_audit_event_t event)
{ {
struct sshbuf *m; struct sshbuf *m;
int r; int r;

2
monitor_wrap.h
View File

@ -76,7 +76,7 @@ void mm_sshpam_free_ctx(void *);
#ifdef SSH_AUDIT_EVENTS #ifdef SSH_AUDIT_EVENTS
#include "audit.h" #include "audit.h"
void mm_audit_event(ssh_audit_event_t); void mm_audit_event(struct ssh *, ssh_audit_event_t);
void mm_audit_run_command(const char *); void mm_audit_run_command(const char *);
#endif #endif

2
regress/misc/kexfuzz/kexfuzz.c
View File

@ -29,8 +29,6 @@
#include "authfile.h" #include "authfile.h"
#include "log.h" #include "log.h"
struct ssh *active_state = NULL; /* XXX - needed for linking */
void kex_tests(void); void kex_tests(void);
static int do_debug = 0; static int do_debug = 0;

2
regress/unittests/kex/test_kex.c
View File

@ -24,8 +24,6 @@
#include "packet.h" #include "packet.h"
#include "myproposal.h" #include "myproposal.h"
struct ssh *active_state = NULL; /* XXX - needed for linking */
void kex_tests(void); void kex_tests(void);
static int do_debug = 0; static int do_debug = 0;

32
session.c
View File

@ -123,9 +123,6 @@ int do_exec_no_pty(struct ssh *, Session *, const char *);
int do_exec(struct ssh *, Session *, const char *); int do_exec(struct ssh *, Session *, const char *);
void do_login(struct ssh *, Session *, const char *); void do_login(struct ssh *, Session *, const char *);
void do_child(struct ssh *, Session *, const char *); void do_child(struct ssh *, Session *, const char *);
#ifdef LOGIN_NEEDS_UTMPX
static void do_pre_login(Session *s);
#endif
void do_motd(void); void do_motd(void);
int check_quietlogin(Session *, const char *); int check_quietlogin(Session *, const char *);
@ -656,35 +653,6 @@ do_exec_pty(struct ssh *ssh, Session *s, const char *command)
return 0; return 0;
} }
#ifdef LOGIN_NEEDS_UTMPX
static void
do_pre_login(Session *s)
{
struct ssh *ssh = active_state; /* XXX */
socklen_t fromlen;
struct sockaddr_storage from;
pid_t pid = getpid();
/*
* Get IP address of client. If the connection is not a socket, let
* the address be 0.0.0.0.
*/
memset(&from, 0, sizeof(from));
fromlen = sizeof(from);
if (packet_connection_is_on_socket()) {
if (getpeername(packet_get_connection_in(),
(struct sockaddr *)&from, &fromlen) < 0) {
debug("getpeername: %.100s", strerror(errno));
cleanup_exit(255);
}
}
record_utmp_only(pid, s->tty, s->pw->pw_name,
session_get_remote_name_or_ip(ssh, utmp_len, options.use_dns),
(struct sockaddr *)&from, fromlen);
}
#endif
/* /*
* This is called to fork and execute a command. If another command is * This is called to fork and execute a command. If another command is
* to be forced, execute that instead. * to be forced, execute that instead.

2
ssh-keyscan.c
View File

@ -83,8 +83,6 @@ fd_set *read_wait;
size_t read_wait_nfdset; size_t read_wait_nfdset;
int ncon; int ncon;
struct ssh *active_state = NULL; /* XXX needed for linking */
/* /*
* Keep a connection structure for each file descriptor. The state * Keep a connection structure for each file descriptor. The state
* associated with file descriptor n is held in fdcon[n]. * associated with file descriptor n is held in fdcon[n].

2
ssh-keysign.c
View File

@ -59,8 +59,6 @@
#include "sshkey.h" #include "sshkey.h"
#include "ssherr.h" #include "ssherr.h"
struct ssh *active_state = NULL; /* XXX needed for linking */
extern char *__progname; extern char *__progname;
static int static int

8
sshd.c
View File

@ -2080,7 +2080,7 @@ main(int ac, char **av)
} }
#ifdef SSH_AUDIT_EVENTS #ifdef SSH_AUDIT_EVENTS
audit_event(SSH_AUTH_SUCCESS); audit_event(ssh, SSH_AUTH_SUCCESS);
#endif #endif
#ifdef GSSAPI #ifdef GSSAPI
@ -2128,7 +2128,7 @@ main(int ac, char **av)
#endif /* USE_PAM */ #endif /* USE_PAM */
#ifdef SSH_AUDIT_EVENTS #ifdef SSH_AUDIT_EVENTS
PRIVSEP(audit_event(SSH_CONNECTION_CLOSE)); PRIVSEP(audit_event(ssh, SSH_CONNECTION_CLOSE));
#endif #endif
ssh_packet_close(ssh); ssh_packet_close(ssh);
@ -2256,8 +2256,8 @@ cleanup_exit(int i)
} }
#ifdef SSH_AUDIT_EVENTS #ifdef SSH_AUDIT_EVENTS
/* done after do_cleanup so it can cancel the PAM auth 'thread' */ /* done after do_cleanup so it can cancel the PAM auth 'thread' */
if (!use_privsep || mm_is_monitor()) if (the_active_state != NULL && (!use_privsep || mm_is_monitor()))
audit_event(SSH_CONNECTION_ABANDON); audit_event(the_active_state, SSH_CONNECTION_ABANDON);
#endif #endif
_exit(i); _exit(i);
} }