summaryrefslogtreecommitdiff
path: root/modules/pam_xauth
diff options
context:
space:
mode:
Diffstat (limited to 'modules/pam_xauth')
-rw-r--r--modules/pam_xauth/.cvsignore10
-rw-r--r--modules/pam_xauth/Makefile.am31
-rw-r--r--modules/pam_xauth/README.xml46
-rw-r--r--modules/pam_xauth/pam_xauth.8.xml293
-rw-r--r--modules/pam_xauth/pam_xauth.c686
-rwxr-xr-xmodules/pam_xauth/tst-pam_xauth2
6 files changed, 0 insertions, 1068 deletions
diff --git a/modules/pam_xauth/.cvsignore b/modules/pam_xauth/.cvsignore
deleted file mode 100644
index 1611e414..00000000
--- a/modules/pam_xauth/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-*.la
-*.lo
-*.so
-*~
-.deps
-.libs
-Makefile
-Makefile.in
-README
-pam_xauth.8
diff --git a/modules/pam_xauth/Makefile.am b/modules/pam_xauth/Makefile.am
deleted file mode 100644
index 8f1d56b0..00000000
--- a/modules/pam_xauth/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
-#
-
-CLEANFILES = *~
-
-EXTRA_DIST = README ${MANS} $(XMLS) tst-pam_xauth
-
-man_MANS = pam_xauth.8
-XMLS = README.xml pam_xauth.8.xml
-
-TESTS = tst-pam_xauth
-
-securelibdir = $(SECUREDIR)
-secureconfdir = $(SCONFIGDIR)
-
-AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include
-AM_LDFLAGS = -no-undefined -avoid-version -module \
- -L$(top_builddir)/libpam -lpam
-if HAVE_VERSIONING
- AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
-endif
-
-securelib_LTLIBRARIES = pam_xauth.la
-
-if ENABLE_REGENERATE_MAN
-noinst_DATA = README
-README: pam_xauth.8.xml
--include $(top_srcdir)/Make.xml.rules
-endif
-
diff --git a/modules/pam_xauth/README.xml b/modules/pam_xauth/README.xml
deleted file mode 100644
index adefbd98..00000000
--- a/modules/pam_xauth/README.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding='UTF-8'?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.docbook.org/xml/4.3/docbookx.dtd"
-[
-<!--
-<!ENTITY pamaccess SYSTEM "pam_xauth.8.xml">
--->
-]>
-
-<article>
-
- <articleinfo>
-
- <title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="pam_xauth.8.xml" xpointer='xpointer(//refnamediv[@id = "pam_xauth-name"]/*)'/>
- </title>
-
- </articleinfo>
-
- <section>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="pam_xauth.8.xml" xpointer='xpointer(//refsect1[@id = "pam_xauth-description"]/*)'/>
- </section>
-
- <section>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="pam_xauth.8.xml" xpointer='xpointer(//refsect1[@id = "pam_xauth-options"]/*)'/>
- </section>
-
- <section>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="pam_xauth.8.xml" xpointer='xpointer(//refsect1[@id = "pam_xauth-examples"]/*)'/>
- </section>
-
- <section>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="pam_xauth.8.xml" xpointer='xpointer(//refsect1[@id = "pam_xauth-implementation"]/*)'/>
- </section>
-
- <section>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="pam_xauth.8.xml" xpointer='xpointer(//refsect1[@id = "pam_xauth-author"]/*)'/>
- </section>
-
-</article>
diff --git a/modules/pam_xauth/pam_xauth.8.xml b/modules/pam_xauth/pam_xauth.8.xml
deleted file mode 100644
index f6323f26..00000000
--- a/modules/pam_xauth/pam_xauth.8.xml
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding='UTF-8'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-
-<refentry id="pam_xauth">
-
- <refmeta>
- <refentrytitle>pam_xauth</refentrytitle>
- <manvolnum>8</manvolnum>
- <refmiscinfo class="sectdesc">Linux-PAM Manual</refmiscinfo>
- </refmeta>
-
- <refnamediv id="pam_xauth-name">
- <refname>pam_xauth</refname>
- <refpurpose>PAM module to forward xauth keys between users</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
- <cmdsynopsis id="pam_xauth-cmdsynopsis">
- <command>pam_xauth.so</command>
- <arg choice="opt">
- debug
- </arg>
- <arg choice="opt">
- xauthpath=<replaceable>/path/to/xauth</replaceable>
- </arg>
- <arg choice="opt">
- systemuser=<replaceable>UID</replaceable>
- </arg>
- <arg choice="opt">
- targetuser=<replaceable>UID</replaceable>
- </arg>
- </cmdsynopsis>
- </refsynopsisdiv>
-
- <refsect1 id="pam_xauth-description">
- <title>DESCRIPTION</title>
- <para>
- The pam_xauth PAM module is designed to forward xauth keys
- (sometimes referred to as "cookies") between users.
- </para>
- <para>
- Without pam_xauth, when xauth is enabled and a user uses the
- <citerefentry>
- <refentrytitle>su</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry> command to assume another user's priviledges,
- that user is no longer able to access the original user's X display
- because the new user does not have the key needed to access the
- display. pam_xauth solves the problem by forwarding the key from
- the user running su (the source user) to the user whose identity the
- source user is assuming (the target user) when the session is created,
- and destroying the key when the session is torn down.
- </para>
- <para>
- This means, for example, that when you run
- <citerefentry>
- <refentrytitle>su</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry> from an xterm sesssion, you will be able to run
- X programs without explicitly dealing with the
- <citerefentry>
- <refentrytitle>xauth</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry> xauth command or ~/.Xauthority files.
- </para>
- <para>
- pam_xauth will only forward keys if xauth can list a key connected
- to the $DISPLAY environment variable.
- </para>
- <para>
- Primitive access control is provided by
- <filename>~/.xauth/export</filename> in the invoking user's home
- directory and <filename>~/.xauth/import</filename> in the target
- user's home directory.
- </para>
- <para>
- If a user has a <filename>~/.xauth/import</filename> file, the user
- will only receive cookies from users listed in the file. If there is
- no <filename>~/.xauth/import</filename> file, the user will accept
- cookies from any other user.
- </para>
- <para>
- If a user has a <filename>.xauth/export</filename> file, the user will
- only forward cookies to users listed in the file. If there is no
- <filename>~/.xauth/export</filename> file, and the invoking user is
- not <emphasis remap='B'>root</emphasis>, the user will forward cookies
- to any other user. If there is no <filename>~/.xauth/export</filename>
- file, and the invoking user is <emphasis remap='B'>root</emphasis>,
- the user will <emphasis remap='I'>not</emphasis> forward cookies to
- other users.
- </para>
- <para>
- Both the import and export files support wildcards (such as
- <emphasis remap='I'>*</emphasis>). Both the import and export files
- can be empty, signifying that no users are allowed.
- </para>
- </refsect1>
-
- <refsect1 id="pam_xauth-options">
- <title>OPTIONS</title>
- <variablelist>
- <varlistentry>
- <term>
- <option>debug</option>
- </term>
- <listitem>
- <para>
- Print debug information.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>xauthpath=<replaceable>/path/to/xauth</replaceable></option>
- </term>
- <listitem>
- <para>
- Specify the path the xauth program (it is expected in
- <filename>/usr/X11R6/bin/xauth</filename>,
- <filename>/usr/bin/xauth</filename>, or
- <filename>/usr/bin/X11/xauth</filename> by default).
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>systemuser=<replaceable>UID</replaceable></option>
- </term>
- <listitem>
- <para>
- Specify the highest UID which will be assumed to belong to a
- "system" user. pam_xauth will refuse to forward credentials to
- users with UID less than or equal to this number, except for
- root and the "targetuser", if specified.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>targetuser=<replaceable>UID</replaceable></option>
- </term>
- <listitem>
- <para>
- Specify a single target UID which is exempt from the
- systemuser check.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 id="pam_xauth-services">
- <title>MODULE SERVICES PROVIDED</title>
- <para>
- Only the <emphasis remap='B'>session</emphasis> service is supported.
- </para>
- </refsect1>
-
- <refsect1 id='pam_xauth-return_values'>
- <title>RETURN VALUES</title>
- <variablelist>
- <varlistentry>
- <term>PAM_BUF_ERR</term>
- <listitem>
- <para>
- Memory buffer error.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>PAM_PERM_DENIED</term>
- <listitem>
- <para>
- Permission denied by import/export file.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>PAM_SESSION_ERR</term>
- <listitem>
- <para>
- Cannot determine user name, UID or access users home directory.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>PAM_SUCCESS</term>
- <listitem>
- <para>
- Success.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>PAM_USER_UNKNOWN</term>
- <listitem>
- <para>
- User not known.
- </para>
- </listitem>
- </varlistentry>
-
- </variablelist>
- </refsect1>
-
- <refsect1 id='pam_xauth-examples'>
- <title>EXAMPLES</title>
- <para>
- Add the following line to <filename>/etc/pam.d/su</filename> to
- forward xauth keys between users when calling su:
- <programlisting>
-session optional pam_xauth.so
- </programlisting>
- </para>
- </refsect1>
-
- <refsect1 id="pam_xauth-implementation">
- <title>IMPLEMENTATION DETAILS</title>
- <para>
- pam_xauth will work <emphasis remap='I'>only</emphasis> if it is
- used from a setuid application in which the
- <function>getuid</function>() call returns the id of the user
- running the application, and for which PAM can supply the name
- of the account that the user is attempting to assume. The typical
- application of this type is
- <citerefentry>
- <refentrytitle>su</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry>.
- The application must call both <function>pam_open_session</function>()
- and <function>pam_close_session</function>() with the ruid set to the
- uid of the calling user and the euid set to root, and must have
- provided as the PAM_USER item the name of the target user.
- </para>
- <para>
- pam_xauth calls
- <citerefentry>
- <refentrytitle>xauth</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry> as the source user to extract the key for $DISPLAY,
- then calls xauth as the target user to merge the key into the a
- temporary database and later remove the database.
- </para>
- <para>
- pam_xauth cannot be told to not remove the keys when the session
- is closed.
- </para>
- </refsect1>
-
- <refsect1 id="pam_lastlog-files">
- <title>FILES</title>
- <variablelist>
- <varlistentry>
- <term><filename>~/.xauth/import</filename></term>
- <listitem>
- <para>XXX</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><filename>~/.xauth/export</filename></term>
- <listitem>
- <para>XXX</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
-
-
- <refsect1 id='pam_xauth-see_also'>
- <title>SEE ALSO</title>
- <para>
- <citerefentry>
- <refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry>,
- <citerefentry>
- <refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
- </citerefentry>,
- <citerefentry>
- <refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
- </citerefentry>
- </para>
- </refsect1>
-
- <refsect1 id='pam_xauth-author'>
- <title>AUTHOR</title>
- <para>
- pam_xauth was written by Nalin Dahyabhai &lt;nalin@redhat.com&gt;,
- based on original version by
- Michael K. Johnson &lt;johnsonm@redhat.com&gt;.
- </para>
- </refsect1>
-
-</refentry>
diff --git a/modules/pam_xauth/pam_xauth.c b/modules/pam_xauth/pam_xauth.c
deleted file mode 100644
index 1135d4b7..00000000
--- a/modules/pam_xauth/pam_xauth.c
+++ /dev/null
@@ -1,686 +0,0 @@
-/*
- * Copyright 2001-2003 Red Hat, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, and the entire permission notice in its entirety,
- * including the disclaimer of warranties.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
- *
- * ALTERNATIVELY, this product may be distributed under the terms of
- * the GNU Public License, in which case the provisions of the GPL are
- * required INSTEAD OF the above restrictions. (This clause is
- * necessary due to a potential bad interaction between the GPL and
- * the restrictions contained in a BSD-style copyright.)
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include <sys/types.h>
-#include <sys/fsuid.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include <fnmatch.h>
-#include <grp.h>
-#include <limits.h>
-#include <netdb.h>
-#include <pwd.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
-
-#define PAM_SM_SESSION
-
-#include <security/pam_modules.h>
-#include <security/_pam_macros.h>
-#include <security/pam_modutil.h>
-#include <security/pam_ext.h>
-
-#define DATANAME "pam_xauth_cookie_file"
-#define XAUTHENV "XAUTHORITY"
-#define HOMEENV "HOME"
-#define XAUTHDEF ".Xauthority"
-#define XAUTHTMP ".xauthXXXXXX"
-
-/* Hurd compatibility */
-#ifndef PATH_MAX
-#define PATH_MAX 4096
-#endif
-
-/* Possible paths to xauth executable */
-static const char * const xauthpaths[] = {
-#ifdef PAM_PATH_XAUTH
- PAM_PATH_XAUTH,
-#endif
- "/usr/X11R6/bin/xauth",
- "/usr/bin/xauth",
- "/usr/bin/X11/xauth"
-};
-
-/* Run a given command (with a NULL-terminated argument list), feeding it the
- * given input on stdin, and storing any output it generates. */
-static int
-run_coprocess(const char *input, char **output,
- uid_t uid, gid_t gid, const char *command, ...)
-{
- int ipipe[2], opipe[2], i;
- char buf[LINE_MAX];
- pid_t child;
- char *buffer = NULL;
- size_t buffer_size = 0;
- va_list ap;
-
- *output = NULL;
-
- /* Create stdio pipery. */
- if (pipe(ipipe) == -1) {
- return -1;
- }
- if (pipe(opipe) == -1) {
- close(ipipe[0]);
- close(ipipe[1]);
- return -1;
- }
-
- /* Fork off a child. */
- child = fork();
- if (child == -1) {
- close(ipipe[0]);
- close(ipipe[1]);
- close(opipe[0]);
- close(opipe[1]);
- return -1;
- }
-
- if (child == 0) {
- /* We're the child. */
- size_t j;
- char *args[10];
- const char *tmp;
- /* Drop privileges. */
- setgid(gid);
- setgroups(0, NULL);
- setuid(uid);
- /* Initialize the argument list. */
- memset(args, 0, sizeof(args));
- /* Set the pipe descriptors up as stdin and stdout, and close
- * everything else, including the original values for the
- * descriptors. */
- dup2(ipipe[0], STDIN_FILENO);
- dup2(opipe[1], STDOUT_FILENO);
- for (i = 0; i < sysconf(_SC_OPEN_MAX); i++) {
- if ((i != STDIN_FILENO) && (i != STDOUT_FILENO)) {
- close(i);
- }
- }
- /* Convert the varargs list into a regular array of strings. */
- va_start(ap, command);
- args[0] = strdup(command);
- for (j = 1; j < ((sizeof(args) / sizeof(args[0])) - 1); j++) {
- tmp = va_arg(ap, const char*);
- if (tmp == NULL) {
- break;
- }
- args[j] = strdup(tmp);
- }
- /* Run the command. */
- execv(command, args);
- /* Never reached. */
- exit(1);
- }
-
- /* We're the parent, so close the other ends of the pipes. */
- close(ipipe[0]);
- close(opipe[1]);
- /* Send input to the process (if we have any), then send an EOF. */
- if (input) {
- (void)pam_modutil_write(ipipe[1], input, strlen(input));
- }
- close(ipipe[1]);
-
- /* Read data output until we run out of stuff to read. */
- i = pam_modutil_read(opipe[0], buf, sizeof(buf));
- while ((i != 0) && (i != -1)) {
- char *tmp;
- /* Resize the buffer to hold the data. */
- tmp = realloc(buffer, buffer_size + i + 1);
- if (tmp == NULL) {
- /* Uh-oh, bail. */
- if (buffer != NULL) {
- free(buffer);
- }
- close(opipe[0]);
- waitpid(child, NULL, 0);
- return -1;
- }
- /* Save the new buffer location, copy the newly-read data into
- * the buffer, and make sure the result will be
- * nul-terminated. */
- buffer = tmp;
- memcpy(buffer + buffer_size, buf, i);
- buffer[buffer_size + i] = '\0';
- buffer_size += i;
- /* Try to read again. */
- i = pam_modutil_read(opipe[0], buf, sizeof(buf));
- }
- /* No more data. Clean up and return data. */
- close(opipe[0]);
- *output = buffer;
- waitpid(child, NULL, 0);
- return 0;
-}
-
-/* Free a data item. */
-static void
-cleanup (pam_handle_t *pamh UNUSED, void *data, int err UNUSED)
-{
- free (data);
-}
-
-/* Check if we want to allow export to the other user, or import from the
- * other user. */
-static int
-check_acl(pam_handle_t *pamh,
- const char *sense, const char *this_user, const char *other_user,
- int noent_code, int debug)
-{
- char path[PATH_MAX];
- struct passwd *pwd;
- FILE *fp;
- int i;
- uid_t euid;
- /* Check this user's <sense> file. */
- pwd = pam_modutil_getpwnam(pamh, this_user);
- if (pwd == NULL) {
- pam_syslog(pamh, LOG_ERR,
- "error determining home directory for '%s'",
- this_user);
- return PAM_SESSION_ERR;
- }
- /* Figure out what that file is really named. */
- i = snprintf(path, sizeof(path), "%s/.xauth/%s", pwd->pw_dir, sense);
- if ((i >= (int)sizeof(path)) || (i < 0)) {
- pam_syslog(pamh, LOG_ERR,
- "name of user's home directory is too long");
- return PAM_SESSION_ERR;
- }
- euid = geteuid();
- setfsuid(pwd->pw_uid);
- fp = fopen(path, "r");
- setfsuid(euid);
- if (fp != NULL) {
- char buf[LINE_MAX], *tmp;
- /* Scan the file for a list of specs of users to "trust". */
- while (fgets(buf, sizeof(buf), fp) != NULL) {
- tmp = memchr(buf, '\r', sizeof(buf));
- if (tmp != NULL) {
- *tmp = '\0';
- }
- tmp = memchr(buf, '\n', sizeof(buf));
- if (tmp != NULL) {
- *tmp = '\0';
- }
- if (fnmatch(buf, other_user, 0) == 0) {
- if (debug) {
- pam_syslog(pamh, LOG_DEBUG,
- "%s %s allowed by %s",
- other_user, sense, path);
- }
- fclose(fp);
- return PAM_SUCCESS;
- }
- }
- /* If there's no match in the file, we fail. */
- if (debug) {
- pam_syslog(pamh, LOG_DEBUG, "%s not listed in %s",
- other_user, path);
- }
- fclose(fp);
- return PAM_PERM_DENIED;
- } else {
- /* Default to okay if the file doesn't exist. */
- switch (errno) {
- case ENOENT:
- if (noent_code == PAM_SUCCESS) {
- if (debug) {
- pam_syslog(pamh, LOG_DEBUG,
- "%s does not exist, ignoring",
- path);
- }
- } else {
- if (debug) {
- pam_syslog(pamh, LOG_DEBUG,
- "%s does not exist, failing",
- path);
- }
- }
- return noent_code;
- default:
- if (debug) {
- pam_syslog(pamh, LOG_ERR,
- "error opening %s: %m", path);
- }
- return PAM_PERM_DENIED;
- }
- }
-}
-
-int
-pam_sm_open_session (pam_handle_t *pamh, int flags UNUSED,
- int argc, const char **argv)
-{
- char *cookiefile = NULL, *xauthority = NULL,
- *cookie = NULL, *display = NULL, *tmp = NULL;
- const char *user, *xauth = NULL;
- struct passwd *tpwd, *rpwd;
- int fd, i, debug = 0;
- int retval = PAM_SUCCESS;
- uid_t systemuser = 499, targetuser = 0, euid;
-
- /* Parse arguments. We don't understand many, so no sense in breaking
- * this into a separate function. */
- for (i = 0; i < argc; i++) {
- if (strcmp(argv[i], "debug") == 0) {
- debug = 1;
- continue;
- }
- if (strncmp(argv[i], "xauthpath=", 10) == 0) {
- xauth = argv[i] + 10;
- continue;
- }
- if (strncmp(argv[i], "targetuser=", 11) == 0) {
- long l = strtol(argv[i] + 11, &tmp, 10);
- if ((strlen(argv[i] + 11) > 0) && (*tmp == '\0')) {
- targetuser = l;
- } else {
- pam_syslog(pamh, LOG_WARNING,
- "invalid value for targetuser (`%s')",
- argv[i] + 11);
- }
- continue;
- }
- if (strncmp(argv[i], "systemuser=", 11) == 0) {
- long l = strtol(argv[i] + 11, &tmp, 10);
- if ((strlen(argv[i] + 11) > 0) && (*tmp == '\0')) {
- systemuser = l;
- } else {
- pam_syslog(pamh, LOG_WARNING,
- "invalid value for systemuser (`%s')",
- argv[i] + 11);
- }
- continue;
- }
- pam_syslog(pamh, LOG_WARNING, "unrecognized option `%s'",
- argv[i]);
- }
-
- if (xauth == NULL) {
- size_t j;
- for (j = 0; j < sizeof(xauthpaths)/sizeof(xauthpaths[0]); j++) {
- if (access(xauthpaths[j], X_OK) == 0) {
- xauth = xauthpaths[j];
- break;
- }
- }
- if (xauth == NULL) {
- /* xauth executable not found - nothing to do */
- return PAM_SUCCESS;
- }
- }
-
- /* If DISPLAY isn't set, we don't really care, now do we? */
- if ((display = getenv("DISPLAY")) == NULL) {
- if (debug) {
- pam_syslog(pamh, LOG_DEBUG,
- "user has no DISPLAY, doing nothing");
- }
- return PAM_SUCCESS;
- }
-
- /* Read the target user's name. */
- if (pam_get_user(pamh, &user, NULL) != PAM_SUCCESS) {
- pam_syslog(pamh, LOG_ERR,
- "error determining target user's name");
- retval = PAM_SESSION_ERR;
- goto cleanup;
- }
- rpwd = pam_modutil_getpwuid(pamh, getuid());
- if (rpwd == NULL) {
- pam_syslog(pamh, LOG_ERR,
- "error determining invoking user's name");
- retval = PAM_SESSION_ERR;
- goto cleanup;
- }
-
- /* Get the target user's UID and primary GID, which we'll need to set
- * on the xauthority file we create later on. */
- tpwd = pam_modutil_getpwnam(pamh, user);
- if (tpwd == NULL) {
- pam_syslog(pamh, LOG_ERR,
- "error determining target user's UID");
- retval = PAM_SESSION_ERR;
- goto cleanup;
- }
-
- if (debug) {
- pam_syslog(pamh, LOG_DEBUG,
- "requesting user %lu/%lu, target user %lu/%lu",
- (unsigned long) rpwd->pw_uid,
- (unsigned long) rpwd->pw_gid,
- (unsigned long) tpwd->pw_uid,
- (unsigned long) tpwd->pw_gid);
- }
-
- /* If the UID is a system account (and not the superuser), forget
- * about forwarding keys. */
- if ((tpwd->pw_uid != 0) &&
- (tpwd->pw_uid != targetuser) &&
- (tpwd->pw_uid <= systemuser)) {
- if (debug) {
- pam_syslog(pamh, LOG_DEBUG,
- "not forwarding cookies to user ID %lu",
- (unsigned long) tpwd->pw_uid);
- }
- retval = PAM_SESSION_ERR;
- goto cleanup;
- }
-
- /* Check that both users are amenable to this. By default, this
- * boils down to this policy:
- * export(ruser=root): only if <user> is listed in .xauth/export
- * export(ruser=*) if <user> is listed in .xauth/export, or
- * if .xauth/export does not exist
- * import(user=*): if <ruser> is listed in .xauth/import, or
- * if .xauth/import does not exist */
- i = (getuid() != 0 || tpwd->pw_uid == 0) ? PAM_SUCCESS : PAM_PERM_DENIED;
- i = check_acl(pamh, "export", rpwd->pw_name, user, i, debug);
- if (i != PAM_SUCCESS) {
- retval = PAM_SESSION_ERR;
- goto cleanup;
- }
- i = PAM_SUCCESS;
- i = check_acl(pamh, "import", user, rpwd->pw_name, i, debug);
- if (i != PAM_SUCCESS) {
- retval = PAM_SESSION_ERR;
- goto cleanup;
- }
-
- /* Figure out where the source user's .Xauthority file is. */
- if (getenv(XAUTHENV) != NULL) {
- cookiefile = strdup(getenv(XAUTHENV));
- } else {
- cookiefile = malloc(strlen(rpwd->pw_dir) + 1 +
- strlen(XAUTHDEF) + 1);
- if (cookiefile == NULL) {
- retval = PAM_SESSION_ERR;
- goto cleanup;
- }
- strcpy(cookiefile, rpwd->pw_dir);
- strcat(cookiefile, "/");
- strcat(cookiefile, XAUTHDEF);
- }
- if (debug) {
- pam_syslog(pamh, LOG_DEBUG, "reading keys from `%s'",
- cookiefile);
- }
-
- /* Read the user's .Xauthority file. Because the current UID is
- * the original user's UID, this will only fail if something has
- * gone wrong, or we have no cookies. */
- if (debug) {
- pam_syslog(pamh, LOG_DEBUG,
- "running \"%s %s %s %s %s\" as %lu/%lu",
- xauth, "-f", cookiefile, "nlist", display,
- (unsigned long) getuid(), (unsigned long) getgid());
- }
- if (run_coprocess(NULL, &cookie,
- getuid(), getgid(),
- xauth, "-f", cookiefile, "nlist", display,
- NULL) == 0) {
- /* Check that we got a cookie. If not, we get creative. */
- if (((cookie == NULL) || (strlen(cookie) == 0)) &&
- ((strncmp(display, "localhost:", 10) == 0) ||
- (strncmp(display, "localhost/unix:", 15) == 0))) {
- char *t, *screen;
- size_t tlen, slen;
- /* Free the useless cookie string. */
- if (cookie != NULL) {
- free(cookie);
- cookie = NULL;
- }
- /* Allocate enough space to hold an adjusted name. */
- tlen = strlen(display) + LINE_MAX + 1;
- t = malloc(tlen);
- if (t != NULL) {
- memset(t, 0, tlen);
- if (gethostname(t, tlen - 1) != -1) {
- /* Append the protocol and then the
- * screen number. */
- if (strlen(t) < tlen - 6) {
- strcat(t, "/unix:");
- }
- screen = strchr(display, ':');
- if (screen != NULL) {
- screen++;
- slen = strlen(screen);
- if (strlen(t) + slen < tlen) {
- strcat(t, screen);
- }
- }
- if (debug) {
- pam_syslog(pamh, LOG_DEBUG,
- "no key for `%s', "
- "trying `%s'",
- display, t);
- }
- /* Read the cookie for this display. */
- if (debug) {
- pam_syslog(pamh, LOG_DEBUG,
- "running "
- "\"%s %s %s %s %s\" as "
- "%lu/%lu",
- xauth,
- "-f",
- cookiefile,
- "nlist",
- t,
- (unsigned long) getuid(),
- (unsigned long) getgid());
- }
- run_coprocess(NULL, &cookie,
- getuid(), getgid(),
- xauth, "-f", cookiefile,
- "nlist", t, NULL);
- }
- free(t);
- t = NULL;
- }
- }
-
- /* Check that we got a cookie, this time for real. */
- if ((cookie == NULL) || (strlen(cookie) == 0)) {
- if (debug) {
- pam_syslog(pamh, LOG_DEBUG, "no key");
- }
- retval = PAM_SESSION_ERR;
- goto cleanup;
- }
-
- /* Generate the environment variable
- * "XAUTHORITY=<homedir>/filename". */
- if (asprintf(&xauthority, "%s=%s/%s",
- XAUTHENV, tpwd->pw_dir, XAUTHTMP) < 0) {
- xauthority = NULL;
- if (debug) {
- pam_syslog(pamh, LOG_DEBUG, "out of memory");
- }
- retval = PAM_SESSION_ERR;
- goto cleanup;
- }
-
- /* Generate a new file to hold the data. */
- euid = geteuid();
- setfsuid(tpwd->pw_uid);
- fd = mkstemp(xauthority + strlen(XAUTHENV) + 1);
- setfsuid(euid);
- if (fd == -1) {
- pam_syslog(pamh, LOG_ERR,
- "error creating temporary file `%s': %m",
- xauthority + strlen(XAUTHENV) + 1);
- retval = PAM_SESSION_ERR;
- goto cleanup;
- }
- /* Set permissions on the new file and dispose of the
- * descriptor. */
- if (fchown(fd, tpwd->pw_uid, tpwd->pw_gid) < 0)
- pam_syslog (pamh, LOG_ERR, "fchown: %m");
- close(fd);
-
- /* Get a copy of the filename to save as a data item for
- * removal at session-close time. */
- free(cookiefile);
- cookiefile = strdup(xauthority + strlen(XAUTHENV) + 1);
-
- /* Save the filename. */
- if (pam_set_data(pamh, DATANAME, cookiefile, cleanup) != PAM_SUCCESS) {
- pam_syslog(pamh, LOG_ERR,
- "error saving name of temporary file `%s'",
- cookiefile);
- unlink(cookiefile);
- retval = PAM_SESSION_ERR;
- goto cleanup;
- }
-
- /* Set the new variable in the environment. */
- if (pam_putenv (pamh, xauthority) != PAM_SUCCESS)
- pam_syslog(pamh, LOG_ERR,
- "can't set environment variable '%s'",
- xauthority);
- putenv (xauthority); /* The environment owns this string now. */
- xauthority = NULL; /* Don't free environment variables. */
-
- /* set $DISPLAY in pam handle to make su - work */
- {
- char *d;
-
- if (asprintf(&d, "DISPLAY=%s", display) < 0)
- {
- pam_syslog(pamh, LOG_DEBUG, "out of memory");
- cookiefile = NULL;
- retval = PAM_SESSION_ERR;
- goto cleanup;
- }
-
- if (pam_putenv (pamh, d) != PAM_SUCCESS)
- pam_syslog (pamh, LOG_DEBUG,
- "can't set environment variable '%s'", d);
- free (d);
- }
-
- /* Merge the cookie we read before into the new file. */
- if (debug) {
- pam_syslog(pamh, LOG_DEBUG,
- "writing key `%s' to temporary file `%s'",
- cookie, cookiefile);
- }
- if (debug) {
- pam_syslog(pamh, LOG_DEBUG,
- "running \"%s %s %s %s %s\" as %lu/%lu",
- xauth, "-f", cookiefile, "nmerge", "-",
- (unsigned long) tpwd->pw_uid,
- (unsigned long) tpwd->pw_gid);
- }
- run_coprocess(cookie, &tmp,
- tpwd->pw_uid, tpwd->pw_gid,
- xauth, "-f", cookiefile, "nmerge", "-", NULL);
-
- /* We don't need to keep a copy of these around any more. */
- cookiefile = NULL;
- free(tmp);
- }
-cleanup:
- /* Unset any old XAUTHORITY variable in the environment. */
- if (retval != PAM_SUCCESS && getenv (XAUTHENV))
- unsetenv (XAUTHENV);
- free(cookiefile);
- free(cookie);
- free(xauthority);
- return retval;
-}
-
-int
-pam_sm_close_session (pam_handle_t *pamh, int flags UNUSED,
- int argc, const char **argv)
-{
- void *cookiefile;
- int i, debug = 0;
-
- /* Parse arguments. We don't understand many, so no sense in breaking
- * this into a separate function. */
- for (i = 0; i < argc; i++) {
- if (strcmp(argv[i], "debug") == 0) {
- debug = 1;
- continue;
- }
- if (strncmp(argv[i], "xauthpath=", 10) == 0) {
- continue;
- }
- if (strncmp(argv[i], "systemuser=", 11) == 0) {
- continue;
- }
- if (strncmp(argv[i], "targetuser=", 11) == 0) {
- continue;
- }
- pam_syslog(pamh, LOG_WARNING, "unrecognized option `%s'",
- argv[i]);
- }
-
- /* Try to retrieve the name of a file we created when the session was
- * opened. */
- if (pam_get_data(pamh, DATANAME, (const void**) &cookiefile) == PAM_SUCCESS) {
- /* We'll only try to remove the file once. */
- if (strlen((char*)cookiefile) > 0) {
- if (debug) {
- pam_syslog(pamh, LOG_DEBUG, "removing `%s'",
- (char*)cookiefile);
- }
- unlink((char*)cookiefile);
- *((char*)cookiefile) = '\0';
- }
- }
- return PAM_SUCCESS;
-}
-
-/* static module data */
-#ifdef PAM_STATIC
-struct pam_module _pam_xauth_modstruct = {
- "pam_xauth",
- NULL,
- NULL,
- NULL,
- pam_sm_open_session,
- pam_sm_close_session,
- NULL
-};
-#endif
diff --git a/modules/pam_xauth/tst-pam_xauth b/modules/pam_xauth/tst-pam_xauth
deleted file mode 100755
index 32948963..00000000
--- a/modules/pam_xauth/tst-pam_xauth
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-../../tests/tst-dlopen .libs/pam_xauth.so