sync code with last improvements from OpenBSD
This commit is contained in:
commit
88965415ff
26235 changed files with 29195616 additions and 0 deletions
278
app/xsm/auth.c
Normal file
278
app/xsm/auth.c
Normal file
|
@ -0,0 +1,278 @@
|
|||
/* $Xorg: auth.c,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */
|
||||
/******************************************************************************
|
||||
|
||||
Copyright 1993, 1998 The Open Group
|
||||
|
||||
Permission to use, copy, modify, distribute, and sell this software and its
|
||||
documentation for any purpose is hereby granted without fee, provided that
|
||||
the above copyright notice appear in all copies and that both that
|
||||
copyright notice and this permission notice appear in supporting
|
||||
documentation.
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
Except as contained in this notice, the name of The Open Group shall not be
|
||||
used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from The Open Group.
|
||||
******************************************************************************/
|
||||
/* $XFree86: xc/programs/xsm/auth.c,v 1.6 2001/01/17 23:46:28 dawes Exp $ */
|
||||
|
||||
#include "xsm.h"
|
||||
|
||||
#include <X11/ICE/ICEutil.h>
|
||||
#include "auth.h"
|
||||
|
||||
#ifdef HAVE_MKSTEMP
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
static char *addAuthFile = NULL;
|
||||
static char *remAuthFile = NULL;
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Host Based Authentication Callback. This callback is invoked if
|
||||
* the connecting client can't offer any authentication methods that
|
||||
* we can accept. We can accept/reject based on the hostname.
|
||||
*/
|
||||
|
||||
Bool
|
||||
HostBasedAuthProc(char *hostname)
|
||||
{
|
||||
return (0); /* For now, we don't support host based authentication */
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* We use temporary files which contain commands to add/remove entries from
|
||||
* the .ICEauthority file.
|
||||
*/
|
||||
|
||||
static void
|
||||
write_iceauth(FILE *addfp, FILE *removefp, IceAuthDataEntry *entry)
|
||||
{
|
||||
fprintf (addfp,
|
||||
"add %s \"\" %s %s ",
|
||||
entry->protocol_name,
|
||||
entry->network_id,
|
||||
entry->auth_name);
|
||||
fprintfhex (addfp, entry->auth_data_length, entry->auth_data);
|
||||
fprintf (addfp, "\n");
|
||||
|
||||
fprintf (removefp,
|
||||
"remove protoname=%s protodata=\"\" netid=%s authname=%s\n",
|
||||
entry->protocol_name,
|
||||
entry->network_id,
|
||||
entry->auth_name);
|
||||
}
|
||||
|
||||
|
||||
|
||||
#ifndef HAVE_MKSTEMP
|
||||
static char *
|
||||
unique_filename(const char *path, const char *prefix)
|
||||
#else
|
||||
static char *
|
||||
unique_filename(const char *path, const char *prefix, int *pFd)
|
||||
#endif
|
||||
{
|
||||
#ifndef HAVE_MKSTEMP
|
||||
#ifndef X_NOT_POSIX
|
||||
return ((char *) tempnam (path, prefix));
|
||||
#else
|
||||
char tempFile[PATH_MAX];
|
||||
char *tmp;
|
||||
|
||||
snprintf (tempFile, sizeof(tempFile), "%s/%sXXXXXX", path, prefix);
|
||||
tmp = (char *) mktemp (tempFile);
|
||||
if (tmp)
|
||||
{
|
||||
return strdup(tmp);
|
||||
}
|
||||
else
|
||||
return (NULL);
|
||||
#endif
|
||||
#else
|
||||
char tempFile[PATH_MAX];
|
||||
char *ptr;
|
||||
|
||||
snprintf (tempFile, sizeof(tempFile), "%s/%sXXXXXX", path, prefix);
|
||||
ptr = strdup(tempFile);
|
||||
if (ptr != NULL)
|
||||
{
|
||||
*pFd = mkstemp(ptr);
|
||||
}
|
||||
return ptr;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Provide authentication data to clients that wish to connect
|
||||
*/
|
||||
|
||||
#define MAGIC_COOKIE_LEN 16
|
||||
|
||||
Status
|
||||
SetAuthentication(int count, IceListenObj *listenObjs,
|
||||
IceAuthDataEntry **authDataEntries)
|
||||
{
|
||||
FILE *addfp = NULL;
|
||||
FILE *removefp = NULL;
|
||||
const char *path;
|
||||
mode_t original_umask;
|
||||
char command[256];
|
||||
int i;
|
||||
#ifdef HAVE_MKSTEMP
|
||||
int fd;
|
||||
#endif
|
||||
|
||||
original_umask = umask (0077); /* disallow non-owner access */
|
||||
|
||||
path = getenv ("SM_SAVE_DIR");
|
||||
if (!path)
|
||||
{
|
||||
path = getenv ("HOME");
|
||||
if (!path)
|
||||
path = ".";
|
||||
}
|
||||
#ifndef HAVE_MKSTEMP
|
||||
if ((addAuthFile = unique_filename (path, ".xsm")) == NULL)
|
||||
goto bad;
|
||||
|
||||
if (!(addfp = fopen (addAuthFile, "w")))
|
||||
goto bad;
|
||||
fcntl(fileno(addfp), F_SETFD, FD_CLOEXEC);
|
||||
|
||||
if ((remAuthFile = unique_filename (path, ".xsm")) == NULL)
|
||||
goto bad;
|
||||
|
||||
if (!(removefp = fopen (remAuthFile, "w")))
|
||||
goto bad;
|
||||
fcntl(fileno(removefp), F_SETFD, FD_CLOEXEC);
|
||||
#else
|
||||
if ((addAuthFile = unique_filename (path, ".xsm", &fd)) == NULL)
|
||||
goto bad;
|
||||
|
||||
if (!(addfp = fdopen(fd, "wb")))
|
||||
goto bad;
|
||||
fcntl(fileno(addfp), F_SETFD, FD_CLOEXEC);
|
||||
|
||||
if ((remAuthFile = unique_filename (path, ".xsm", &fd)) == NULL)
|
||||
goto bad;
|
||||
|
||||
if (!(removefp = fdopen(fd, "wb")))
|
||||
goto bad;
|
||||
fcntl(fileno(removefp), F_SETFD, FD_CLOEXEC);
|
||||
#endif
|
||||
|
||||
if ((*authDataEntries = (IceAuthDataEntry *) XtMalloc (
|
||||
count * 2 * sizeof (IceAuthDataEntry))) == NULL)
|
||||
goto bad;
|
||||
|
||||
for (i = 0; i < count * 2; i += 2)
|
||||
{
|
||||
(*authDataEntries)[i].network_id =
|
||||
IceGetListenConnectionString (listenObjs[i/2]);
|
||||
(*authDataEntries)[i].protocol_name = "ICE";
|
||||
(*authDataEntries)[i].auth_name = "MIT-MAGIC-COOKIE-1";
|
||||
|
||||
(*authDataEntries)[i].auth_data =
|
||||
IceGenerateMagicCookie (MAGIC_COOKIE_LEN);
|
||||
(*authDataEntries)[i].auth_data_length = MAGIC_COOKIE_LEN;
|
||||
|
||||
(*authDataEntries)[i+1].network_id =
|
||||
IceGetListenConnectionString (listenObjs[i/2]);
|
||||
(*authDataEntries)[i+1].protocol_name = "XSMP";
|
||||
(*authDataEntries)[i+1].auth_name = "MIT-MAGIC-COOKIE-1";
|
||||
|
||||
(*authDataEntries)[i+1].auth_data =
|
||||
IceGenerateMagicCookie (MAGIC_COOKIE_LEN);
|
||||
(*authDataEntries)[i+1].auth_data_length = MAGIC_COOKIE_LEN;
|
||||
|
||||
write_iceauth (addfp, removefp, &(*authDataEntries)[i]);
|
||||
write_iceauth (addfp, removefp, &(*authDataEntries)[i+1]);
|
||||
|
||||
IceSetPaAuthData (2, &(*authDataEntries)[i]);
|
||||
|
||||
IceSetHostBasedAuthProc (listenObjs[i/2], HostBasedAuthProc);
|
||||
}
|
||||
|
||||
fclose (addfp);
|
||||
fclose (removefp);
|
||||
|
||||
umask (original_umask);
|
||||
|
||||
snprintf (command, sizeof(command), "iceauth source %s", addAuthFile);
|
||||
execute_system_command (command);
|
||||
|
||||
remove (addAuthFile);
|
||||
|
||||
return (1);
|
||||
|
||||
bad:
|
||||
|
||||
if (addfp)
|
||||
fclose (addfp);
|
||||
|
||||
if (removefp)
|
||||
fclose (removefp);
|
||||
|
||||
if (addAuthFile)
|
||||
{
|
||||
remove (addAuthFile);
|
||||
free (addAuthFile);
|
||||
}
|
||||
if (remAuthFile)
|
||||
{
|
||||
remove (remAuthFile);
|
||||
free (remAuthFile);
|
||||
}
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Free up authentication data.
|
||||
*/
|
||||
|
||||
void
|
||||
FreeAuthenticationData(int count, IceAuthDataEntry *authDataEntries)
|
||||
{
|
||||
/* Each transport has entries for ICE and XSMP */
|
||||
|
||||
char command[256];
|
||||
int i;
|
||||
|
||||
for (i = 0; i < count * 2; i++)
|
||||
{
|
||||
free (authDataEntries[i].network_id);
|
||||
free (authDataEntries[i].auth_data);
|
||||
}
|
||||
|
||||
XtFree ((char *) authDataEntries);
|
||||
|
||||
snprintf (command, sizeof(command), "iceauth source %s", remAuthFile);
|
||||
execute_system_command (command);
|
||||
|
||||
remove (remAuthFile);
|
||||
|
||||
free (addAuthFile);
|
||||
free (remAuthFile);
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue