tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 08:14:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/04/06 21:00:17

Browse Source 
[auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth2.c channels.c session.c
      ssh.c sshconnect.c sshconnect.h uidswap.c uidswap.h]
     do gid/groups-swap in addition to uid-swap, should help if /home/group
     is chmod 750 + chgrp grp /home/group/, work be deraadt and me, thanks
     to olar@openwall.com is comments.  we had many requests for this.
This commit is contained in:
Ben Lindstrom 2001-04-08 18:26:59 +00:00
parent d344763643
commit 3fcf1a22b5
12 changed files with 118 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -9,6 +9,12 @@
- markus@cvs.openbsd.org 2001/04/08 11:27:33 - markus@cvs.openbsd.org 2001/04/08 11:27:33
[clientloop.c] [clientloop.c]
leave_raw_mode if ssh2 "session" is closed leave_raw_mode if ssh2 "session" is closed
- markus@cvs.openbsd.org 2001/04/06 21:00:17
[auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth2.c channels.c session.c
ssh.c sshconnect.c sshconnect.h uidswap.c uidswap.h]
do gid/groups-swap in addition to uid-swap, should help if /home/group
is chmod 750 + chgrp grp /home/group/, work be deraadt and me, thanks
to olar@openwall.com is comments. we had many requests for this.
20010408 20010408
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -4949,4 +4955,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1082 2001/04/08 18:07:22 mouring Exp $ $Id: ChangeLog,v 1.1083 2001/04/08 18:26:59 mouring Exp $

4
auth-rh-rsa.c
View File

@ -13,7 +13,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: auth-rh-rsa.c,v 1.22 2001/02/03 10:08:36 markus Exp $"); RCSID("$OpenBSD: auth-rh-rsa.c,v 1.23 2001/04/06 21:00:04 markus Exp $");
#include "packet.h" #include "packet.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -80,7 +80,7 @@ auth_rhosts_rsa(struct passwd *pw, const char *client_user, RSA *client_host_key
pw->pw_name, user_hostfile); pw->pw_name, user_hostfile);
} else { } else {
/* XXX race between stat and the following open() */ /* XXX race between stat and the following open() */
temporarily_use_uid(pw->pw_uid); temporarily_use_uid(pw);
host_status = check_host_in_hostfile(user_hostfile, canonical_hostname, host_status = check_host_in_hostfile(user_hostfile, canonical_hostname,
client_key, found, NULL); client_key, found, NULL);
restore_uid(); restore_uid();

6
auth-rhosts.c
View File

@ -14,7 +14,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: auth-rhosts.c,v 1.21 2001/02/08 19:30:51 itojun Exp $"); RCSID("$OpenBSD: auth-rhosts.c,v 1.22 2001/04/06 21:00:06 markus Exp $");
#include "packet.h" #include "packet.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -161,7 +161,7 @@ auth_rhosts(struct passwd *pw, const char *client_user)
if (pw == NULL) if (pw == NULL)
return 0; return 0;
/* Switch to the user's uid. */ /* Switch to the user's uid. */
temporarily_use_uid(pw->pw_uid); temporarily_use_uid(pw);
/* /*
* Quick check: if the user has no .shosts or .rhosts files, return * Quick check: if the user has no .shosts or .rhosts files, return
* failure immediately without doing costly lookups from name * failure immediately without doing costly lookups from name
@ -223,7 +223,7 @@ auth_rhosts(struct passwd *pw, const char *client_user)
return 0; return 0;
} }
/* Temporarily use the user's uid. */ /* Temporarily use the user's uid. */
temporarily_use_uid(pw->pw_uid); temporarily_use_uid(pw);
/* Check all .rhosts files (currently .shosts and .rhosts). */ /* Check all .rhosts files (currently .shosts and .rhosts). */
for (rhosts_file_index = 0; rhosts_files[rhosts_file_index]; for (rhosts_file_index = 0; rhosts_files[rhosts_file_index];

4
auth-rsa.c
View File

@ -14,7 +14,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: auth-rsa.c,v 1.39 2001/03/01 02:45:10 deraadt Exp $"); RCSID("$OpenBSD: auth-rsa.c,v 1.40 2001/04/06 21:00:07 markus Exp $");
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/md5.h> #include <openssl/md5.h>
@ -135,7 +135,7 @@ auth_rsa(struct passwd *pw, BIGNUM *client_n)
return 0; return 0;
/* Temporarily use the user's uid. */ /* Temporarily use the user's uid. */
temporarily_use_uid(pw->pw_uid); temporarily_use_uid(pw);
/* The authorized keys. */ /* The authorized keys. */
snprintf(file, sizeof file, "%.500s/%.100s", pw->pw_dir, snprintf(file, sizeof file, "%.500s/%.100s", pw->pw_dir,

4
auth2.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: auth2.c,v 1.50 2001/04/04 20:32:56 markus Exp $"); RCSID("$OpenBSD: auth2.c,v 1.51 2001/04/06 21:00:08 markus Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
@ -590,7 +590,7 @@ user_key_allowed(struct passwd *pw, Key *key)
return 0; return 0;
/* Temporarily use the user's uid. */ /* Temporarily use the user's uid. */
temporarily_use_uid(pw->pw_uid); temporarily_use_uid(pw);
/* The authorized keys. */ /* The authorized keys. */
snprintf(file, sizeof file, "%.500s/%.100s", pw->pw_dir, snprintf(file, sizeof file, "%.500s/%.100s", pw->pw_dir,

4
channels.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: channels.c,v 1.101 2001/04/05 10:42:48 markus Exp $"); RCSID("$OpenBSD: channels.c,v 1.102 2001/04/06 21:00:10 markus Exp $");
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/dsa.h> #include <openssl/dsa.h>
@ -2410,7 +2410,7 @@ auth_input_request_forwarding(struct passwd * pw)
fatal("Protocol error: authentication forwarding requested twice."); fatal("Protocol error: authentication forwarding requested twice.");
/* Temporarily drop privileged uid for mkdir/bind. */ /* Temporarily drop privileged uid for mkdir/bind. */
temporarily_use_uid(pw->pw_uid); temporarily_use_uid(pw);
/* Allocate a buffer for the socket name, and format the name. */ /* Allocate a buffer for the socket name, and format the name. */
channel_forwarded_auth_socket_name = xmalloc(MAX_SOCKET_NAME); channel_forwarded_auth_socket_name = xmalloc(MAX_SOCKET_NAME);

8
session.c
View File

@ -33,7 +33,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: session.c,v 1.70 2001/04/05 15:48:18 stevesk Exp $"); RCSID("$OpenBSD: session.c,v 1.71 2001/04/06 21:00:12 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -365,7 +365,7 @@ do_authenticated1(Authctxt *authctxt)
/* Setup to always have a local .Xauthority. */ /* Setup to always have a local .Xauthority. */
xauthfile = xmalloc(MAXPATHLEN); xauthfile = xmalloc(MAXPATHLEN);
strlcpy(xauthfile, "/tmp/ssh-XXXXXXXX", MAXPATHLEN); strlcpy(xauthfile, "/tmp/ssh-XXXXXXXX", MAXPATHLEN);
temporarily_use_uid(s->pw->pw_uid); temporarily_use_uid(s->pw);
if (mkdtemp(xauthfile) == NULL) { if (mkdtemp(xauthfile) == NULL) {
restore_uid(); restore_uid();
error("private X11 dir: mkdtemp %s failed: %s", error("private X11 dir: mkdtemp %s failed: %s",
@ -1152,7 +1152,7 @@ do_child(Session *s, const char *command)
#endif #endif
/* Permanently switch to the desired uid. */ /* Permanently switch to the desired uid. */
permanently_set_uid(pw->pw_uid); permanently_set_uid(pw);
# endif /* HAVE_LOGIN_CAP */ # endif /* HAVE_LOGIN_CAP */
} }
#endif /* HAVE_OSF_SIA */ #endif /* HAVE_OSF_SIA */
@ -1710,7 +1710,7 @@ session_x11_req(Session *s)
} }
xauthfile = xmalloc(MAXPATHLEN); xauthfile = xmalloc(MAXPATHLEN);
strlcpy(xauthfile, "/tmp/ssh-XXXXXXXX", MAXPATHLEN); strlcpy(xauthfile, "/tmp/ssh-XXXXXXXX", MAXPATHLEN);
temporarily_use_uid(s->pw->pw_uid); temporarily_use_uid(s->pw);
if (mkdtemp(xauthfile) == NULL) { if (mkdtemp(xauthfile) == NULL) {
restore_uid(); restore_uid();
error("private X11 dir: mkdtemp %s failed: %s", error("private X11 dir: mkdtemp %s failed: %s",

33
ssh.c
View File

@ -39,7 +39,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh.c,v 1.106 2001/04/05 21:05:24 markus Exp $"); RCSID("$OpenBSD: ssh.c,v 1.107 2001/04/06 21:00:13 markus Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -265,6 +265,15 @@ main(int ac, char **av)
fatal("setrlimit failed: %.100s", strerror(errno)); fatal("setrlimit failed: %.100s", strerror(errno));
} }
#endif #endif
/* Get user data. */
pw = getpwuid(original_real_uid);
if (!pw) {
log("You don't exist, go away!");
exit(1);
}
/* Take a copy of the returned structure. */
pw = pwcopy(pw);
/* /*
* Use uid-swapping to give up root privileges for the duration of * Use uid-swapping to give up root privileges for the duration of
* option processing. We will re-instantiate the rights when we are * option processing. We will re-instantiate the rights when we are
@ -272,7 +281,7 @@ main(int ac, char **av)
* them when the port has been created (actually, when the connection * them when the port has been created (actually, when the connection
* has been made, as we may need to create the port several times). * has been made, as we may need to create the port several times).
*/ */
temporarily_use_uid(original_real_uid); temporarily_use_uid(pw);
/* /*
* Set our umask to something reasonable, as some files are created * Set our umask to something reasonable, as some files are created
@ -545,15 +554,6 @@ main(int ac, char **av)
tty_flag = 0; tty_flag = 0;
} }
/* Get user data. */
pw = getpwuid(original_real_uid);
if (!pw) {
log("You don't exist, go away!");
exit(1);
}
/* Take a copy of the returned structure. */
pw = pwcopy(pw);
/* /*
* Initialize "log" output. Since we are the client all output * Initialize "log" output. Since we are the client all output
* actually goes to stderr. * actually goes to stderr.
@ -592,6 +592,7 @@ main(int ac, char **av)
"originating port will not be trusted."); "originating port will not be trusted.");
options.rhosts_authentication = 0; options.rhosts_authentication = 0;
} }
/* /*
* If using rsh has been selected, exec it now (without trying * If using rsh has been selected, exec it now (without trying
* anything else). Note that we must release privileges first. * anything else). Note that we must release privileges first.
@ -604,7 +605,7 @@ main(int ac, char **av)
restore_uid(); restore_uid();
/* Switch to the original uid permanently. */ /* Switch to the original uid permanently. */
permanently_set_uid(original_real_uid); permanently_set_uid(pw);
/* Execute rsh. */ /* Execute rsh. */
rsh_connect(host, options.user, &command); rsh_connect(host, options.user, &command);
@ -618,8 +619,7 @@ main(int ac, char **av)
ok = ssh_connect(host, &hostaddr, options.port, ok = ssh_connect(host, &hostaddr, options.port,
options.connection_attempts, options.connection_attempts,
original_effective_uid != 0 || !options.use_privileged_port, original_effective_uid != 0 || !options.use_privileged_port,
original_real_uid, pw, options.proxy_command);
options.proxy_command);
/* /*
* If we successfully made the connection, load the host private key * If we successfully made the connection, load the host private key
@ -646,7 +646,7 @@ main(int ac, char **av)
* process, read the private hostkey and impersonate the host. * process, read the private hostkey and impersonate the host.
* OpenBSD does not allow ptracing of setuid processes. * OpenBSD does not allow ptracing of setuid processes.
*/ */
permanently_set_uid(original_real_uid); permanently_set_uid(pw);
/* /*
* Now that we are back to our own permissions, create ~/.ssh * Now that we are back to our own permissions, create ~/.ssh
@ -688,8 +688,7 @@ main(int ac, char **av)
tilde_expand_filename(options.user_hostfile2, original_real_uid); tilde_expand_filename(options.user_hostfile2, original_real_uid);
/* Log into the remote system. This never returns if the login fails. */ /* Log into the remote system. This never returns if the login fails. */
ssh_login(host_private_key, host, (struct sockaddr *)&hostaddr, ssh_login(host_private_key, host, (struct sockaddr *)&hostaddr, pw);
original_real_uid);
/* We no longer need the host private key. Clear it now. */ /* We no longer need the host private key. Clear it now. */
if (host_private_key != NULL) if (host_private_key != NULL)

25
sshconnect.c
View File

@ -13,7 +13,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshconnect.c,v 1.102 2001/04/05 10:42:55 markus Exp $"); RCSID("$OpenBSD: sshconnect.c,v 1.103 2001/04/06 21:00:14 markus Exp $");
#include <openssl/bn.h> #include <openssl/bn.h>
@ -45,7 +45,7 @@ extern int IPv4or6;
* Connect to the given ssh server using a proxy command. * Connect to the given ssh server using a proxy command.
*/ */
int int
ssh_proxy_connect(const char *host, u_short port, uid_t original_real_uid, ssh_proxy_connect(const char *host, u_short port, struct passwd *pw,
const char *proxy_command) const char *proxy_command)
{ {
Buffer command; Buffer command;
@ -96,7 +96,7 @@ ssh_proxy_connect(const char *host, u_short port, uid_t original_real_uid,
char *argv[10]; char *argv[10];
/* Child. Permanently give up superuser privileges. */ /* Child. Permanently give up superuser privileges. */
permanently_set_uid(original_real_uid); permanently_set_uid(pw);
/* Redirect stdin and stdout. */ /* Redirect stdin and stdout. */
close(pin[1]); close(pin[1]);
@ -145,7 +145,7 @@ ssh_proxy_connect(const char *host, u_short port, uid_t original_real_uid,
* Creates a (possibly privileged) socket for use as the ssh connection. * Creates a (possibly privileged) socket for use as the ssh connection.
*/ */
int int
ssh_create_socket(uid_t original_real_uid, int privileged, int family) ssh_create_socket(struct passwd *pw, int privileged, int family)
{ {
int sock; int sock;
@ -165,7 +165,7 @@ ssh_create_socket(uid_t original_real_uid, int privileged, int family)
* Just create an ordinary socket on arbitrary port. We use * Just create an ordinary socket on arbitrary port. We use
* the user's uid to create the socket. * the user's uid to create the socket.
*/ */
temporarily_use_uid(original_real_uid); temporarily_use_uid(pw);
sock = socket(family, SOCK_STREAM, 0); sock = socket(family, SOCK_STREAM, 0);
if (sock < 0) if (sock < 0)
error("socket: %.100s", strerror(errno)); error("socket: %.100s", strerror(errno));
@ -188,7 +188,7 @@ ssh_create_socket(uid_t original_real_uid, int privileged, int family)
int int
ssh_connect(const char *host, struct sockaddr_storage * hostaddr, ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
u_short port, int connection_attempts, u_short port, int connection_attempts,
int anonymous, uid_t original_real_uid, int anonymous, struct passwd *pw,
const char *proxy_command) const char *proxy_command)
{ {
int gaierr; int gaierr;
@ -212,7 +212,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
} }
/* If a proxy command is given, connect using it. */ /* If a proxy command is given, connect using it. */
if (proxy_command != NULL) if (proxy_command != NULL)
return ssh_proxy_connect(host, port, original_real_uid, proxy_command); return ssh_proxy_connect(host, port, pw, proxy_command);
/* No proxy command. */ /* No proxy command. */
@ -248,7 +248,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
host, ntop, strport); host, ntop, strport);
/* Create a socket for connecting. */ /* Create a socket for connecting. */
sock = ssh_create_socket(original_real_uid, sock = ssh_create_socket(pw,
#ifdef HAVE_CYGWIN #ifdef HAVE_CYGWIN
!anonymous, !anonymous,
#else #else
@ -262,7 +262,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
* hope that it will help with tcp_wrappers showing * hope that it will help with tcp_wrappers showing
* the remote uid as root. * the remote uid as root.
*/ */
temporarily_use_uid(original_real_uid); temporarily_use_uid(pw);
if (connect(sock, ai->ai_addr, ai->ai_addrlen) >= 0) { if (connect(sock, ai->ai_addr, ai->ai_addrlen) >= 0) {
/* Successful connection. */ /* Successful connection. */
memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen); memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen);
@ -739,16 +739,11 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
*/ */
void void
ssh_login(Key *own_host_key, const char *orighost, ssh_login(Key *own_host_key, const char *orighost,
struct sockaddr *hostaddr, uid_t original_real_uid) struct sockaddr *hostaddr, struct passwd *pw)
{ {
struct passwd *pw;
char *host, *cp; char *host, *cp;
char *server_user, *local_user; char *server_user, *local_user;
/* Get local user name. Use it as server user if no user name was given. */
pw = getpwuid(original_real_uid);
if (!pw)
fatal("User id %u not found from user database.", original_real_uid);
local_user = xstrdup(pw->pw_name); local_user = xstrdup(pw->pw_name);
server_user = options.user ? options.user : local_user; server_user = options.user ? options.user : local_user;

6
sshconnect.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect.h,v 1.7 2001/03/26 08:07:09 markus Exp $ */ /* $OpenBSD: sshconnect.h,v 1.8 2001/04/06 21:00:15 markus Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
@ -37,7 +37,7 @@
int int
ssh_connect(const char *host, struct sockaddr_storage * hostaddr, ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
u_short port, int connection_attempts, u_short port, int connection_attempts,
int anonymous, uid_t original_real_uid, int anonymous, struct passwd *pw,
const char *proxy_command); const char *proxy_command);
/* /*
@ -51,7 +51,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
void void
ssh_login(Key *host_key, const char *host, ssh_login(Key *host_key, const char *host,
struct sockaddr * hostaddr, uid_t original_real_uid); struct sockaddr * hostaddr, struct passwd *pw);
void void

101
uidswap.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: uidswap.c,v 1.13 2001/01/21 19:06:01 markus Exp $"); RCSID("$OpenBSD: uidswap.c,v 1.14 2001/04/06 21:00:16 markus Exp $");
#include "log.h" #include "log.h"
#include "uidswap.h" #include "uidswap.h"
@ -26,57 +26,80 @@ RCSID("$OpenBSD: uidswap.c,v 1.13 2001/01/21 19:06:01 markus Exp $");
* POSIX saved uids or not. * POSIX saved uids or not.
*/ */
#if defined(_POSIX_SAVED_IDS) && !defined(BROKEN_SAVED_UIDS)
/* Lets assume that posix saved ids also work with seteuid, even though that /* Lets assume that posix saved ids also work with seteuid, even though that
is not part of the posix specification. */ is not part of the posix specification. */
#define SAVED_IDS_WORK_WITH_SETEUID
/* Saved effective uid. */ /* Saved effective uid. */
static uid_t saved_euid = 0; static int privileged = 0;
#endif static int temporarily_use_uid_effective = 0;
static uid_t saved_euid = 0;
static gid_t saved_egid;
static gid_t saved_egroups[NGROUPS_MAX], user_groups[NGROUPS_MAX];
static int saved_egroupslen = -1, user_groupslen = -1;
/* /*
* Temporarily changes to the given uid. If the effective user * Temporarily changes to the given uid. If the effective user
* id is not root, this does nothing. This call cannot be nested. * id is not root, this does nothing. This call cannot be nested.
*/ */
void void
temporarily_use_uid(uid_t uid) temporarily_use_uid(struct passwd *pw)
{ {
#ifdef SAVED_IDS_WORK_WITH_SETEUID /* Save the current euid, and egroups. */
/* Save the current euid. */ saved_euid = geteuid();
saved_euid = geteuid(); debug("temporarily_use_uid: %d/%d (e=%d)",
pw->pw_uid, pw->pw_gid, saved_euid);
/* Set the effective uid to the given (unprivileged) uid. */ if (saved_euid != 0) {
if (seteuid(uid) == -1) privileged = 0;
debug("seteuid %u: %.100s", (u_int) uid, strerror(errno)); return;
#else /* SAVED_IDS_WORK_WITH_SETEUID */ }
/* Propagate the privileged uid to all of our uids. */ privileged = 1;
if (setuid(geteuid()) < 0) temporarily_use_uid_effective = 1;
debug("setuid %u: %.100s", (u_int) geteuid(), strerror(errno)); saved_egid = getegid();
saved_egroupslen = getgroups(NGROUPS_MAX, saved_egroups);
/* Set the effective uid to the given (unprivileged) uid. */ if (saved_egroupslen < 0)
if (seteuid(uid) == -1) fatal("getgroups: %.100s", strerror(errno));
debug("seteuid %u: %.100s", (u_int) uid, strerror(errno));
#endif /* SAVED_IDS_WORK_WITH_SETEUID */ /* set and save the user's groups */
if (user_groupslen == -1) {
if (initgroups(pw->pw_name, pw->pw_gid) < 0)
fatal("initgroups: %s: %.100s", pw->pw_name,
strerror(errno));
user_groupslen = getgroups(NGROUPS_MAX, user_groups);
if (user_groupslen < 0)
fatal("getgroups: %.100s", strerror(errno));
}
/* Set the effective uid to the given (unprivileged) uid. */
if (setgroups(user_groupslen, user_groups) < 0)
fatal("setgroups: %.100s", strerror(errno));
pw->pw_gid = pw->pw_gid;
if (setegid(pw->pw_gid) < 0)
fatal("setegid %u: %.100s", (u_int) pw->pw_gid,
strerror(errno));
if (seteuid(pw->pw_uid) == -1)
fatal("seteuid %u: %.100s", (u_int) pw->pw_uid,
strerror(errno));
} }
/* /*
* Restores to the original uid. * Restores to the original uid.
*/ */
void void
restore_uid(void) restore_uid(void)
{ {
#ifdef SAVED_IDS_WORK_WITH_SETEUID debug("restore_uid");
/* it's a no-op unless privileged */
if (!privileged)
return;
if (!temporarily_use_uid_effective)
fatal("restore_uid: temporarily_use_uid not effective");
/* Set the effective uid back to the saved uid. */ /* Set the effective uid back to the saved uid. */
if (seteuid(saved_euid) < 0) if (seteuid(saved_euid) < 0)
debug("seteuid %u: %.100s", (u_int) saved_euid, strerror(errno)); fatal("seteuid %u: %.100s", (u_int) saved_euid, strerror(errno));
#else /* SAVED_IDS_WORK_WITH_SETEUID */ if (setgroups(saved_egroupslen, saved_egroups) < 0)
/* fatal("setgroups: %.100s", strerror(errno));
* We are unable to restore the real uid to its unprivileged value. if (setegid(saved_egid) < 0)
* Propagate the real uid (usually more privileged) to effective uid fatal("setegid %u: %.100s", (u_int) saved_egid, strerror(errno));
* as well. temporarily_use_uid_effective = 0;
*/
setuid(getuid());
#endif /* SAVED_IDS_WORK_WITH_SETEUID */
} }
/* /*
@ -84,8 +107,12 @@ restore_uid(void)
* called while temporarily_use_uid is effective. * called while temporarily_use_uid is effective.
*/ */
void void
permanently_set_uid(uid_t uid) permanently_set_uid(struct passwd *pw)
{ {
if (setuid(uid) < 0) if (temporarily_use_uid_effective)
debug("setuid %u: %.100s", (u_int) uid, strerror(errno)); fatal("restore_uid: temporarily_use_uid effective");
if (setuid(pw->pw_uid) < 0)
fatal("setuid %u: %.100s", (u_int) pw->pw_uid, strerror(errno));
if (setgid(pw->pw_gid) < 0)
fatal("setgid %u: %.100s", (u_int) pw->pw_gid, strerror(errno));
} }

6
uidswap.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: uidswap.h,v 1.6 2001/01/29 01:58:19 niklas Exp $ */ /* $OpenBSD: uidswap.h,v 1.7 2001/04/06 21:00:17 markus Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -19,7 +19,7 @@
* Temporarily changes to the given uid. If the effective user id is not * Temporarily changes to the given uid. If the effective user id is not
* root, this does nothing. This call cannot be nested. * root, this does nothing. This call cannot be nested.
*/ */
void temporarily_use_uid(uid_t uid); void temporarily_use_uid(struct passwd *pw);
/* /*
* Restores the original effective user id after temporarily_use_uid(). * Restores the original effective user id after temporarily_use_uid().
@ -31,6 +31,6 @@ void restore_uid(void);
* Permanently sets all uids to the given uid. This cannot be called while * Permanently sets all uids to the given uid. This cannot be called while
* temporarily_use_uid is effective. This must also clear any saved uids. * temporarily_use_uid is effective. This must also clear any saved uids.
*/ */
void permanently_set_uid(uid_t uid); void permanently_set_uid(struct passwd *pw);
#endif /* UIDSWAP_H */ #endif /* UIDSWAP_H */