#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/ioctl.h>
#include <limits.h>
+#if __OpenBSD__
+# include <login_cap.h>
+# include <readpassphrase.h>
+#endif
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <grp.h>
#include <syslog.h>
#include <errno.h>
-#if HAVE_SHADOW_H
-#include <shadow.h>
-#endif
#include "includes.h"
#include "doas.h"
-static void __dead
-version(void)
-{
- fprintf(stderr, "doas: version %s built %s\n", VERSION, __DATE__);
- exit(1);
-}
-
static void __dead
usage(void)
{
- fprintf(stderr, "usage: doas [-nsv] [-a style] [-C config] [-u user]"
- " command [args]\n");
+ fprintf(stderr, "usage: doas [-Lns] "
+#ifdef __OpenBSD__
+ "[-a style] "
+#endif
+ "[-C config] [-u user] command [args]\n");
exit(1);
}
-size_t
-arraylen(const char **arr)
-{
- size_t cnt = 0;
-
- if (arr) {
- while (*arr) {
- cnt++;
- arr++;
- }
- }
- return cnt;
-}
-
static int
parseuid(const char *s, uid_t *uid)
{
}
static int
-permit(uid_t uid, gid_t *groups, int ngroups, struct rule **lastr,
+permit(uid_t uid, gid_t *groups, int ngroups, const struct rule **lastr,
uid_t target, const char *cmd, const char **cmdargs)
{
int i;
checkconfig(const char *confpath, int argc, char **argv,
uid_t uid, gid_t *groups, int ngroups, uid_t target)
{
- struct rule *rule;
+ const struct rule *rule;
if (setresuid(uid, uid, uid) != 0)
err(1, "setresuid");
}
}
+#ifdef USE_BSD_AUTH
+static void
+authuser(char *myname, char *login_style, int persist)
+{
+ char *challenge = NULL, *response, rbuf[1024], cbuf[128];
+ auth_session_t *as;
+ int fd = -1;
+
+ if (persist)
+ fd = open("/dev/tty", O_RDWR);
+ if (fd != -1) {
+ if (ioctl(fd, TIOCCHKVERAUTH) == 0)
+ goto good;
+ }
+
+ if (!(as = auth_userchallenge(myname, login_style, "auth-doas",
+ &challenge)))
+ errx(1, "Authorization failed");
+ if (!challenge) {
+ char host[HOST_NAME_MAX + 1];
+ if (gethostname(host, sizeof(host)))
+ snprintf(host, sizeof(host), "?");
+ snprintf(cbuf, sizeof(cbuf),
+ "\rdoas (%.32s@%.32s) password: ", myname, host);
+ challenge = cbuf;
+ }
+ response = readpassphrase(challenge, rbuf, sizeof(rbuf),
+ RPP_REQUIRE_TTY);
+ if (response == NULL && errno == ENOTTY) {
+ syslog(LOG_AUTHPRIV | LOG_NOTICE,
+ "tty required for %s", myname);
+ errx(1, "a tty is required");
+ }
+ if (!auth_userresponse(as, response, 0)) {
+ explicit_bzero(rbuf, sizeof(rbuf));
+ syslog(LOG_AUTHPRIV | LOG_NOTICE,
+ "failed auth for %s", myname);
+ errx(1, "Authorization failed");
+ }
+ explicit_bzero(rbuf, sizeof(rbuf));
+good:
+ if (fd != -1) {
+ int secs = 5 * 60;
+ ioctl(fd, TIOCSETVERAUTH, &secs);
+ close(fd);
+ }
+}
+#endif
+
int
main(int argc, char **argv)
{
char cmdline[LINE_MAX];
char myname[_PW_NAME_LEN + 1];
struct passwd *pw;
- struct rule *rule;
+ const struct rule *rule;
uid_t uid;
uid_t target = 0;
gid_t groups[NGROUPS_MAX + 1];
int i, ch;
int sflag = 0;
int nflag = 0;
- int vflag = 0;
char cwdpath[PATH_MAX];
const char *cwd;
char **envp;
-#ifdef HAVE_BSD_AUTH_H
+#ifdef USE_BSD_AUTH
char *login_style = NULL;
#endif
setprogname("doas");
- if (pledge("stdio rpath getpw tty proc exec id", NULL) == -1)
- err(1, "pledge");
-
- /* closefrom(STDERR_FILENO + 1); */
+ closefrom(STDERR_FILENO + 1);
uid = getuid();
-#ifdef HAVE_BSD_AUTH_H
-# define OPTSTRING "a:C:nsu:v"
+#ifdef USE_BSD_AUTH
+# define OPTSTRING "a:C:Lnsu:"
#else
-# define OPTSTRING "C:nsu:v"
+# define OPTSTRING "+C:Lnsu:"
#endif
while ((ch = getopt(argc, argv, OPTSTRING)) != -1) {
switch (ch) {
-#ifdef HAVE_BSD_AUTH_H
+#ifdef USE_BSD_AUTH
case 'a':
login_style = optarg;
break;
case 'C':
confpath = optarg;
break;
+ case 'L':
+#if defined(USE_BSD_AUTH)
+ i = open("/dev/tty", O_RDWR);
+ if (i != -1)
+ ioctl(i, TIOCCLRVERAUTH);
+ exit(i == -1);
+#elif defined(USE_TIMESTAMP)
+ exit(timestamp_clear() == -1);
+#else
+ exit(0);
+#endif
case 'u':
if (parseuid(optarg, &target) != 0)
errx(1, "unknown user");
case 's':
sflag = 1;
break;
- case 'v':
- vflag = 1;
- break;
default:
usage();
break;
argv += optind;
argc -= optind;
- if (vflag)
- version();
-
if (confpath) {
if (sflag)
usage();
if (sflag) {
sh = getenv("SHELL");
- if (sh == NULL || *sh == '\0')
- shargv[0] = pw->pw_shell;
- else
+ if (sh == NULL || *sh == '\0') {
+ shargv[0] = strdup(pw->pw_shell);
+ if (shargv[0] == NULL)
+ err(1, NULL);
+ } else
shargv[0] = sh;
argv = shargv;
argc = 1;
exit(1); /* fail safe */
}
+ if (geteuid())
+ errx(1, "not installed setuid");
+
parseconfig("/etc/doas.conf", 1);
/* cmdline is used only for logging, no need to abort on truncate */
- (void) strlcpy(cmdline, argv[0], sizeof(cmdline));
+ (void)strlcpy(cmdline, argv[0], sizeof(cmdline));
for (i = 1; i < argc; i++) {
if (strlcat(cmdline, " ", sizeof(cmdline)) >= sizeof(cmdline))
break;
cmd = argv[0];
if (!permit(uid, groups, ngroups, &rule, target, cmd,
- (const char**)argv + 1)) {
+ (const char **)argv + 1)) {
syslog(LOG_AUTHPRIV | LOG_NOTICE,
"failed command for %s: %s", myname, cmdline);
errc(1, EPERM, NULL);
}
-#ifdef HAVE_BSD_AUTH_H
+#if defined(__OpenBSD__)
if (!(rule->options & NOPASS)) {
if (nflag)
errx(1, "Authorization required");
- char *challenge = NULL, *response, rbuf[1024], cbuf[128];
- auth_session_t *as;
-
- if (!(as = auth_userchallenge(myname, login_style, "auth-doas",
- &challenge)))
- errx(1, "Authorization failed");
- if (!challenge) {
- char host[HOST_NAME_MAX + 1];
- if (gethostname(host, sizeof(host)))
- snprintf(host, sizeof(host), "?");
- snprintf(cbuf, sizeof(cbuf),
- "\rdoas (%.32s@%.32s) password: ", myname, host);
- challenge = cbuf;
- }
- response = readpassphrase(challenge, rbuf, sizeof(rbuf),
- RPP_REQUIRE_TTY);
- if (response == NULL && errno == ENOTTY) {
- syslog(LOG_AUTHPRIV | LOG_NOTICE,
- "tty required for %s", myname);
- errx(1, "a tty is required");
- }
- if (!auth_userresponse(as, response, 0)) {
- syslog(LOG_AUTHPRIV | LOG_NOTICE,
- "failed auth for %s", myname);
- errc(1, EPERM, NULL);
- }
- explicit_bzero(rbuf, sizeof(rbuf));
+ authuser(myname, login_style, rule->options & PERSIST);
}
-#elif HAVE_PAM_APPL_H
+
+ if (pledge("stdio rpath getpw exec id", NULL) == -1)
+ err(1, "pledge");
+
pw = getpwuid(target);
if (!pw)
errx(1, "no passwd entry for target");
- if (!pamauth(pw->pw_name, myname, !nflag, rule->options & NOPASS)) {
- syslog(LOG_AUTHPRIV | LOG_NOTICE, "failed auth for %s", myname);
- errc(1, EPERM, NULL);
- }
-#elif HAVE_SHADOW_H
- const char *pass;
-
+#elif defined(USE_SHADOW)
if (!(rule->options & NOPASS)) {
if (nflag)
errx(1, "Authorization required");
- pass = pw->pw_passwd;
- if (pass[0] == 'x' && pass[1] == '\0') {
- struct spwd *sp;
- if (!(sp = getspnam(myname)))
- errx(1, "Authorization failed");
- pass = sp->sp_pwdp;
- }
-
- char *challenge, *response, rbuf[1024], cbuf[128], host[HOST_NAME_MAX + 1];
- if (gethostname(host, sizeof(host)))
- snprintf(host, sizeof(host), "?");
- snprintf(cbuf, sizeof(cbuf),
- "\rdoas (%.32s@%.32s) password: ", myname, host);
- challenge = cbuf;
-
- response = readpassphrase(challenge, rbuf, sizeof(rbuf), RPP_REQUIRE_TTY);
- if (response == NULL && errno == ENOTTY) {
- syslog(LOG_AUTHPRIV | LOG_NOTICE,
- "tty required for %s", myname);
- errx(1, "a tty is required");
- }
- if (strcmp(crypt(response, pass), pass) != 0) {
- syslog(LOG_AUTHPRIV | LOG_NOTICE, "failed auth for %s", myname);
- errc(1, EPERM, NULL);
- }
- explicit_bzero(rbuf, sizeof(rbuf));
+ shadowauth(myname, rule->options & PERSIST);
}
-#else
- if (!(rule->options & NOPASS))
- errx(1, "Authorization required");
-#endif /* HAVE_BSD_AUTH_H */
- if (pledge("stdio rpath getpw exec id", NULL) == -1)
- err(1, "pledge");
+ pw = getpwuid(target);
+ if (!pw)
+ errx(1, "no passwd entry for target");
+#elif defined(USE_PAM)
pw = getpwuid(target);
if (!pw)
errx(1, "no passwd entry for target");
-#ifdef HAVE_BSD_AUTH_H
+ pamauth(pw->pw_name, myname, !nflag, rule->options & NOPASS,
+ rule->options & PERSIST);
+
+#else
+ (void) nflag;
+ if (!(rule->options & NOPASS)) {
+ errx(1, "Authorization required");
+ }
+#endif
+
+#ifdef HAVE_SETUSERCONTEXT
if (setusercontext(NULL, pw, target, LOGIN_SETGROUP |
LOGIN_SETPRIORITY | LOGIN_SETRESOURCES | LOGIN_SETUMASK |
LOGIN_SETUSER) != 0)
errx(1, "failed to set user context for target");
#else
- warn(pw->pw_name);
if (setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) != 0)
- errx(1, "setresgid");
+ err(1, "setresgid");
if (initgroups(pw->pw_name, pw->pw_gid) != 0)
- errx(1, "initgroups");
+ err(1, "initgroups");
if (setresuid(target, target, target) != 0)
- errx(1, "setresuid");
+ err(1, "setresuid");
#endif
+#ifdef __OpenBSD__
if (pledge("stdio rpath exec", NULL) == -1)
err(1, "pledge");
+#endif
if (getcwd(cwdpath, sizeof(cwdpath)) == NULL)
cwd = "(failed)";
else
cwd = cwdpath;
+#ifdef __OpenBSD__
if (pledge("stdio exec", NULL) == -1)
err(1, "pledge");
+#endif
syslog(LOG_AUTHPRIV | LOG_INFO, "%s ran command %s as %s from %s",
myname, cmdline, pw->pw_name, cwd);
projects / opendoas.git / blobdiff