#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 [-Lnsv] "
-#ifdef HAVE_BSD_AUTH_H
+ fprintf(stderr, "usage: doas [-Lns] "
+#ifdef __OpenBSD__
"[-a style] "
#endif
"[-C config] [-u user] command [args]\n");
}
}
-#ifdef HAVE_BSD_AUTH_H
+#ifdef USE_BSD_AUTH
static void
authuser(char *myname, char *login_style, int persist)
{
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");
close(fd);
}
}
-#elif HAVE_SHADOW_H
-static void
-authuser(const char *myname, const char *login_style, int persist)
-{
- const char *hash;
- char *encrypted;
- struct passwd *pw;
-
- (void)login_style;
- (void)persist;
-
- if (!(pw = getpwnam(myname)))
- err(1, "getpwnam");
-
- hash = pw->pw_passwd;
- if (hash[0] == 'x' && hash[1] == '\0') {
- struct spwd *sp;
- if (!(sp = getspnam(myname)))
- errx(1, "Authorization failed");
- hash = sp->sp_pwdp;
- } else if (hash[0] != '*') {
- errx(1, "Authorization failed");
- }
-
- 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 (!(encrypted = crypt(response, hash)))
- errx(1, "crypt");
- if (strcmp(encrypted, hash) != 0) {
- syslog(LOG_AUTHPRIV | LOG_NOTICE, "failed auth for %s", myname);
- errx(1, "Authorization failed");
- }
- explicit_bzero(rbuf, sizeof(rbuf));
-}
-#endif /* HAVE_BSD_AUTH_H */
+#endif
int
main(int argc, char **argv)
int i, ch;
int sflag = 0;
int nflag = 0;
- int vflag = 0;
char cwdpath[PATH_MAX];
const char *cwd;
char **envp;
+#ifdef USE_BSD_AUTH
char *login_style = NULL;
+#endif
setprogname("doas");
uid = getuid();
-#ifdef HAVE_BSD_AUTH_H
-# define OPTSTRING "a:C:Lnsu:v"
+#ifdef USE_BSD_AUTH
+# define OPTSTRING "a:C:Lnsu:"
#else
-# define OPTSTRING "+C:Lnsu: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;
confpath = optarg;
break;
case 'L':
-#ifdef TIOCCLRVERAUTH
+#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)
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();
errc(1, EPERM, NULL);
}
-#if defined(HAVE_BSD_AUTH_H) || defined(HAVE_SHADOW_H)
+#if defined(__OpenBSD__)
if (!(rule->options & NOPASS)) {
if (nflag)
errx(1, "Authorization required");
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);
- errx(1, "Authorization failed");
+#elif defined(USE_SHADOW)
+ if (!(rule->options & NOPASS)) {
+ if (nflag)
+ errx(1, "Authorization required");
+
+ shadowauth(myname, rule->options & PERSIST);
}
-#else
-#error "No authentication method"
-#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
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