Attachment 24846 Details for Bug 62001

[patch] Proposed patch

resmgr.diff (text/plain), 9.31 KB, created by Olaf Kirch on 2004-10-11 18:56:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olaf Kirch

Created: 2004-10-11 18:56:48 UTC

Size: 9.31 KB

patch

obsolete

>Index: client.c
>===================================================================
>RCS file: /local/cvs/resmgr/client.c,v
>retrieving revision 1.20
>diff -u -3 -u -r1.20 client.c
>--- client.c	17 Aug 2004 12:05:22 -0000	1.20
>+++ client.c	11 Oct 2004 10:47:43 -0000
>@@ -17,6 +17,26 @@
> static int	sane(const char *);
> static int	wildmatch(const char *, const char *);
> 
>+static struct conn *	the_connection;
>+
>+int
>+rsm_connect(void)
>+{
>+	if (the_connection)
>+		rsm_disconnect();
>+	the_connection = rsm_connect_to(_PATH_RESMGR_SOCKET);
>+	return the_connection? 0 : -1;
>+}
>+
>+int
>+rsm_disconnect(void)
>+{
>+	if (the_connection) {
>+		rsm_close(the_connection);
>+		the_connection = NULL;
>+	}
>+	return 0;
>+}
> 
> static int
> rsm_command(int *code, const char *fmt, ...)
>@@ -30,8 +50,14 @@
> 	*code = 0;
> 
> 	va_start(ap, fmt);
>-	if (!(conn = rsm_connect(_PATH_RESMGR_SOCKET))
>-	 || rsm_vprintf(conn, fmt, ap) < 0
>+
>+	if (!(conn = the_connection)
>+	 && !(conn = rsm_connect_to(_PATH_RESMGR_SOCKET))) {
>+		syslog(LOG_NOTICE, "resmgr: unable to connect to resmgrd: %m");
>+		goto out;
>+	}
>+
>+	if (rsm_vprintf(conn, fmt, ap) < 0
> 	 || (*code = rsm_recv_response(conn)) < 0) {
> 		syslog(LOG_NOTICE, "resmgr: communication failure: %m");
> 		goto out;
>@@ -45,7 +71,8 @@
> 	else
> 		fd = 0;
> 
>-out:	rsm_close(conn);
>+out:	if (conn != the_connection)
>+		rsm_close(conn);
> 	va_end(ap);
> 	return fd;
> }
>@@ -138,7 +165,7 @@
> 		wildcard = s;
> 	}
> 
>-	if ((conn = rsm_connect(_PATH_RESMGR_SOCKET))
>+	if ((conn = rsm_connect_to(_PATH_RESMGR_SOCKET))
> 	 && rsm_printf(conn, "list %s", family) >= 0)
> 		result = rsm_recv_multiline(conn, rsm_frob_device, wildcard);
> 
>@@ -152,7 +179,7 @@
> 	struct conn	*conn;
> 	char		**result = NULL;
> 
>-	if ((conn = rsm_connect(_PATH_RESMGR_SOCKET))
>+	if ((conn = rsm_connect_to(_PATH_RESMGR_SOCKET))
> 	 && rsm_printf(conn, "sessions") >= 0)
> 		result = rsm_recv_multiline(conn, NULL, NULL);
> 
>@@ -204,6 +231,12 @@
> rsm_open_device(const char *pathname, int flags)
> {
> 	return rsm_open_device_as(NULL, pathname, flags);
>+}
>+
>+int
>+rsm_open_socket(const char *pathname)
>+{
>+	return rsm_open_device_as("socket", pathname, O_RDWR);
> }
> 
> 
>Index: conn.c
>===================================================================
>RCS file: /local/cvs/resmgr/conn.c,v
>retrieving revision 1.8
>diff -u -3 -u -r1.8 conn.c
>--- conn.c	7 Jan 2004 11:08:48 -0000	1.8
>+++ conn.c	11 Oct 2004 10:48:56 -0000
>@@ -19,7 +19,7 @@
> #include <grp.h>
> 
> struct conn *
>-rsm_connect(const char *path)
>+rsm_connect_to(const char *path)
> {
> 	struct sockaddr_un un;
> 	struct conn	*conn;
>@@ -38,6 +38,8 @@
> 	strcpy(un.sun_path, path);
> 	if (connect(conn->fd, (struct sockaddr *) &un, SUN_LEN(&un)) < 0)
> 		goto fail;
>+
>+	fcntl(conn->fd, F_SETFD, FD_CLOEXEC);
> 
> 	return conn;
> 
>Index: main.c
>===================================================================
>RCS file: /local/cvs/resmgr/main.c,v
>retrieving revision 1.24
>diff -u -3 -u -r1.24 main.c
>--- main.c	20 Aug 2004 14:18:59 -0000	1.24
>+++ main.c	11 Oct 2004 10:54:39 -0000
>@@ -249,20 +249,8 @@
> 	name = argv[1];
> 	id = argv[2];
> 
>-	if (conn->cred.uid) {
>-		user = conn->ruser;
>-		if (strcmp(user->name, name)) {
>-			msg_log("User %s attempted to log in as %s\n",
>-					user->name, name);
>-			respond(conn, MSG_DENIED,
>-					"you are not allowed to do this");
>-			return;
>-		}
>-	} else {
>-		if (!(user = res_user_get(name)))
>-			user = res_user_create(name);
>-	}
>-
>+	if (!(user = res_user_get(name)))
>+		user = res_user_create(name);
> 	user->refcnt++;
> 
> 	if (user->nsessions > MAX_USER_SESSIONS) {
>@@ -583,7 +571,7 @@
> 	unsigned int	min_args, max_args;
> 	unsigned int	privileged;
> } resmgr_commands[] = {
>-      { "login",	cmd_login,		2,	2,	0	},
>+      { "login",	cmd_login,		2,	2,	1	},
>       { "logout",	cmd_logout,		1,	1,	0	},
>       { "grant",	cmd_grant,		2,	2,	1	},
>       { "revoke",	cmd_revoke,		1,	2,	1	},
>Index: pam_resmgr.c
>===================================================================
>RCS file: /local/cvs/resmgr/pam_resmgr.c,v
>retrieving revision 1.6
>diff -u -3 -u -r1.6 pam_resmgr.c
>--- pam_resmgr.c	5 Mar 2003 13:32:19 -0000	1.6
>+++ pam_resmgr.c	11 Oct 2004 10:52:24 -0000
>@@ -14,6 +14,18 @@
> #include "protocol.h"
> 
> 
>+/*
>+ * If the application runs the session function as non-root user (as e.g.
>+ * sshd does) we need to connect during the auth stage so the connection
>+ * will appear to be from the root user.
>+ */
>+int
>+pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv)
>+{
>+	rsm_connect();
>+	return PAM_SUCCESS;
>+}
>+
> int
> pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv)
> {
>@@ -60,6 +72,7 @@
> 		}
> 	}
> 
>+	rsm_disconnect();
> 	return PAM_SUCCESS;
> }
> 
>Index: protocol.h
>===================================================================
>RCS file: /local/cvs/resmgr/protocol.h,v
>retrieving revision 1.2
>diff -u -3 -u -r1.2 protocol.h
>--- protocol.h	31 Oct 2002 13:17:51 -0000	1.2
>+++ protocol.h	11 Oct 2004 10:43:05 -0000
>@@ -40,7 +40,7 @@
> 	char		buffer[256];
> };
> 
>-extern struct conn *	rsm_connect(const char *);
>+extern struct conn *	rsm_connect_to(const char *);
> extern int		rsm_recv(struct conn *, char *, unsigned int);
> extern int		rsm_recv_response(struct conn *);
> extern int		rsm_send(struct conn *, const char *, size_t);
>Index: resmgr.c
>===================================================================
>RCS file: /local/cvs/resmgr/resmgr.c,v
>retrieving revision 1.2
>diff -u -3 -u -r1.2 resmgr.c
>--- resmgr.c	5 Mar 2003 14:21:51 -0000	1.2
>+++ resmgr.c	11 Oct 2004 10:43:05 -0000
>@@ -57,7 +57,7 @@
> 		}
> 	}
> 
>-	conn = rsm_connect(opt_socket);
>+	conn = rsm_connect_to(opt_socket);
> 	if (conn == 0) {
> 		perror("Unable to connect to resource manager");
> 		return 1;
>Index: resmgr.h
>===================================================================
>RCS file: /local/cvs/resmgr/resmgr.h,v
>retrieving revision 1.14
>diff -u -3 -u -r1.14 resmgr.h
>--- resmgr.h	26 Feb 2004 12:07:50 -0000	1.14
>+++ resmgr.h	11 Oct 2004 10:43:50 -0000
>@@ -16,6 +16,7 @@
>  */
> extern char **	rsm_list_devices(const char *family);
> extern int	rsm_open_device(const char *pathname, int flags);
>+extern int	rsm_open_socket(const char *pathname);
> extern int	rsm_open_device_as(const char *family,
> 			const char *pathname, int flags);
> extern int	rsm_login(const char *user, const char *id);
>@@ -30,6 +31,10 @@
> 
> extern int	rsm_glob(const char *pattern,
> 			const char *name, const char *name_end);
>+
>+/* These are optional */
>+extern int	rsm_connect(void);
>+extern int	rsm_disconnect(void);
> 
> #ifdef __cplusplus
> }
>Index: socket.c
>===================================================================
>RCS file: /local/cvs/resmgr/socket.c,v
>retrieving revision 1.3
>diff -u -3 -u -r1.3 socket.c
>--- socket.c	20 Aug 2004 14:18:59 -0000	1.3
>+++ socket.c	11 Oct 2004 10:43:05 -0000
>@@ -51,7 +51,7 @@
> 	fp->filename = (char *) (fp + 1);
> 	strcpy(fp->filename, name);
> 
>-	fp->type = SOCK_STREAM;
>+	fp->type = -1;
> 	if ((sp = strrchr(fp->filename, ';')) != NULL) {
> 		*sp++ = '\0';
> 		if (!strcasecmp(sp, "dgram")) {
>@@ -89,25 +89,42 @@
> 	return !strcmp(fp->filename, dev->name);
> }
> 
>-int
>-res_socket_open(res_name_t *np, int flags)
>+/*
>+ * Open a socket and connect
>+ */
>+static int
>+do_connect(int type, const char *path)
> {
> 	struct sockaddr_un	sun;
>-	res_socket_name_t	*fp = (res_socket_name_t *) np;
> 	int			fd, oerrno;
> 
>-	if ((fd = socket(PF_LOCAL, fp->type, 0)) < 0)
>+	if ((fd = socket(PF_LOCAL, type, 0)) < 0)
> 		return -1;
> 
> 	memset(&sun, 0, sizeof(sun));
> 	sun.sun_family = AF_LOCAL;
>-	strncpy(sun.sun_path, fp->filename, sizeof(sun.sun_path)-1);
>+	strncpy(sun.sun_path, path, sizeof(sun.sun_path)-1);
> 
> 	if (connect(fd, (struct sockaddr *) &sun, sizeof(sun)) < 0) {
> 		oerrno = errno;
> 		close(fd);
> 		errno = oerrno;
> 		return -1;
>+	}
>+
>+	return fd;
>+}
>+
>+int
>+res_socket_open(res_name_t *np, int flags)
>+{
>+	res_socket_name_t	*fp = (res_socket_name_t *) np;
>+	int			fd;
>+
>+	if (fp->type >= 0) {
>+		fd = do_connect(fp->type, fp->filename);
>+	} else if ((fd = do_connect(SOCK_STREAM, fp->filename)) < 0) {
>+		fd = do_connect(SOCK_DGRAM, fp->filename);
> 	}
> 
> 	return fd;
>Index: tester.c
>===================================================================
>RCS file: /local/cvs/resmgr/tester.c,v
>retrieving revision 1.4
>diff -u -3 -u -r1.4 tester.c
>--- tester.c	6 Nov 2002 14:23:24 -0000	1.4
>+++ tester.c	11 Oct 2004 10:43:05 -0000
>@@ -34,7 +34,7 @@
> 		return 1;
> 	}
> 
>-	conn = rsm_connect(argc == 2? argv[1] : _PATH_RESMGR_SOCKET);
>+	conn = rsm_connect_to(argc == 2? argv[1] : _PATH_RESMGR_SOCKET);
> 	if (conn == 0) {
> 		perror("Unable to connect to resource manager");
> 		return 1;
>Index: doc/resmgr.3
>===================================================================
>RCS file: /local/cvs/resmgr/doc/resmgr.3,v
>retrieving revision 1.5
>diff -u -3 -u -r1.5 resmgr.3
>--- doc/resmgr.3	26 Feb 2004 12:07:54 -0000	1.5
>+++ doc/resmgr.3	23 Aug 2004 07:58:53 -0000
>@@ -7,6 +7,7 @@
> .sp
> .BI "char **rsm_list_devices(const char *" family ");
> .BI "int rsm_open_device(const char *" pathname ", int " flags ");
>+.BI "int rsm_open_socket(const char *" pathname ");
> .BI "int rsm_open_device_as(const char *" family ", const char *" pathname ",
> .BI "                        int " flags ");
> .BI "int rsm_login(const char *" user ", const char *" id ");
>@@ -64,6 +65,10 @@
> is not supported; the resource manager will silently use
> .B O_RDWR
> instead.
>+.TP
>+.BI "int rsm_open_socket(const char *" pathname")
>+This function will open a local socket and connect to the
>+named path.
> .TP
> .BI "int rsm_open_device_as(const char *" family ",
> .ti +16

Actions: View | Diff

Attachments on bug 62001: 24846