From owner-p4-projects@FreeBSD.ORG  Wed Jan  5 20:23:45 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5DC9616A4D0; Wed,  5 Jan 2005 20:23:45 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3868E16A4CE
	for <perforce@freebsd.org>; Wed,  5 Jan 2005 20:23:45 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2230F43D2F
	for <perforce@freebsd.org>; Wed,  5 Jan 2005 20:23:45 +0000 (GMT)
	(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j05KNjZ0032358
	for <perforce@freebsd.org>; Wed, 5 Jan 2005 20:23:45 GMT
	(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j05KNiAQ032355
	for perforce@freebsd.org; Wed, 5 Jan 2005 20:23:44 GMT
	(envelope-from areisse@nailabs.com)
Date: Wed, 5 Jan 2005 20:23:44 GMT
Message-Id: <200501052023.j05KNiAQ032355@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 68339 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Jan 2005 20:23:46 -0000

http://perforce.freebsd.org/chv.cgi?CH=68339

Change 68339 by areisse@areisse_tislabs on 2005/01/05 20:23:42

	Relabel terminals in newrole.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/usr.sbin/sebsd_newrole/sebsd_newrole.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/usr.sbin/sebsd_newrole/sebsd_newrole.c#3 (text+ko) ====

@@ -25,6 +25,7 @@
 
 #include <security/pam_appl.h>
 #include <security/openpam.h>
+#include <security/sebsd/flask.h>
 #include <sys/mac.h>
 #include <sebsd.h>
 
@@ -98,7 +99,8 @@
 	context_t context;
 	struct passwd *pw;
 	struct passwd pw_copy;
-	mac_t execlabel;
+	mac_t execlabel, oldtty, newtty;
+	char *ttyn;
 
 	if (!sebsd_enabled()) {
 		fprintf(stderr, "Sorry, sebsd_newrole may only be used when "
@@ -201,6 +203,37 @@
 		exit(1);
 	}
 
+	/*
+	 * Handle terminal labelling.
+	 */
+	ttyn = ttyname(STDIN_FILENO);
+	if (ttyn && *ttyn) {
+		char *oldttys, *newttys, *newttyslabel;
+
+		if (mac_prepare(&oldtty, "sebsd") != 0 ||
+		    mac_get_file(ttyn, oldtty) != 0 ||
+		    mac_to_text(oldtty, &oldttys) != 0) {
+			perror(ttyn);
+			exit(1);
+		}
+		if (security_change_context(new_context, oldttys +
+			sizeof("sebsd/") - 1, SECCLASS_CHR_FILE,
+			&newttys) != 0 ||
+		    asprintf(&newttyslabel, "sebsd/%s", newttys) == -1) {
+			fprintf(stderr,
+			    "Unable to determine new terminal label for %s\n",
+			    ttyn);
+			exit(1);
+		}
+		free(oldttys);
+
+		if (mac_from_text(&newtty, newttyslabel) != 0 ||
+		    mac_set_file(ttyn, newtty) != 0) {
+			perror(ttyn);
+			exit(1);
+		}
+	}
+
 	if (asprintf(&labeltext, "sebsd/%s", new_context) == -1 ||
 	    mac_from_text(&execlabel, labeltext) != 0) {
 		fprintf(stderr, "Error, failed to create new context\n");
@@ -208,6 +241,15 @@
 	}
 	free(labeltext);
 
+	/*
+	 * restore the old terminal label when the shell exits.
+	 */
+	if (ttyn && *ttyn && fork()) {
+		wait();
+		mac_set_file(ttyn, oldtty);
+		exit(0);
+	}
+
 	if (argc == 0) {
 		char *shell_argv[2];