diff --git a/cups-lspp.patch b/cups-lspp.patch index 425aa4d..f1406bc 100644 --- a/cups-lspp.patch +++ b/cups-lspp.patch @@ -1,32 +1,5 @@ ---- cups-1.2.4-orig/config.h.in 2006-06-05 14:42:53.000000000 -0400 -+++ cups-1.2.4/config.h.in 2006-09-28 16:31:29.000000000 -0400 -@@ -443,6 +443,13 @@ - #undef HAVE_APPLETALK_AT_PROTO_H - - -+/* -+ * Are we trying to meet LSPP requirements? -+ */ -+ -+#undef WITH_LSPP -+ -+ - #endif /* !_CUPS_CONFIG_H_ */ - - /* ---- cups-1.2.4-orig/configure.in 2006-08-04 12:51:58.000000000 -0400 -+++ cups-1.2.4/configure.in 2006-09-28 16:31:29.000000000 -0400 -@@ -47,6 +47,8 @@ - sinclude(config-scripts/cups-pdf.m4) - sinclude(config-scripts/cups-scripting.m4) - -+sinclude(config-scripts/cups-lspp.m4) -+ - INSTALL_LANGUAGES="" - UNINSTALL_LANGUAGES="" - LANGFILES="" ---- cups-1.2.4-orig/config-scripts/cups-lspp.m4 1969-12-31 19:00:00.000000000 -0500 -+++ cups-1.2.4/config-scripts/cups-lspp.m4 2006-09-28 16:31:29.000000000 -0400 +--- /dev/null 2006-11-22 09:23:57.810898750 +0000 ++++ cups-1.2.7/config-scripts/cups-lspp.m4 2006-11-22 11:40:42.000000000 +0000 @@ -0,0 +1,36 @@ +dnl +dnl LSPP code for the Common UNIX Printing System (CUPS). @@ -64,47 +37,39 @@ + ;; + esac +fi ---- cups-1.2.4-orig/cups/cups.h 2006-09-07 15:49:34.000000000 -0400 -+++ cups-1.2.4/cups/cups.h 2006-09-28 16:31:29.000000000 -0400 -@@ -24,6 +24,9 @@ - * This file is subject to the Apple OS-Developed Software exception. - */ +--- cups-1.2.7/configure.in.lspp 2006-08-04 17:51:58.000000000 +0100 ++++ cups-1.2.7/configure.in 2006-11-22 11:40:42.000000000 +0000 +@@ -47,6 +47,8 @@ + sinclude(config-scripts/cups-pdf.m4) + sinclude(config-scripts/cups-scripting.m4) -+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ -+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++sinclude(config-scripts/cups-lspp.m4) + - #ifndef _CUPS_CUPS_H_ - # define _CUPS_CUPS_H_ - -@@ -68,6 +71,12 @@ - # define CUPS_DATE_ANY -1 - + INSTALL_LANGUAGES="" + UNINSTALL_LANGUAGES="" + LANGFILES="" +--- cups-1.2.7/Makedefs.in.lspp 2006-11-22 11:40:42.000000000 +0000 ++++ cups-1.2.7/Makedefs.in 2006-11-22 11:40:44.000000000 +0000 +@@ -136,7 +136,7 @@ + @LDFLAGS@ @RELROFLAG@ @PIEFLAGS@ $(OPTIM) + LINKCUPS = @LINKCUPS@ $(SSLLIBS) + LINKCUPSIMAGE = @LINKCUPSIMAGE@ +-LIBS = $(LINKCUPS) $(COMMONLIBS) ++LIBS = $(LINKCUPS) $(COMMONLIBS) @LIBAUDIT@ @LIBSELINUX@ + OPTIM = @OPTIM@ + OPTIONS = + PAMLIBS = @PAMLIBS@ +@@ -239,7 +239,7 @@ + # Rules... + # -+# ifdef WITH_LSPP -+# define MLS_CONFIG "mls" -+# define TE_CONFIG "te" -+# define SELINUX_CONFIG "SELinux" -+# define UNKNOWN_SL "UNKNOWN SL" -+# endif /* WITH_LSPP */ - /* - * Types and structures... - */ ---- cups-1.2.4-orig/data/Makefile 2006-03-18 22:23:34.000000000 -0500 -+++ cups-1.2.4/data/Makefile 2006-09-28 16:31:29.000000000 -0400 -@@ -34,7 +34,10 @@ - secret \ - standard \ - topsecret \ -- unclassified -+ unclassified \ -+ selinux \ -+ mls \ -+ te +-.SILENT: ++ + .SUFFIXES: .1 .1.gz .1m .1m.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz - CHARMAPS = \ - euc-cn.txt \ ---- cups-1.2.4-orig/data/mls 1969-12-31 19:00:00.000000000 -0500 -+++ cups-1.2.4/data/mls 2006-09-28 16:31:29.000000000 -0400 + .c.o: +--- /dev/null 2006-11-22 09:23:57.810898750 +0000 ++++ cups-1.2.7/data/mls 2006-11-22 11:40:42.000000000 +0000 @@ -0,0 +1,277 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 @@ -383,8 +348,8 @@ +% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $". +% +%%EOF ---- cups-1.2.4-orig/data/selinux 1969-12-31 19:00:00.000000000 -0500 -+++ cups-1.2.4/data/selinux 2006-09-28 16:31:29.000000000 -0400 +--- /dev/null 2006-11-22 09:23:57.810898750 +0000 ++++ cups-1.2.7/data/selinux 2006-11-22 11:40:42.000000000 +0000 @@ -0,0 +1,277 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 @@ -663,8 +628,8 @@ +% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $". +% +%%EOF ---- cups-1.2.4-orig/data/te 1969-12-31 19:00:00.000000000 -0500 -+++ cups-1.2.4/data/te 2006-09-28 16:31:29.000000000 -0400 +--- /dev/null 2006-11-22 09:23:57.810898750 +0000 ++++ cups-1.2.7/data/te 2006-11-22 11:40:42.000000000 +0000 @@ -0,0 +1,277 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 @@ -943,239 +908,451 @@ +% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $". +% +%%EOF ---- cups-1.2.4-orig/Makedefs.in 2006-09-28 11:38:14.000000000 -0400 -+++ cups-1.2.4/Makedefs.in 2006-09-28 16:31:29.000000000 -0400 -@@ -135,7 +135,7 @@ - @LDFLAGS@ @RELROFLAG@ @PIEFLAGS@ $(OPTIM) - LINKCUPS = @LINKCUPS@ $(SSLLIBS) - LINKCUPSIMAGE = @LINKCUPSIMAGE@ --LIBS = $(LINKCUPS) $(COMMONLIBS) -+LIBS = $(LINKCUPS) $(COMMONLIBS) @LIBAUDIT@ @LIBSELINUX@ - OPTIM = @OPTIM@ - OPTIONS = - PAMLIBS = @PAMLIBS@ ---- cups-1.2.4-orig/scheduler/client.c 2006-09-19 16:44:07.000000000 -0400 -+++ cups-1.2.4/scheduler/client.c 2006-10-16 15:30:02.000000000 -0400 -@@ -44,12 +44,17 @@ - * make_certificate() - Make a self-signed SSL/TLS certificate. - * pipe_command() - Pipe the output of a command to the remote client. - * write_file() - Send a file via HTTP. -+ * client_pid_to_auid() - Get the audit login uid of the client. +--- cups-1.2.7/data/Makefile.lspp 2006-03-19 03:23:34.000000000 +0000 ++++ cups-1.2.7/data/Makefile 2006-11-22 11:40:42.000000000 +0000 +@@ -34,7 +34,10 @@ + secret \ + standard \ + topsecret \ +- unclassified ++ unclassified \ ++ selinux \ ++ mls \ ++ te + + CHARMAPS = \ + euc-cn.txt \ +--- cups-1.2.7/config.h.in.lspp 2006-11-02 20:01:54.000000000 +0000 ++++ cups-1.2.7/config.h.in 2006-11-22 11:40:42.000000000 +0000 +@@ -458,6 +458,13 @@ + #undef HAVE_APPLETALK_AT_PROTO_H + + ++/* ++ * Are we trying to meet LSPP requirements? ++ */ ++ ++#undef WITH_LSPP ++ ++ + #endif /* !_CUPS_CONFIG_H_ */ + + /* +--- cups-1.2.7/scheduler/printers.c.lspp 2006-11-22 11:40:41.000000000 +0000 ++++ cups-1.2.7/scheduler/printers.c 2006-11-22 11:40:42.000000000 +0000 +@@ -57,6 +57,8 @@ + * printing desktop tools. */ -+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ +/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ + /* * Include necessary headers... */ - -+#define _GNU_SOURCE - #include - #include "cupsd.h" - -@@ -65,6 +70,12 @@ - # include - #endif /* HAVE_GNUTLS */ +@@ -79,6 +81,10 @@ + static void write_irix_state(cupsd_printer_t *p); + #endif /* __sgi */ +#ifdef WITH_LSPP -+#include -+#include -+#include ++# include ++# include +#endif /* WITH_LSPP */ -+ /* - * Local functions... -@@ -323,6 +334,57 @@ - } - } + * 'cupsdAddPrinter()' - Add a printer to the system. +@@ -1472,6 +1478,13 @@ + "two-sided-long-edge", + "two-sided-short-edge" + }; ++#ifdef WITH_LSPP ++ char *audit_message; /* Audit message string */ ++ char *printerfile; /* Path to a local printer dev */ ++ char *rangestr; /* Printer's range if its available */ ++ security_context_t devcon; /* Printer SELinux context */ ++ context_t printercon; /* context_t for the printer */ ++#endif /* WITH_LSPP */ + + DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name, +@@ -1579,6 +1592,42 @@ + attr->values[1].string.text = _cupsStrAlloc(Classification ? + Classification : p->job_sheets[1]); + } +#ifdef WITH_LSPP -+ if (is_lspp_config()) -+ { -+ struct ucred cr; -+ unsigned int cl=sizeof(cr); -+ -+ if (getsockopt(con->http.fd, SOL_SOCKET, SO_PEERCRED, &cr, &cl) == 0) ++ if (AuditLog != -1) + { -+ /* -+ * client_pid_to_auid() can be racey -+ * In this case the pid is based on a socket connected to the client -+ */ -+ if ((con->auid = client_pid_to_auid(cr.pid)) == -1) ++ audit_message = NULL; ++ rangestr = NULL; ++ printercon = 0; ++ printerfile = strstr(p->device_uri, "/dev/"); ++ if (printerfile == NULL && (strncmp(p->device_uri, "file:/", 6) == 0)) ++ printerfile = strdup(p->device_uri + strlen("file:/")); ++ ++ if (printerfile != NULL) + { -+ close(con->http.fd); -+ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: " -+ "unable to determine client auid for client pid=%d", cr.pid); -+ free(con); -+ return; ++ if (getfilecon(printerfile, &devcon) == -1) ++ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdSetPrinterAttrs: Unable to get printer context"); ++ else ++ { ++ printercon = context_new(devcon); ++ freecon(devcon); ++ } + } -+ cupsdLogMessage(CUPSD_LOG_INFO, "cupsdAcceptClient: peer's pid=%d, uid=%d, gid=%d, auid=%d", -+ cr.pid, cr.uid, cr.gid, con->auid); -+ } -+ else -+ { -+ close(con->http.fd); -+ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: getsockopt() failed"); -+ free(con); -+ return; -+ } + -+ /* -+ * get the context of the peer connection -+ */ -+ if (getpeercon(con->http.fd, &con->scon)) -+ { -+ close(con->http.fd); -+ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: getpeercon() failed"); -+ free(con); -+ return; -+ } ++ if (printercon && context_range_get(printercon)) ++ rangestr = strdup(context_range_get(printercon)); ++ else ++ rangestr = strdup("unknown"); + -+ cupsdLogMessage(CUPSD_LOG_INFO, "cupsdAcceptClient: client context=%s", con->scon); -+ } -+ else -+ { -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: skipping getpeercon()"); -+ cupsdSetString(&con->scon, UNKNOWN_SL); -+ } ++ cupsdSetStringf(&audit_message, "printer=%s uri=%s banners=%s,%s range=%s", ++ p->name, p->device_uri, p->job_sheets[0], p->job_sheets[1], rangestr); ++ audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message, ++ ServerName, NULL, NULL, 1); ++ if (printercon) ++ context_free(printercon); ++ free(rangestr); ++ free(audit_message); ++ } +#endif /* WITH_LSPP */ + } + + printer_type = p->type; +--- cups-1.2.7/scheduler/job.c.lspp 2006-11-22 11:40:41.000000000 +0000 ++++ cups-1.2.7/scheduler/job.c 2006-11-22 11:51:57.000000000 +0000 +@@ -68,6 +68,9 @@ + * unload_job() - Unload a job from memory. + */ + ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ + - #ifdef AF_INET6 - if (con->http.hostaddr->addr.sa_family == AF_INET6) - cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: %d from %s:%d (IPv6)", -@@ -711,6 +773,13 @@ - mime_type_t *type; /* MIME type of file */ - cupsd_printer_t *p; /* Printer */ - static unsigned request_id = 0; /* Request ID for temp files */ + /* + * Include necessary headers... + */ +@@ -77,6 +80,14 @@ + #include + #include + +#ifdef WITH_LSPP -+ security_context_t spoolcon; /* context of the job file */ -+ context_t clicon; /* contex_t container for con->scon */ -+ context_t tmpcon; /* temp context to swap the level */ -+ char *clirange; /* SELinux sensitivity range */ -+ char *cliclearance; /* SELinux low end clearance */ ++#include ++#include ++#include ++#include ++#include ++#include +#endif /* WITH_LSPP */ - - status = HTTP_CONTINUE; -@@ -1797,6 +1866,63 @@ - fchmod(con->file, 0640); - fchown(con->file, RunUser, Group); - fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC); + /* + * Local globals... +@@ -1032,6 +1043,23 @@ + cupsdSetString(&job->dest, dest); + } + +#ifdef WITH_LSPP -+ if (strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) -+ { -+ if (getfilecon(con->filename, &spoolcon) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR); -+ return (cupsdCloseClient(con)); -+ } -+ clicon = context_new(con->scon); -+ tmpcon = context_new(spoolcon); -+ freecon(spoolcon); -+ if (!clicon || !tmpcon) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR); -+ if (clicon) -+ context_free(clicon); -+ if (tmpcon) -+ context_free(tmpcon); -+ return (cupsdCloseClient(con)); -+ } -+ clirange = strdup(context_range_get(clicon)); -+ if ((cliclearance = strtok(clirange, "-")) != NULL) -+ { -+ if (context_range_set(tmpcon, cliclearance) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR); -+ free(clirange); -+ context_free(tmpcon); -+ context_free(clicon); -+ return (cupsdCloseClient(con)); -+ } -+ } -+ else -+ { -+ if (context_range_set(tmpcon, (context_range_get(clicon))) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR); -+ free(clirange); -+ context_free(tmpcon); -+ context_free(clicon); -+ return (cupsdCloseClient(con)); -+ } -+ } -+ free(clirange); -+ if (setfilecon(con->filename, context_str(tmpcon)) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR); -+ context_free(tmpcon); -+ context_free(clicon); -+ return (cupsdCloseClient(con)); -+ } -+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdReadClient: %s set to %s", -+ con->filename, context_str(tmpcon)); -+ context_free(tmpcon); -+ context_free(clicon); -+ } ++ if ((attr = ippFindAttribute(job->attrs, "security-context", IPP_TAG_NAME)) != NULL) ++ cupsdSetString(&job->scon, attr->values[0].string.text); ++ else if (is_lspp_config()) ++ { ++ /* ++ * There was no security context so delete the job ++ */ ++ cupsdLogMessage(CUPSD_LOG_ERROR, "LoadAllJobs: Missing or bad security-context attribute in control file \"%s\"!", ++ jobfile); ++ ippDelete(job->attrs); ++ job->attrs = NULL; ++ unlink(jobfile); ++ return; ++ } ++#endif /* WITH_LSPP */ ++ + job->sheets = ippFindAttribute(job->attrs, "job-media-sheets-completed", + IPP_TAG_INTEGER); + job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME); +@@ -1341,6 +1369,13 @@ + { + char filename[1024]; /* Job control filename */ + cups_file_t *fp; /* Job file */ ++#ifdef WITH_LSPP ++ security_context_t spoolcon; /* context of the job control file */ ++ context_t jobcon; /* contex_t container for job->scon */ ++ context_t tmpcon; /* Temp context to swap the level */ ++ char *jobclearance; /* SELinux low end clearance */ ++ char *jobrange; /* SELinux sensitivity range */ +#endif /* WITH_LSPP */ - } - if (con->http.state != HTTP_POST_SEND) -@@ -3810,6 +3936,50 @@ - #endif /* HAVE_SSL */ + cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p", +@@ -1359,6 +1394,72 @@ + fchmod(cupsFileNumber(fp), 0600); + fchown(cupsFileNumber(fp), RunUser, Group); +#ifdef WITH_LSPP -+/* -+ * 'client_pid_to_auid()' - Using the client's pid, read /proc and determine the loginuid. -+ */ -+ -+uid_t client_pid_to_auid(pid_t clipid) -+{ -+ uid_t uid; -+ int len, in; -+ char buf[16] = {0}; -+ char fname[32] = {0}; -+ ++ if (job->scon && strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) ++ { ++ if (getfilecon(filename, &spoolcon) == -1) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "Unable to get context of job control file \"%s\" - %s.", ++ filename, strerror(errno)); ++ return; ++ } ++ jobcon = context_new(job->scon); ++ tmpcon = context_new(spoolcon); ++ freecon(spoolcon); ++ if (!jobcon || !tmpcon) ++ { ++ if (jobcon) ++ context_free(jobcon); ++ if (tmpcon) ++ context_free(tmpcon); ++ cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to get SELinux contexts"); ++ return; ++ } ++ jobrange = strdup(context_range_get(jobcon)); ++ if ((jobclearance = strtok(jobrange, "-")) != NULL) ++ { ++ if (context_range_set(tmpcon, jobclearance) == -1) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "Unable to set the range for job control file \"%s\" - %s.", ++ filename, strerror(errno)); ++ free(jobrange); ++ context_free(tmpcon); ++ context_free(jobcon); ++ return; ++ } ++ } ++ else ++ { ++ if (context_range_set(tmpcon, (context_range_get(jobcon))) == -1) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "Unable to set the range for job control file \"%s\" - %s.", ++ filename, strerror(errno)); ++ free(jobrange); ++ context_free(tmpcon); ++ context_free(jobcon); ++ return; ++ } ++ } ++ free(jobrange); ++ if (setfilecon(filename, context_str(tmpcon)) == -1) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "Unable to set context of job control file \"%s\" - %s.", ++ filename, strerror(errno)); ++ context_free(tmpcon); ++ context_free(jobcon); ++ return; ++ } ++ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p): new spool file context=%s", ++ job, context_str(tmpcon)); ++ context_free(tmpcon); ++ context_free(jobcon); ++ } ++#endif /* WITH_LSPP */ + -+ /* -+ * Hopefully this pid is still the one we are interested in. -+ */ -+ snprintf(fname, 32, "/proc/%d/loginuid", clipid); -+ in = open(fname, O_NOFOLLOW|O_RDONLY); + job->attrs->state = IPP_IDLE; + + if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL, +@@ -2488,6 +2589,21 @@ + /* RIP_MAX_CACHE env variable */ + static char *options = NULL;/* Full list of options */ + static int optlength = 0; /* Length of option buffer */ ++#ifdef WITH_LSPP ++ const char *mls_label = NULL; /* SL to put in classification env var */ ++ char *label_template = NULL; /* SL to put in classification env var */ ++ char *audit_message = NULL; /* Audit message string */ ++ char *printerfile = NULL; /* Device file pointed to by the printer */ ++ context_t jobcon; /* SELinux context of the job */ ++ security_id_t clisid; /* SELinux SID for the client */ ++ security_id_t psid; /* SELinux SID for the printer */ ++ context_t printercon; /* Printer's context string */ ++ struct stat printerstat; /* Printer's stat buffer */ ++ security_context_t devcon; /* Printer's SELinux context */ ++ struct avc_entry_ref avcref; /* Pointer to the access vector cache */ ++ security_class_t tclass; /* Object class for the SELinux check */ ++ access_vector_t avr = 0; /* Access method being requested */ ++#endif /* WITH_LSPP */ + + + cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job: id = %d, file = %d/%d", +@@ -2747,6 +2863,106 @@ + + cupsdLogMessage(CUPSD_LOG_DEBUG, "banner_page = %d", banner_page); + ++#ifdef WITH_LSPP ++ if (is_lspp_config()) ++ { ++ /* ++ * Perform an access check before printing, but only if the printer starts with /dev/ ++ */ ++ printerfile = strstr(printer->device_uri, "/dev/"); ++ if (printerfile == NULL && (strncmp(printer->device_uri, "file:/", 6) == 0)) ++ printerfile = strdup(printer->device_uri + strlen("file:/")); + -+ if (in < 0) -+ return -1; ++ if (printerfile != NULL) ++ { ++ cupsdLogMessage(CUPSD_LOG_DEBUG, ++ "StartJob: Attempting to check access on printer device %s", printerfile); ++ if (lstat(printerfile, &printerstat) < 0) ++ { ++ if (errno != ENOENT) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to stat the printer"); ++ cupsdCancelJob(job, 0, IPP_JOB_ABORTED); ++ return ; ++ } ++ /* ++ * The printer does not exist, so for now assume it's a FileDevice ++ */ ++ tclass = SECCLASS_FILE; ++ avr = FILE__WRITE; ++ } ++ else if (S_ISCHR(printerstat.st_mode)) ++ { ++ tclass = SECCLASS_CHR_FILE; ++ avr = CHR_FILE__WRITE; ++ } ++ else if (S_ISREG(printerstat.st_mode)) ++ { ++ tclass = SECCLASS_FILE; ++ avr = FILE__WRITE; ++ } ++ else if (avr != FILE__WRITE || avr != CHR_FILE__WRITE) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "StartJob: Printer is not a character device or regular file"); ++ cupsdCancelJob(job, 0, IPP_JOB_ABORTED); ++ return ; ++ } ++ avc_init("cupsd_dequeue_", NULL, NULL, NULL, NULL); ++ avc_entry_ref_init(&avcref); ++ if (avc_context_to_sid(job->scon, &clisid) != 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "StartJob: Unable to determine the SELinux sid for the job"); ++ cupsdCancelJob(job, 0, IPP_JOB_ABORTED); ++ return ; ++ } ++ if (getfilecon(printerfile, &devcon) == -1) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to get the SELinux context of %s", ++ printerfile); ++ cupsdCancelJob(job, 0, IPP_JOB_ABORTED); ++ return ; ++ } ++ printercon = context_new(devcon); ++ cupsdLogMessage(CUPSD_LOG_DEBUG, "StartJob: printer context %s client context %s", ++ context_str(printercon), job->scon); ++ context_free(printercon); + -+ errno = 0; ++ if (avc_context_to_sid(devcon, &psid) != 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "StartJob: Unable to determine the SELinux sid for the printer"); ++ freecon(devcon); ++ cupsdCancelJob(job, 0, IPP_JOB_ABORTED); ++ return ; ++ } ++ freecon(devcon); + -+ do { -+ len = read(in, buf, sizeof(buf)); -+ } while (len < 0 && errno == EINTR); ++ if (avc_has_perm(clisid, psid, tclass, avr, &avcref, NULL) != 0) ++ { ++ /* ++ * The access check failed, so cancel the job and send an audit message ++ */ ++ if (AuditLog != -1) ++ { ++ audit_message = NULL; ++ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s obj=%s canceled" ++ " unable to access printer=%s", job->id, ++ job->auid, (job->username)?job->username:"?", job->scon, printer->name); ++ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, ++ ServerName, NULL, NULL, 0); ++ free(audit_message); ++ } + -+ close(in); ++ cupsdCancelJob(job, 0, IPP_JOB_ABORTED); + -+ if (len < 0 || len >= sizeof(buf)) -+ return -1; ++ return ; ++ } ++ } ++ } ++#endif /* WITH_LSPP */ + -+ errno = 0; -+ buf[len] = 0; -+ uid = strtol(buf, 0, 10); + /* + * Building the options string is harder than it needs to be, but + * for the moment we need to pass strings for command-line args and +@@ -3076,7 +3292,66 @@ + snprintf(classification, sizeof(classification), "CLASSIFICATION=%s", + attr->values[0].string.text); + ++#ifdef WITH_LSPP ++ if (is_lspp_config()) ++ { ++ if (!job->scon || strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) == 0) ++ { ++ if (AuditLog != -1) ++ { ++ audit_message = NULL; ++ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s title=%s", ++ job->id, job->auid, job->username, printer->name, title); ++ audit_log_user_message(AuditLog, AUDIT_USER_UNLABELED_EXPORT, audit_message, ++ ServerName, NULL, NULL, 1); ++ free(audit_message); ++ } ++ } ++ else ++ { ++ jobcon = context_new(job->scon); ++ ++ if ((attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME)) == NULL) ++ label_template = strdup(Classification); ++ else if (attr->num_values > 1 && ++ strcmp(attr->values[1].string.text, "none") != 0) ++ label_template = strdup(attr->values[1].string.text); ++ else ++ label_template = strdup(attr->values[0].string.text); ++ ++ if (strcasecmp(label_template, MLS_CONFIG) == 0) ++ mls_label = context_range_get(jobcon); ++ else if (strcasecmp(label_template, TE_CONFIG) == 0) ++ mls_label = context_type_get(jobcon); ++ else if (strcasecmp(label_template, SELINUX_CONFIG) == 0) ++ mls_label = context_str(jobcon); ++ else ++ mls_label = label_template; + -+ if (errno != 0) -+ return -1; -+ else -+ return uid; -+} ++ if (mls_label) ++ snprintf(classification, sizeof(classification), "CLASSIFICATION=%s", mls_label); ++ else ++ bzero(classification, sizeof(classification)); ++ ++ if (AuditLog != -1) ++ { ++ audit_message = NULL; ++ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s title=%s" ++ " obj=%s label=%s", job->id, job->auid, job->username, ++ printer->name, title, job->scon, mls_label?mls_label:"none"); ++ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, ++ ServerName, NULL, NULL, 1); ++ free(audit_message); ++ } ++ context_free(jobcon); ++ free(label_template); ++ } ++ } ++ if (classification) ++ envp[envc ++] = classification; ++#else /* !WITH_LSPP */ + envp[envc ++] = classification; +#endif /* WITH_LSPP */ -+ - /* - * 'pipe_command()' - Pipe the output of a command to the remote client. - */ ---- cups-1.2.4-orig/scheduler/client.h 2006-09-11 10:21:23.000000000 -0400 -+++ cups-1.2.4/scheduler/client.h 2006-09-28 16:31:29.000000000 -0400 + } + + if (job->dtype & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT)) +--- cups-1.2.7/scheduler/client.h.lspp 2006-09-11 15:21:23.000000000 +0100 ++++ cups-1.2.7/scheduler/client.h 2006-11-22 11:40:42.000000000 +0000 @@ -22,6 +22,13 @@ * WWW: http://www.cups.org */ @@ -1211,133 +1388,105 @@ /* ---- cups-1.2.4-orig/scheduler/conf.c 2006-09-28 11:38:08.000000000 -0400 -+++ cups-1.2.4/scheduler/conf.c 2006-09-29 18:23:37.000000000 -0400 -@@ -35,6 +35,7 @@ - * read_configuration() - Read a configuration file. - * read_location() - Read a definition. - * read_policy() - Read a definition. -+ * is_lspp_config() - Is the system configured for LSPP +--- cups-1.2.7/scheduler/main.c.lspp 2006-11-22 11:40:42.000000000 +0000 ++++ cups-1.2.7/scheduler/main.c 2006-11-22 11:40:42.000000000 +0000 +@@ -49,6 +49,8 @@ + * usage() - Show scheduler usage. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ /* -@@ -60,6 +61,9 @@ - # define INADDR_NONE 0xffffffff - #endif /* !INADDR_NONE */ + * Include necessary headers... + */ +@@ -71,6 +73,9 @@ + # include + #endif /* HAVE_NOTIFY_H */ +#ifdef WITH_LSPP +# include +#endif /* WITH_LSPP */ /* - * Configuration variable structure... -@@ -161,6 +165,9 @@ - { "ServerKey", &ServerKey, CUPSD_VARTYPE_STRING }, - # endif /* HAVE_LIBSSL || HAVE_GNUTLS */ - #endif /* HAVE_SSL */ -+#ifdef WITH_LSPP -+ { "AuditLog", &AuditLog, CUPSD_VARTYPE_INTEGER }, -+#endif /* WITH_LSPP */ - #ifdef HAVE_LAUNCHD - { "LaunchdTimeout", &LaunchdTimeout, CUPSD_VARTYPE_INTEGER }, - { "LaunchdConf", &LaunchdConf, CUPSD_VARTYPE_STRING }, -@@ -223,6 +230,9 @@ - *old_requestroot; /* Old RequestRoot */ - const char *tmpdir; /* TMPDIR environment variable */ - struct stat tmpinfo; /* Temporary directory info */ -+#ifdef WITH_LSPP -+ char *audit_message; /* Audit message string */ + * Local functions... +@@ -156,6 +161,9 @@ + int launchd_idle_exit; + /* Idle exit on select timeout? */ + #endif /* HAVE_LAUNCHD */ ++#if WITH_LSPP ++ auditfail_t failmode; /* Action for audit_open failure */ +#endif /* WITH_LSPP */ /* -@@ -470,6 +480,16 @@ - - RunUser = getuid(); +@@ -366,6 +374,25 @@ + #endif /* DEBUG */ + } +#ifdef WITH_LSPP -+ /* -+ * ClassifyOverride is set during read_configuration, if its on, report it now -+ */ -+ if (ClassifyOverride && AuditLog != -1) -+ audit_log_user_message(AuditLog, AUDIT_USYS_CONFIG, -+ "[Config] ClassifyOverride=enabled Users can override print banners", -+ ServerName, NULL, NULL, 1); -+#endif /* WITH_LSPP */ -+ - /* - * See if the ServerName is an IP address... - */ -@@ -777,11 +797,23 @@ - if (MaxActiveJobs > (MaxFDs / 3)) - MaxActiveJobs = MaxFDs / 3; - -- if (Classification && !strcasecmp(Classification, "none")) -+ if (Classification && strcasecmp(Classification, "none") == 0) - cupsdClearString(&Classification); - - if (Classification) ++ if ((AuditLog = audit_open()) < 0 ) + { - cupsdLogMessage(CUPSD_LOG_INFO, "Security set to \"%s\"", Classification); -+#ifdef WITH_LSPP -+ if (AuditLog != -1) ++ if (get_auditfail_action(&failmode) == 0) + { -+ audit_message = NULL; -+ cupsdSetStringf(&audit_message, "[Config] Classification=%s", Classification); -+ audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message, -+ ServerName, NULL, NULL, 1); -+ free(audit_message); ++ if (failmode == FAIL_LOG) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to connect to audit subsystem."); ++ AuditLog = -1; ++ } ++ else if (failmode == FAIL_TERMINATE) ++ { ++ fprintf(stderr, "cupsd: unable to start auditing, terminating"); ++ return -1; ++ } + } -+#endif /* WITH_LSPP */ + } - ++#endif /* WITH_LSPP */ ++ /* - * Update the MaxClientsPerHost value, as needed... -@@ -3295,6 +3327,18 @@ - return (0); - } + * Set the timezone info... + */ +@@ -1154,6 +1181,11 @@ + free(input); + free(output); +#ifdef WITH_LSPP -+int is_lspp_config() -+{ -+ if (Classification != NULL) -+ return ((strcasecmp(Classification, MLS_CONFIG) == 0) -+ || (strcasecmp(Classification, TE_CONFIG) == 0) -+ || (strcasecmp(Classification, SELINUX_CONFIG) == 0)); -+ else -+ return 0; -+} ++ if (AuditLog != -1) ++ audit_close(AuditLog); +#endif /* WITH_LSPP */ + + return (!stop_scheduler); + } - /* - * End of "$Id: conf.c 5905 2006-08-29 20:48:59Z mike $". ---- cups-1.2.4-orig/scheduler/conf.h 2006-09-28 11:38:08.000000000 -0400 -+++ cups-1.2.4/scheduler/conf.h 2006-09-28 16:31:29.000000000 -0400 -@@ -191,6 +191,10 @@ - /* Server key file */ - # endif /* HAVE_LIBSSL || HAVE_GNUTLS */ - #endif /* HAVE_SSL */ +--- cups-1.2.7/scheduler/job.h.lspp 2006-09-19 21:11:08.000000000 +0100 ++++ cups-1.2.7/scheduler/job.h 2006-11-22 11:40:42.000000000 +0000 +@@ -22,6 +22,13 @@ + * WWW: http://www.cups.org + */ + ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ +#ifdef WITH_LSPP -+VAR int AuditLog VALUE(-1); -+ /* File descriptor for audit */ ++#include +#endif /* WITH_LSPP */ - - #ifdef HAVE_LAUNCHD - VAR int LaunchdTimeout VALUE(DEFAULT_TIMEOUT); -@@ -213,6 +217,9 @@ - ; - extern int cupsdLogPage(cupsd_job_t *job, const char *page); - ++ + /* + * Job request structure... + */ +@@ -55,6 +62,10 @@ + int status; /* Status code from filters */ + cupsd_printer_t *printer; /* Printer this job is assigned to */ + int tries; /* Number of tries for this job */ +#ifdef WITH_LSPP -+extern int is_lspp_config(void); ++ security_context_t scon; /* Security context of job */ ++ uid_t auid; /* Audit loginuid for this job */ +#endif /* WITH_LSPP */ + } cupsd_job_t; - /* - * End of "$Id: conf.h 5696 2006-06-26 18:34:20Z mike $". ---- cups-1.2.4-orig/scheduler/ipp.c 2006-09-28 11:38:08.000000000 -0400 -+++ cups-1.2.4/scheduler/ipp.c 2006-10-16 15:30:02.000000000 -0400 -@@ -96,6 +96,9 @@ + +--- cups-1.2.7/scheduler/ipp.c.lspp 2006-11-22 11:40:42.000000000 +0000 ++++ cups-1.2.7/scheduler/ipp.c 2006-11-22 11:48:44.000000000 +0000 +@@ -95,6 +95,9 @@ * validate_user() - Validate the user for the request. */ @@ -1347,7 +1496,7 @@ /* * Include necessary headers... */ -@@ -106,6 +109,14 @@ +@@ -105,6 +108,14 @@ # include #endif /* HAVE_LIBPAPER */ @@ -1361,8 +1510,8 @@ +#endif /* WITH_LSPP */ /* - * PPD default choice structure... -@@ -1173,6 +1184,20 @@ + * Local functions... +@@ -1159,6 +1170,21 @@ int kbytes; /* Size of print file */ int i; /* Looping var */ int lowerpagerange; /* Page range bound */ @@ -1375,15 +1524,16 @@ + security_id_t clisid; /* SELinux SID for the client */ + security_id_t psid; /* SELinux SID for the printer */ + context_t printercon; /* Printer's context string */ ++ struct stat printerstat; /* Printer's stat buffer */ + security_context_t devcon; /* Printer's SELinux context */ + struct avc_entry_ref avcref; /* Pointer to the access vector cache */ + security_class_t tclass; /* Object class for the SELinux check */ -+ access_vector_t avr; /* Access method being requested */ ++ access_vector_t avr = 0; /* Access method being requested */ +#endif /* WITH_LSPP */ cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %s)", con, -@@ -1349,6 +1374,101 @@ +@@ -1335,6 +1361,127 @@ return (NULL); } @@ -1425,8 +1575,34 @@ + cupsdLogMessage(CUPSD_LOG_DEBUG, "add_job: Attempting an access check on printer device %s", + printerfile); + -+ tclass = SECCLASS_FILE; -+ avr = CHR_FILE__WRITE; ++ if (lstat(printerfile, &printerstat) < 0) ++ { ++ if (errno != ENOENT) ++ { ++ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Unable to stat the printer")); ++ return (NULL); ++ } ++ /* ++ * The printer does not exist, so for now assume it's a FileDevice ++ */ ++ tclass = SECCLASS_FILE; ++ avr = FILE__WRITE; ++ } ++ else if (S_ISCHR(printerstat.st_mode)) ++ { ++ tclass = SECCLASS_CHR_FILE; ++ avr = CHR_FILE__WRITE; ++ } ++ else if (S_ISREG(printerstat.st_mode)) ++ { ++ tclass = SECCLASS_FILE; ++ avr = FILE__WRITE; ++ } ++ else if (avr != FILE_WRITE || avr != CHR_FILE__WRITE) ++ { ++ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Printer is not a character device or regular file")); ++ return (NULL); ++ } + avc_init("cupsd_enqueue_", NULL, NULL, NULL, NULL); + avc_entry_ref_init(&avcref); + if (avc_context_to_sid(con->scon, &clisid) != 0) @@ -1484,8 +1660,8 @@ + job->dtype = dtype; job->attrs = con->request; - con->request = NULL; -@@ -1544,6 +1664,29 @@ + con->request = ippNewRequest(job->attrs->request.op.operation_id); +@@ -1530,6 +1677,29 @@ attr->values[0].string.text = _cupsStrAlloc(printer->job_sheets[0]); attr->values[1].string.text = _cupsStrAlloc(printer->job_sheets[1]); } @@ -1515,7 +1691,7 @@ job->job_sheets = attr; -@@ -1574,6 +1717,9 @@ +@@ -1560,6 +1730,9 @@ "job-sheets=\"%s,none\", " "job-originating-user-name=\"%s\"", job->id, Classification, job->username); @@ -1525,7 +1701,7 @@ } else if (attr->num_values == 2 && strcmp(attr->values[0].string.text, -@@ -1592,6 +1738,9 @@ +@@ -1578,6 +1751,9 @@ "job-originating-user-name=\"%s\"", job->id, attr->values[0].string.text, attr->values[1].string.text, job->username); @@ -1535,7 +1711,7 @@ } else if (strcmp(attr->values[0].string.text, Classification) && strcmp(attr->values[0].string.text, "none") && -@@ -1612,6 +1761,9 @@ +@@ -1598,6 +1774,9 @@ "job-originating-user-name=\"%s\"", job->id, attr->values[0].string.text, attr->values[1].string.text, job->username); @@ -1545,7 +1721,7 @@ } } else if (strcmp(attr->values[0].string.text, Classification) && -@@ -1652,7 +1804,50 @@ +@@ -1638,9 +1817,52 @@ "job-sheets=\"%s\", " "job-originating-user-name=\"%s\"", job->id, Classification, job->username); @@ -1583,20 +1759,22 @@ + (attr->num_values > 1) ? attr->values[1].string.text : "(null)"); + audit_log_user_message(AuditLog, AUDIT_LABEL_OVERRIDE, audit_message, + ServerName, NULL, NULL, 0); - } -+ free(audit_message); + } -+ } -+ ++ free(audit_message); + } + } + + if (userheader) + free(userheader); + if (userfooter) + free(userfooter); +#endif /* WITH_LSPP */ - } - ++ } ++ /* -@@ -3504,6 +3699,15 @@ + * See if we need to add the starting sheet... + */ +@@ -3490,6 +3712,15 @@ char attrname[255], /* Name of attribute */ *s; /* Pointer into name */ ipp_attribute_t *attr; /* Attribute */ @@ -1612,7 +1790,7 @@ cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_banner(%p[%d], %p[%d], %s)", -@@ -3537,6 +3741,77 @@ +@@ -3523,6 +3754,77 @@ fchmod(cupsFileNumber(out), 0640); fchown(cupsFileNumber(out), RunUser, Group); @@ -1690,7 +1868,7 @@ /* * Try the localized banner file under the subdirectory... -@@ -3631,6 +3906,24 @@ +@@ -3617,6 +3919,24 @@ else s = attrname; @@ -1715,7 +1893,7 @@ if (!strcmp(s, "printer-name")) { cupsFilePuts(out, job->dest); -@@ -5352,6 +5645,17 @@ +@@ -5335,6 +5655,17 @@ cupsd_printer_t *printer; /* Printer */ cups_array_t *list; /* Which job list... */ cups_array_t *ra; /* Requested attributes array */ @@ -1733,7 +1911,7 @@ cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs(%p[%d], %s)", con, con->http.fd, -@@ -5469,6 +5773,45 @@ +@@ -5452,6 +5783,45 @@ ra = create_requested_array(con->request); @@ -1779,7 +1957,7 @@ /* * OK, build a list of jobs for this printer... */ -@@ -5506,6 +5849,42 @@ +@@ -5489,6 +5859,42 @@ if (count > 0) ippAddSeparator(con->response); @@ -1822,7 +2000,7 @@ count ++; cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count); -@@ -7944,12 +8323,22 @@ +@@ -7877,12 +8283,22 @@ * See if we need to add the ending sheet... */ @@ -1845,7 +2023,7 @@ /* * Yes... */ -@@ -9201,6 +9590,16 @@ +@@ -9134,6 +9550,16 @@ int userlen) /* I - Length of username */ { cupsd_printer_t *printer; /* Printer for job */ @@ -1862,7 +2040,7 @@ cupsdLogMessage(CUPSD_LOG_DEBUG2, -@@ -9222,6 +9621,59 @@ +@@ -9155,6 +9581,59 @@ strlcpy(username, get_username(con), userlen); @@ -1922,482 +2100,372 @@ /* * Check the username against the owner... */ ---- cups-1.2.4-orig/scheduler/job.c 2006-09-28 11:38:08.000000000 -0400 -+++ cups-1.2.4/scheduler/job.c 2006-10-16 15:30:02.000000000 -0400 -@@ -68,6 +68,9 @@ - * unload_job() - Unload a job from memory. +--- cups-1.2.7/scheduler/conf.c.lspp 2006-11-22 11:40:41.000000000 +0000 ++++ cups-1.2.7/scheduler/conf.c 2006-11-22 11:40:42.000000000 +0000 +@@ -35,6 +35,7 @@ + * read_configuration() - Read a configuration file. + * read_location() - Read a definition. + * read_policy() - Read a definition. ++ * is_lspp_config() - Is the system configured for LSPP */ -+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ -+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ -+ /* - * Include necessary headers... - */ -@@ -77,6 +80,14 @@ - #include - #include +@@ -60,6 +61,9 @@ + # define INADDR_NONE 0xffffffff + #endif /* !INADDR_NONE */ +#ifdef WITH_LSPP -+#include -+#include -+#include -+#include -+#include -+#include ++# include +#endif /* WITH_LSPP */ /* - * Local globals... -@@ -1032,6 +1043,23 @@ - cupsdSetString(&job->dest, dest); - } - -+#ifdef WITH_LSPP -+ if ((attr = ippFindAttribute(job->attrs, "security-context", IPP_TAG_NAME)) != NULL) -+ cupsdSetString(&job->scon, attr->values[0].string.text); -+ else if (is_lspp_config()) -+ { -+ /* -+ * There was no security context so delete the job -+ */ -+ cupsdLogMessage(CUPSD_LOG_ERROR, "LoadAllJobs: Missing or bad security-context attribute in control file \"%s\"!", -+ jobfile); -+ ippDelete(job->attrs); -+ job->attrs = NULL; -+ unlink(jobfile); -+ return; -+ } -+#endif /* WITH_LSPP */ -+ - job->sheets = ippFindAttribute(job->attrs, "job-media-sheets-completed", - IPP_TAG_INTEGER); - job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME); -@@ -1341,6 +1369,13 @@ - { - char filename[1024]; /* Job control filename */ - cups_file_t *fp; /* Job file */ -+#ifdef WITH_LSPP -+ security_context_t spoolcon; /* context of the job control file */ -+ context_t jobcon; /* contex_t container for job->scon */ -+ context_t tmpcon; /* Temp context to swap the level */ -+ char *jobclearance; /* SELinux low end clearance */ -+ char *jobrange; /* SELinux sensitivity range */ -+#endif /* WITH_LSPP */ - - - cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p", -@@ -1359,6 +1394,72 @@ - fchmod(cupsFileNumber(fp), 0600); - fchown(cupsFileNumber(fp), RunUser, Group); - + * Configuration variable structure... +@@ -161,6 +165,9 @@ + { "ServerKey", &ServerKey, CUPSD_VARTYPE_STRING }, + # endif /* HAVE_LIBSSL || HAVE_GNUTLS */ + #endif /* HAVE_SSL */ +#ifdef WITH_LSPP -+ if (job->scon && strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) -+ { -+ if (getfilecon(filename, &spoolcon) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "Unable to get context of job control file \"%s\" - %s.", -+ filename, strerror(errno)); -+ return; -+ } -+ jobcon = context_new(job->scon); -+ tmpcon = context_new(spoolcon); -+ freecon(spoolcon); -+ if (!jobcon || !tmpcon) -+ { -+ if (jobcon) -+ context_free(jobcon); -+ if (tmpcon) -+ context_free(tmpcon); -+ cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to get SELinux contexts"); -+ return; -+ } -+ jobrange = strdup(context_range_get(jobcon)); -+ if ((jobclearance = strtok(jobrange, "-")) != NULL) -+ { -+ if (context_range_set(tmpcon, jobclearance) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "Unable to set the range for job control file \"%s\" - %s.", -+ filename, strerror(errno)); -+ free(jobrange); -+ context_free(tmpcon); -+ context_free(jobcon); -+ return; -+ } -+ } -+ else -+ { -+ if (context_range_set(tmpcon, (context_range_get(jobcon))) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "Unable to set the range for job control file \"%s\" - %s.", -+ filename, strerror(errno)); -+ free(jobrange); -+ context_free(tmpcon); -+ context_free(jobcon); -+ return; -+ } -+ } -+ free(jobrange); -+ if (setfilecon(filename, context_str(tmpcon)) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "Unable to set context of job control file \"%s\" - %s.", -+ filename, strerror(errno)); -+ context_free(tmpcon); -+ context_free(jobcon); -+ return; -+ } -+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p): new spool file context=%s", -+ job, context_str(tmpcon)); -+ context_free(tmpcon); -+ context_free(jobcon); -+ } ++ { "AuditLog", &AuditLog, CUPSD_VARTYPE_INTEGER }, +#endif /* WITH_LSPP */ -+ - job->attrs->state = IPP_IDLE; - - if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL, -@@ -2487,6 +2588,20 @@ - /* RIP_MAX_CACHE env variable */ - static char *options = NULL;/* Full list of options */ - static int optlength = 0; /* Length of option buffer */ + #ifdef HAVE_LAUNCHD + { "LaunchdTimeout", &LaunchdTimeout, CUPSD_VARTYPE_INTEGER }, + { "LaunchdConf", &LaunchdConf, CUPSD_VARTYPE_STRING }, +@@ -223,6 +230,9 @@ + *old_requestroot; /* Old RequestRoot */ + const char *tmpdir; /* TMPDIR environment variable */ + struct stat tmpinfo; /* Temporary directory info */ +#ifdef WITH_LSPP -+ const char *mls_label = NULL; /* SL to put in classification env var */ -+ char *label_template = NULL; /* SL to put in classification env var */ -+ char *audit_message = NULL; /* Audit message string */ -+ char *printerfile = NULL; /* Device file pointed to by the printer */ -+ context_t jobcon; /* SELinux context of the job */ -+ security_id_t clisid; /* SELinux SID for the client */ -+ security_id_t psid; /* SELinux SID for the printer */ -+ context_t printercon; /* Printer's context string */ -+ security_context_t devcon; /* Printer's SELinux context */ -+ struct avc_entry_ref avcref; /* Pointer to the access vector cache */ -+ security_class_t tclass; /* Object class for the SELinux check */ -+ access_vector_t avr; /* Access method being requested */ ++ char *audit_message; /* Audit message string */ +#endif /* WITH_LSPP */ - cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job: id = %d, file = %d/%d", -@@ -2740,6 +2855,77 @@ + /* +@@ -470,6 +480,16 @@ - cupsdLogMessage(CUPSD_LOG_DEBUG, "banner_page = %d", banner_page); + RunUser = getuid(); +#ifdef WITH_LSPP -+ if (is_lspp_config()) -+ { -+ /* -+ * Perform an access check before printing, but only if the printer starts with /dev/ -+ */ -+ printerfile = strstr(printer->device_uri, "/dev/"); -+ if (printerfile == NULL && (strncmp(printer->device_uri, "file:/", 6) == 0)) -+ printerfile = strdup(printer->device_uri + strlen("file:/")); -+ -+ if (printerfile != NULL) -+ { -+ cupsdLogMessage(CUPSD_LOG_DEBUG, -+ "StartJob: Attempting to check access on printer device %s", printerfile); -+ tclass = SECCLASS_FILE; -+ avr = CHR_FILE__WRITE; -+ avc_init("cupsd_dequeue_", NULL, NULL, NULL, NULL); -+ avc_entry_ref_init(&avcref); -+ if (avc_context_to_sid(job->scon, &clisid) != 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "StartJob: Unable to determine the SELinux sid for the job"); -+ cupsdCancelJob(job, 0, IPP_JOB_ABORTED); -+ return ; -+ } -+ if (getfilecon(printerfile, &devcon) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to get the SELinux context of %s", -+ printerfile); -+ cupsdCancelJob(job, 0, IPP_JOB_ABORTED); -+ return ; -+ } -+ printercon = context_new(devcon); -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "StartJob: printer context %s client context %s", -+ context_str(printercon), job->scon); -+ context_free(printercon); -+ -+ if (avc_context_to_sid(devcon, &psid) != 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "StartJob: Unable to determine the SELinux sid for the printer"); -+ freecon(devcon); -+ cupsdCancelJob(job, 0, IPP_JOB_ABORTED); -+ return ; -+ } -+ freecon(devcon); -+ -+ if (avc_has_perm(clisid, psid, tclass, avr, &avcref, NULL) != 0) -+ { -+ /* -+ * The access check failed, so cancel the job and send an audit message -+ */ -+ if (AuditLog != -1) -+ { -+ audit_message = NULL; -+ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s obj=%s canceled" -+ " unable to access printer=%s", job->id, -+ job->auid, (job->username)?job->username:"?", job->scon, printer->name); -+ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, -+ ServerName, NULL, NULL, 0); -+ free(audit_message); -+ } -+ -+ cupsdCancelJob(job, 0, IPP_JOB_ABORTED); -+ -+ return ; -+ } -+ } -+ } ++ /* ++ * ClassifyOverride is set during read_configuration, if its on, report it now ++ */ ++ if (ClassifyOverride && AuditLog != -1) ++ audit_log_user_message(AuditLog, AUDIT_USYS_CONFIG, ++ "[Config] ClassifyOverride=enabled Users can override print banners", ++ ServerName, NULL, NULL, 1); +#endif /* WITH_LSPP */ + /* - * Building the options string is harder than it needs to be, but - * for the moment we need to pass strings for command-line args and -@@ -3069,7 +3255,66 @@ - snprintf(classification, sizeof(classification), "CLASSIFICATION=%s", - attr->values[0].string.text); + * See if the ServerName is an IP address... + */ +@@ -777,11 +797,23 @@ + if (MaxActiveJobs > (MaxFDs / 3)) + MaxActiveJobs = MaxFDs / 3; + +- if (Classification && !strcasecmp(Classification, "none")) ++ if (Classification && strcasecmp(Classification, "none") == 0) + cupsdClearString(&Classification); + if (Classification) ++ { + cupsdLogMessage(CUPSD_LOG_INFO, "Security set to \"%s\"", Classification); +#ifdef WITH_LSPP -+ if (is_lspp_config()) ++ if (AuditLog != -1) + { -+ if (!job->scon || strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) == 0) -+ { -+ if (AuditLog != -1) -+ { -+ audit_message = NULL; -+ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s title=%s", -+ job->id, job->auid, job->username, printer->name, title); -+ audit_log_user_message(AuditLog, AUDIT_USER_UNLABELED_EXPORT, audit_message, -+ ServerName, NULL, NULL, 1); -+ free(audit_message); -+ } -+ } -+ else -+ { -+ jobcon = context_new(job->scon); -+ -+ if ((attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME)) == NULL) -+ label_template = strdup(Classification); -+ else if (attr->num_values > 1 && -+ strcmp(attr->values[1].string.text, "none") != 0) -+ label_template = strdup(attr->values[1].string.text); -+ else -+ label_template = strdup(attr->values[0].string.text); -+ -+ if (strcasecmp(label_template, MLS_CONFIG) == 0) -+ mls_label = context_range_get(jobcon); -+ else if (strcasecmp(label_template, TE_CONFIG) == 0) -+ mls_label = context_type_get(jobcon); -+ else if (strcasecmp(label_template, SELINUX_CONFIG) == 0) -+ mls_label = context_str(jobcon); -+ else -+ mls_label = label_template; -+ -+ if (mls_label) -+ snprintf(classification, sizeof(classification), "CLASSIFICATION=%s", mls_label); -+ else -+ bzero(classification, sizeof(classification)); -+ -+ if (AuditLog != -1) -+ { -+ audit_message = NULL; -+ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s title=%s" -+ " obj=%s label=%s", job->id, job->auid, job->username, -+ printer->name, title, job->scon, mls_label?mls_label:"none"); -+ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, -+ ServerName, NULL, NULL, 1); -+ free(audit_message); -+ } -+ context_free(jobcon); -+ free(label_template); -+ } ++ audit_message = NULL; ++ cupsdSetStringf(&audit_message, "[Config] Classification=%s", Classification); ++ audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message, ++ ServerName, NULL, NULL, 1); ++ free(audit_message); + } -+ if (classification) -+ envp[envc ++] = classification; -+#else /* !WITH_LSPP */ - envp[envc ++] = classification; +#endif /* WITH_LSPP */ - } ++ } - if (job->dtype & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT)) ---- cups-1.2.4-orig/scheduler/job.h 2006-09-19 16:11:08.000000000 -0400 -+++ cups-1.2.4/scheduler/job.h 2006-09-28 16:31:29.000000000 -0400 -@@ -22,6 +22,13 @@ - * WWW: http://www.cups.org - */ + /* + * Update the MaxClientsPerHost value, as needed... +@@ -3295,6 +3327,18 @@ + return (0); + } -+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ -+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ -+ +#ifdef WITH_LSPP -+#include ++int is_lspp_config() ++{ ++ if (Classification != NULL) ++ return ((strcasecmp(Classification, MLS_CONFIG) == 0) ++ || (strcasecmp(Classification, TE_CONFIG) == 0) ++ || (strcasecmp(Classification, SELINUX_CONFIG) == 0)); ++ else ++ return 0; ++} +#endif /* WITH_LSPP */ + + /* - * Job request structure... - */ -@@ -55,6 +62,10 @@ - int status; /* Status code from filters */ - cupsd_printer_t *printer; /* Printer this job is assigned to */ - int tries; /* Number of tries for this job */ + * End of "$Id: conf.c 5905 2006-08-29 20:48:59Z mike $". +--- cups-1.2.7/scheduler/conf.h.lspp 2006-11-22 11:40:41.000000000 +0000 ++++ cups-1.2.7/scheduler/conf.h 2006-11-22 11:40:42.000000000 +0000 +@@ -191,6 +191,10 @@ + /* Server key file */ + # endif /* HAVE_LIBSSL || HAVE_GNUTLS */ + #endif /* HAVE_SSL */ +#ifdef WITH_LSPP -+ security_context_t scon; /* Security context of job */ -+ uid_t auid; /* Audit loginuid for this job */ ++VAR int AuditLog VALUE(-1); ++ /* File descriptor for audit */ +#endif /* WITH_LSPP */ - } cupsd_job_t; + #ifdef HAVE_LAUNCHD + VAR int LaunchdTimeout VALUE(DEFAULT_TIMEOUT); +@@ -213,6 +217,9 @@ + ; + extern int cupsdLogPage(cupsd_job_t *job, const char *page); ---- cups-1.2.4-orig/scheduler/main.c 2006-09-28 11:38:08.000000000 -0400 -+++ cups-1.2.4/scheduler/main.c 2006-09-28 16:31:29.000000000 -0400 -@@ -47,6 +47,8 @@ - * usage() - Show scheduler usage. ++#ifdef WITH_LSPP ++extern int is_lspp_config(void); ++#endif /* WITH_LSPP */ + + /* + * End of "$Id: conf.h 5696 2006-06-26 18:34:20Z mike $". +--- cups-1.2.7/scheduler/client.c.lspp 2006-11-15 20:28:39.000000000 +0000 ++++ cups-1.2.7/scheduler/client.c 2006-11-22 11:40:42.000000000 +0000 +@@ -44,12 +44,17 @@ + * make_certificate() - Make a self-signed SSL/TLS certificate. + * pipe_command() - Pipe the output of a command to the remote client. + * write_file() - Send a file via HTTP. ++ * client_pid_to_auid() - Get the audit login uid of the client. */ ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ +/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ + /* * Include necessary headers... */ -@@ -69,6 +71,9 @@ - # include - #endif /* HAVE_NOTIFY_H */ + ++#define _GNU_SOURCE + #include + #include "cupsd.h" + +@@ -65,6 +70,12 @@ + # include + #endif /* HAVE_GNUTLS */ +#ifdef WITH_LSPP -+# include ++#include ++#include ++#include +#endif /* WITH_LSPP */ ++ /* * Local functions... -@@ -141,6 +146,9 @@ - int launchd_idle_exit; - /* Idle exit on select timeout? */ - #endif /* HAVE_LAUNCHD */ -+#if WITH_LSPP -+ auditfail_t failmode; /* Action for audit_open failure */ -+#endif /* WITH_LSPP */ - - - /* -@@ -351,6 +359,25 @@ - #endif /* DEBUG */ +@@ -323,6 +334,57 @@ + } } +#ifdef WITH_LSPP -+ if ((AuditLog = audit_open()) < 0 ) ++ if (is_lspp_config()) + { -+ if (get_auditfail_action(&failmode) == 0) -+ { -+ if (failmode == FAIL_LOG) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to connect to audit subsystem."); -+ AuditLog = -1; -+ } -+ else if (failmode == FAIL_TERMINATE) ++ struct ucred cr; ++ unsigned int cl=sizeof(cr); ++ ++ if (getsockopt(con->http.fd, SOL_SOCKET, SO_PEERCRED, &cr, &cl) == 0) ++ { ++ /* ++ * client_pid_to_auid() can be racey ++ * In this case the pid is based on a socket connected to the client ++ */ ++ if ((con->auid = client_pid_to_auid(cr.pid)) == -1) + { -+ fprintf(stderr, "cupsd: unable to start auditing, terminating"); -+ return -1; ++ close(con->http.fd); ++ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: " ++ "unable to determine client auid for client pid=%d", cr.pid); ++ free(con); ++ return; + } ++ cupsdLogMessage(CUPSD_LOG_INFO, "cupsdAcceptClient: peer's pid=%d, uid=%d, gid=%d, auid=%d", ++ cr.pid, cr.uid, cr.gid, con->auid); ++ } ++ else ++ { ++ close(con->http.fd); ++ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: getsockopt() failed"); ++ free(con); ++ return; ++ } ++ ++ /* ++ * get the context of the peer connection ++ */ ++ if (getpeercon(con->http.fd, &con->scon)) ++ { ++ close(con->http.fd); ++ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: getpeercon() failed"); ++ free(con); ++ return; + } ++ ++ cupsdLogMessage(CUPSD_LOG_INFO, "cupsdAcceptClient: client context=%s", con->scon); ++ } ++ else ++ { ++ cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: skipping getpeercon()"); ++ cupsdSetString(&con->scon, UNKNOWN_SL); + } +#endif /* WITH_LSPP */ + - /* - * Set the timezone info... - */ -@@ -1115,6 +1142,11 @@ - free(input); - free(output); - + #ifdef AF_INET6 + if (con->http.hostaddr->addr.sa_family == AF_INET6) + cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: %d from %s:%d (IPv6)", +@@ -712,6 +774,13 @@ + mime_type_t *type; /* MIME type of file */ + cupsd_printer_t *p; /* Printer */ + static unsigned request_id = 0; /* Request ID for temp files */ +#ifdef WITH_LSPP -+ if (AuditLog != -1) -+ audit_close(AuditLog); ++ security_context_t spoolcon; /* context of the job file */ ++ context_t clicon; /* contex_t container for con->scon */ ++ context_t tmpcon; /* temp context to swap the level */ ++ char *clirange; /* SELinux sensitivity range */ ++ char *cliclearance; /* SELinux low end clearance */ +#endif /* WITH_LSPP */ -+ - return (!stop_scheduler); - } - ---- cups-1.2.4-orig/scheduler/printers.c 2006-09-28 11:38:08.000000000 -0400 -+++ cups-1.2.4/scheduler/printers.c 2006-10-02 15:58:22.000000000 -0400 -@@ -57,6 +57,8 @@ - * printing desktop tools. - */ -+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ -+ - /* - * Include necessary headers... - */ -@@ -79,6 +81,10 @@ - static void write_irix_state(cupsd_printer_t *p); - #endif /* __sgi */ + status = HTTP_CONTINUE; +@@ -1814,6 +1883,63 @@ + fchmod(con->file, 0640); + fchown(con->file, RunUser, Group); + fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC); +#ifdef WITH_LSPP -+# include -+# include ++ if (strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) ++ { ++ if (getfilecon(con->filename, &spoolcon) == -1) ++ { ++ cupsdSendError(con, HTTP_SERVER_ERROR); ++ return (cupsdCloseClient(con)); ++ } ++ clicon = context_new(con->scon); ++ tmpcon = context_new(spoolcon); ++ freecon(spoolcon); ++ if (!clicon || !tmpcon) ++ { ++ cupsdSendError(con, HTTP_SERVER_ERROR); ++ if (clicon) ++ context_free(clicon); ++ if (tmpcon) ++ context_free(tmpcon); ++ return (cupsdCloseClient(con)); ++ } ++ clirange = strdup(context_range_get(clicon)); ++ if ((cliclearance = strtok(clirange, "-")) != NULL) ++ { ++ if (context_range_set(tmpcon, cliclearance) == -1) ++ { ++ cupsdSendError(con, HTTP_SERVER_ERROR); ++ free(clirange); ++ context_free(tmpcon); ++ context_free(clicon); ++ return (cupsdCloseClient(con)); ++ } ++ } ++ else ++ { ++ if (context_range_set(tmpcon, (context_range_get(clicon))) == -1) ++ { ++ cupsdSendError(con, HTTP_SERVER_ERROR); ++ free(clirange); ++ context_free(tmpcon); ++ context_free(clicon); ++ return (cupsdCloseClient(con)); ++ } ++ } ++ free(clirange); ++ if (setfilecon(con->filename, context_str(tmpcon)) == -1) ++ { ++ cupsdSendError(con, HTTP_SERVER_ERROR); ++ context_free(tmpcon); ++ context_free(clicon); ++ return (cupsdCloseClient(con)); ++ } ++ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdReadClient: %s set to %s", ++ con->filename, context_str(tmpcon)); ++ context_free(tmpcon); ++ context_free(clicon); ++ } +#endif /* WITH_LSPP */ + } - /* - * 'cupsdAddPrinter()' - Add a printer to the system. -@@ -1472,6 +1478,13 @@ - "two-sided-long-edge", - "two-sided-short-edge" - }; -+#ifdef WITH_LSPP -+ char *audit_message; /* Audit message string */ -+ char *printerfile; /* Path to a local printer dev */ -+ char *rangestr; /* Printer's range if its available */ -+ security_context_t devcon; /* Printer SELinux context */ -+ context_t printercon; /* context_t for the printer */ -+#endif /* WITH_LSPP */ + if (con->http.state != HTTP_POST_SEND) +@@ -3823,6 +3949,50 @@ + #endif /* HAVE_SSL */ - DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name, -@@ -1579,6 +1592,42 @@ - attr->values[1].string.text = _cupsStrAlloc(Classification ? - Classification : p->job_sheets[1]); - } +#ifdef WITH_LSPP -+ if (AuditLog != -1) -+ { -+ audit_message = NULL; -+ rangestr = NULL; -+ printercon = 0; -+ printerfile = strstr(p->device_uri, "/dev/"); -+ if (printerfile == NULL && (strncmp(p->device_uri, "file:/", 6) == 0)) -+ printerfile = strdup(p->device_uri + strlen("file:/")); ++/* ++ * 'client_pid_to_auid()' - Using the client's pid, read /proc and determine the loginuid. ++ */ + -+ if (printerfile != NULL) -+ { -+ if (getfilecon(printerfile, &devcon) == -1) -+ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdSetPrinterAttrs: Unable to get printer context"); -+ else -+ { -+ printercon = context_new(devcon); -+ freecon(devcon); -+ } -+ } ++uid_t client_pid_to_auid(pid_t clipid) ++{ ++ uid_t uid; ++ int len, in; ++ char buf[16] = {0}; ++ char fname[32] = {0}; + -+ if (printercon && context_range_get(printercon)) -+ rangestr = strdup(context_range_get(printercon)); -+ else -+ rangestr = strdup("unknown"); + -+ cupsdSetStringf(&audit_message, "printer=%s uri=%s banners=%s,%s range=%s", -+ p->name, p->device_uri, p->job_sheets[0], p->job_sheets[1], rangestr); -+ audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message, -+ ServerName, NULL, NULL, 1); -+ if (printercon) -+ context_free(printercon); -+ free(rangestr); -+ free(audit_message); -+ } ++ /* ++ * Hopefully this pid is still the one we are interested in. ++ */ ++ snprintf(fname, 32, "/proc/%d/loginuid", clipid); ++ in = open(fname, O_NOFOLLOW|O_RDONLY); ++ ++ if (in < 0) ++ return -1; ++ ++ errno = 0; ++ ++ do { ++ len = read(in, buf, sizeof(buf)); ++ } while (len < 0 && errno == EINTR); ++ ++ close(in); ++ ++ if (len < 0 || len >= sizeof(buf)) ++ return -1; ++ ++ errno = 0; ++ buf[len] = 0; ++ uid = strtol(buf, 0, 10); ++ ++ if (errno != 0) ++ return -1; ++ else ++ return uid; ++} +#endif /* WITH_LSPP */ - } ++ + /* + * 'pipe_command()' - Pipe the output of a command to the remote client. + */ +--- cups-1.2.7/cups/cups.h.lspp 2006-11-14 16:36:36.000000000 +0000 ++++ cups-1.2.7/cups/cups.h 2006-11-22 11:40:42.000000000 +0000 +@@ -24,6 +24,9 @@ + * This file is subject to the Apple OS-Developed Software exception. + */ - printer_type = p->type; ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ + #ifndef _CUPS_CUPS_H_ + # define _CUPS_CUPS_H_ + +@@ -68,6 +71,12 @@ + # define CUPS_DATE_ANY -1 + + ++# ifdef WITH_LSPP ++# define MLS_CONFIG "mls" ++# define TE_CONFIG "te" ++# define SELINUX_CONFIG "SELinux" ++# define UNKNOWN_SL "UNKNOWN SL" ++# endif /* WITH_LSPP */ + /* + * Types and structures... + */ diff --git a/cups.spec b/cups.spec index 2a10d48..3dc0320 100644 --- a/cups.spec +++ b/cups.spec @@ -431,6 +431,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Wed Nov 22 2006 Tim Waugh 1:1.2.7-4 +- Fixed LSPP SELinux check (bug #216855). - Increased PPD timeout in copy_model() (bug #216065). * Tue Nov 21 2006 Tim Waugh 1:1.2.7-3