/*
- * "$Id: ipp.c 4906 2006-01-10 20:53:28Z mike $"
+ * "$Id: ipp.c 6949 2007-09-12 21:33:23Z mike $"
*
* IPP routines for the Common UNIX Printing System (CUPS) scheduler.
*
- * Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ * Copyright 2007 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
- * These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
+ * This file contains Kerberos support code, copyright 2006 by
+ * Jelmer Vernooij.
*
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
- * cupsdProcessIPPRequest() - Process an incoming IPP request...
+ * cupsdProcessIPPRequest() - Process an incoming IPP request.
+ * cupsdTimeoutJob() - Timeout a job waiting on job files.
* accept_jobs() - Accept print jobs to a printer.
* add_class() - Add a class to the system.
* add_file() - Add a file to a job.
+ * add_job() - Add a job to a print queue.
* add_job_state_reasons() - Add the "job-state-reasons" attribute based
* upon the job and printer state...
* add_job_subscriptions() - Add any subcriptions for a job.
+ * add_job_uuid() - Add job-uuid attribute to a job.
* add_printer() - Add a printer to the system.
* add_printer_state_reasons() - Add the "printer-state-reasons" attribute
* based upon the printer state...
* add_queued_job_count() - Add the "queued-job-count" attribute for
+ * apply_printer_defaults() - Apply printer default options to a job.
* authenticate_job() - Set job authentication info.
* cancel_all_jobs() - Cancel all print jobs.
* cancel_job() - Cancel a print job.
* copy_file() - Copy a PPD file or interface script...
* copy_model() - Copy a PPD model file, substituting default
* values as needed...
+ * copy_job_attrs() - Copy job attributes.
+ * copy_printer_attrs() - Copy printer attributes.
* copy_subscription_attrs() - Copy subscription attributes.
* create_job() - Print a file to a printer or class.
* create_requested_array() - Create an array for the requested-attributes.
* get_default() - Get the default destination.
* get_devices() - Get the list of available devices on the
* local system.
- * get_jobs() - Get a list of jobs for the specified printer.
* get_job_attrs() - Get job attributes.
+ * get_jobs() - Get a list of jobs for the specified printer.
* get_notifications() - Get events for a subscription.
+ * get_ppd() - Get a named PPD from the local system.
* get_ppds() - Get the list of PPD files on the local
* system.
* get_printer_attrs() - Get printer attributes.
* get_printers() - Get a list of printers.
* get_subscription_attrs() - Get subscription attributes.
* get_subscriptions() - Get subscriptions.
+ * get_username() - Get the username associated with a request.
* hold_job() - Hold a print job.
* move_job() - Move a job to a new destination.
- * ppd_add_default() - Add a PPD default choice.
* ppd_parse_line() - Parse a PPD default line.
* print_job() - Print a file to a printer or class.
* read_ps_line() - Read a line from a PS file...
* release_job() - Release a held print job.
* restart_job() - Restart an old print job.
* save_auth_info() - Save authentication information for a job.
+ * save_krb5_creds() - Save Kerberos credentials for a job.
* send_document() - Send a file to a printer or class.
* send_http_error() - Send a HTTP error back to the IPP client.
* send_ipp_status() - Send a status back to the IPP client.
* set_default() - Set the default destination...
* set_job_attrs() - Set job attributes.
+ * set_printer_defaults() - Set printer default options from a request.
* start_printer() - Start a printer.
* stop_printer() - Stop a printer.
+ * url_encode_attr() - URL-encode a string attribute.
+ * url_encode_string() - URL-encode a string.
* user_allowed() - See if a user is allowed to print to a queue.
* validate_job() - Validate printer options and destination.
* validate_name() - Make sure the printer name only contains
# include <paper.h>
#endif /* HAVE_LIBPAPER */
-
-/*
- * PPD default choice structure...
- */
-
-typedef struct
-{
- char option[PPD_MAX_NAME]; /* Main keyword (option name) */
- char choice[PPD_MAX_NAME]; /* Option keyword (choice name) */
-} ppd_default_t;
+#ifdef __APPLE__
+# ifdef HAVE_MEMBERSHIP_H
+# include <membership.h>
+# endif /* HAVE_MEMBERSHIP_H */
+# ifdef HAVE_MEMBERSHIPPRIV_H
+# include <membershipPriv.h>
+# else
+extern int mbr_user_name_to_uuid(const char* name, uuid_t uu);
+extern int mbr_group_name_to_uuid(const char* name, uuid_t uu);
+extern int mbr_check_membership_by_id(uuid_t user, gid_t group, int* ismember);
+# endif /* HAVE_MEMBERSHIPPRIV_H */
+#endif /* __APPLE__ */
/*
static void accept_jobs(cupsd_client_t *con, ipp_attribute_t *uri);
static void add_class(cupsd_client_t *con, ipp_attribute_t *uri);
-static int add_file(cupsd_client_t *con, cupsd_job_t *job, mime_type_t *filetype,
- int compression);
+static int add_file(cupsd_client_t *con, cupsd_job_t *job,
+ mime_type_t *filetype, int compression);
+static cupsd_job_t *add_job(cupsd_client_t *con, cupsd_printer_t *printer,
+ mime_type_t *filetype);
static void add_job_state_reasons(cupsd_client_t *con, cupsd_job_t *job);
static void add_job_subscriptions(cupsd_client_t *con, cupsd_job_t *job);
+static void add_job_uuid(cupsd_client_t *con, cupsd_job_t *job);
static void add_printer(cupsd_client_t *con, ipp_attribute_t *uri);
-static void add_printer_state_reasons(cupsd_client_t *con, cupsd_printer_t *p);
+static void add_printer_state_reasons(cupsd_client_t *con,
+ cupsd_printer_t *p);
static void add_queued_job_count(cupsd_client_t *con, cupsd_printer_t *p);
+static void apply_printer_defaults(cupsd_printer_t *printer,
+ cupsd_job_t *job);
static void authenticate_job(cupsd_client_t *con, ipp_attribute_t *uri);
static void cancel_all_jobs(cupsd_client_t *con, ipp_attribute_t *uri);
static void cancel_job(cupsd_client_t *con, ipp_attribute_t *uri);
static int check_quotas(cupsd_client_t *con, cupsd_printer_t *p);
static ipp_attribute_t *copy_attribute(ipp_t *to, ipp_attribute_t *attr,
int quickcopy);
-static void copy_attrs(ipp_t *to, ipp_t *from, ipp_attribute_t *req,
+static void copy_attrs(ipp_t *to, ipp_t *from, cups_array_t *ra,
ipp_tag_t group, int quickcopy);
-static int copy_banner(cupsd_client_t *con, cupsd_job_t *job, const char *name);
+static int copy_banner(cupsd_client_t *con, cupsd_job_t *job,
+ const char *name);
static int copy_file(const char *from, const char *to);
-static int copy_model(cupsd_client_t *con, const char *from, const char *to);
+static int copy_model(cupsd_client_t *con, const char *from,
+ const char *to);
+static void copy_job_attrs(cupsd_client_t *con,
+ cupsd_job_t *job,
+ cups_array_t *ra);
+static void copy_printer_attrs(cupsd_client_t *con,
+ cupsd_printer_t *printer,
+ cups_array_t *ra);
static void copy_subscription_attrs(cupsd_client_t *con,
cupsd_subscription_t *sub,
cups_array_t *ra);
static void get_devices(cupsd_client_t *con);
static void get_jobs(cupsd_client_t *con, ipp_attribute_t *uri);
static void get_job_attrs(cupsd_client_t *con, ipp_attribute_t *uri);
-static void get_notifications(cupsd_client_t *con, int id);
+static void get_notifications(cupsd_client_t *con);
+static void get_ppd(cupsd_client_t *con, ipp_attribute_t *uri);
static void get_ppds(cupsd_client_t *con);
static void get_printers(cupsd_client_t *con, int type);
static void get_printer_attrs(cupsd_client_t *con, ipp_attribute_t *uri);
static void get_subscription_attrs(cupsd_client_t *con, int sub_id);
static void get_subscriptions(cupsd_client_t *con, ipp_attribute_t *uri);
+static const char *get_username(cupsd_client_t *con);
static void hold_job(cupsd_client_t *con, ipp_attribute_t *uri);
static void move_job(cupsd_client_t *con, ipp_attribute_t *uri);
-static int ppd_add_default(const char *option, const char *choice,
- int num_defaults, ppd_default_t **defaults);
static int ppd_parse_line(const char *line, char *option, int olen,
char *choice, int clen);
static void print_job(cupsd_client_t *con, ipp_attribute_t *uri);
static void release_job(cupsd_client_t *con, ipp_attribute_t *uri);
static void renew_subscription(cupsd_client_t *con, int sub_id);
static void restart_job(cupsd_client_t *con, ipp_attribute_t *uri);
-static void save_auth_info(cupsd_client_t *con, cupsd_job_t *job);
+static void save_auth_info(cupsd_client_t *con, cupsd_job_t *job,
+ ipp_attribute_t *auth_info);
+#if defined(HAVE_GSSAPI) && defined(HAVE_KRB5_H)
+static void save_krb5_creds(cupsd_client_t *con, cupsd_job_t *job);
+#endif /* HAVE_GSSAPI && HAVE_KRB5_H */
static void send_document(cupsd_client_t *con, ipp_attribute_t *uri);
-static void send_http_error(cupsd_client_t *con, http_status_t status);
+static void send_http_error(cupsd_client_t *con, http_status_t status,
+ cupsd_printer_t *printer);
static void send_ipp_status(cupsd_client_t *con, ipp_status_t status,
const char *message, ...)
# ifdef __GNUC__
;
static void set_default(cupsd_client_t *con, ipp_attribute_t *uri);
static void set_job_attrs(cupsd_client_t *con, ipp_attribute_t *uri);
+static void set_printer_defaults(cupsd_client_t *con,
+ cupsd_printer_t *printer);
static void start_printer(cupsd_client_t *con, ipp_attribute_t *uri);
static void stop_printer(cupsd_client_t *con, ipp_attribute_t *uri);
+static void url_encode_attr(ipp_attribute_t *attr, char *buffer,
+ int bufsize);
+static char *url_encode_string(const char *s, char *buffer, int bufsize);
static int user_allowed(cupsd_printer_t *p, const char *username);
static void validate_job(cupsd_client_t *con, ipp_attribute_t *uri);
static int validate_name(const char *name);
/*
- * 'cupsdProcessIPPRequest()' - Process an incoming IPP request...
+ * 'cupsdProcessIPPRequest()' - Process an incoming IPP request.
*/
int /* O - 1 on success, 0 on failure */
con->response = ippNew();
- con->response->request.status.version[0] = con->request->request.op.version[0];
- con->response->request.status.version[1] = con->request->request.op.version[1];
- con->response->request.status.request_id = con->request->request.op.request_id;
+ con->response->request.status.version[0] =
+ con->request->request.op.version[0];
+ con->response->request.status.version[1] =
+ con->request->request.op.version[1];
+ con->response->request.status.request_id =
+ con->request->request.op.request_id;
/*
* Then validate the request header and required attributes...
*/
-
+
if (con->request->request.any.version[0] != 1)
{
/*
_("Bad request version number %d.%d!"),
con->request->request.any.version[0],
con->request->request.any.version[1]);
- }
- else if (con->request->attrs == NULL)
+ }
+ else if (!con->request->attrs)
{
cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL,
"%04X %s No attributes in request",
*/
for (attr = con->request->attrs, group = attr->group_tag;
- attr != NULL;
+ attr;
attr = attr->next)
if (attr->group_tag < group && attr->group_tag != IPP_TAG_ZERO)
{
else
group = attr->group_tag;
- if (attr == NULL)
+ if (!attr)
{
/*
* Then make sure that the first three attributes are:
attr = con->request->attrs;
if (attr && !strcmp(attr->name, "attributes-charset") &&
- attr->value_tag == IPP_TAG_CHARSET)
+ (attr->value_tag & IPP_TAG_MASK) == IPP_TAG_CHARSET)
charset = attr;
else
charset = NULL;
attr = attr->next;
if (attr && !strcmp(attr->name, "attributes-natural-language") &&
- attr->value_tag == IPP_TAG_LANGUAGE)
+ (attr->value_tag & IPP_TAG_MASK) == IPP_TAG_LANGUAGE)
language = attr;
else
language = NULL;
- if ((attr = ippFindAttribute(con->request, "printer-uri", IPP_TAG_URI)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-uri",
+ IPP_TAG_URI)) != NULL)
uri = attr;
- else if ((attr = ippFindAttribute(con->request, "job-uri", IPP_TAG_URI)) != NULL)
+ else if ((attr = ippFindAttribute(con->request, "job-uri",
+ IPP_TAG_URI)) != NULL)
uri = attr;
+ else if (con->request->request.op.operation_id == CUPS_GET_PPD)
+ uri = ippFindAttribute(con->request, "ppd-name", IPP_TAG_NAME);
else
uri = NULL;
if (charset)
ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
- "attributes-charset", NULL, charset->values[0].string.text);
+ "attributes-charset", NULL,
+ charset->values[0].string.text);
else
ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
"attributes-charset", NULL, DefaultCharset);
ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
"attributes-natural-language", NULL, DefaultLanguage);
- if (charset == NULL || language == NULL ||
- (uri == NULL &&
+ if (!charset || !language ||
+ (!uri &&
con->request->request.op.operation_id != CUPS_GET_DEFAULT &&
con->request->request.op.operation_id != CUPS_GET_PRINTERS &&
con->request->request.op.operation_id != CUPS_GET_CLASSES &&
if (!uri)
{
cupsdLogMessage(CUPSD_LOG_ERROR,
- "Missing printer-uri or job-uri attribute!");
+ "Missing printer-uri, job-uri, or ppd-name "
+ "attribute!");
cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL,
- "%04X %s Missing printer-uri or job-uri attribute",
- IPP_BAD_REQUEST, con->http.hostname);
+ "%04X %s Missing printer-uri, job-uri, or ppd-name "
+ "attribute", IPP_BAD_REQUEST, con->http.hostname);
}
cupsdLogMessage(CUPSD_LOG_DEBUG, "Request attributes follow...");
- for (attr = con->request->attrs; attr != NULL; attr = attr->next)
- cupsdLogMessage(CUPSD_LOG_DEBUG,
+ for (attr = con->request->attrs; attr; attr = attr->next)
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
"attr \"%s\": group_tag = %x, value_tag = %x",
attr->name ? attr->name : "(null)", attr->group_tag,
attr->value_tag);
* Remote unauthenticated user masquerading as local root...
*/
- cupsdSetString(&(username->values[0].string.text), RemoteRoot);
+ _cupsStrFree(username->values[0].string.text);
+ username->values[0].string.text = _cupsStrAlloc(RemoteRoot);
}
}
*/
if (uri)
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "cupsdProcessIPPRequest: URI=\"%s\"",
- uri->values[0].string.text);
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "%s %s",
+ ippOpString(con->request->request.op.operation_id),
+ uri->values[0].string.text);
+ else
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "%s",
+ ippOpString(con->request->request.op.operation_id));
switch (con->request->request.op.operation_id)
{
get_devices(con);
break;
+ case CUPS_GET_PPD :
+ get_ppd(con, uri);
+ break;
+
case CUPS_GET_PPDS :
get_ppds(con);
break;
break;
case IPP_GET_NOTIFICATIONS :
- get_notifications(con, sub_id);
+ get_notifications(con);
break;
default :
send_ipp_status(con, IPP_OPERATION_NOT_SUPPORTED,
_("%s not supported!"),
- ippOpString(con->request->request.op.operation_id));
+ ippOpString(
+ con->request->request.op.operation_id));
break;
}
}
con->http.fd, con->response->request.status.status_code,
ippErrorString(con->response->request.status.status_code));
- if (cupsdSendHeader(con, HTTP_OK, "application/ipp"))
+ if (cupsdSendHeader(con, HTTP_OK, "application/ipp", AUTH_NONE))
{
+#ifdef CUPSD_USE_CHUNKING
+ /*
+ * Because older versions of CUPS (1.1.17 and older) and some IPP
+ * clients do not implement chunking properly, we cannot use
+ * chunking by default. This may become the default in future
+ * CUPS releases, or we might add a configuration directive for
+ * it.
+ */
+
if (con->http.version == HTTP_1_1)
{
- con->http.data_encoding = HTTP_ENCODE_CHUNKED;
+ if (httpPrintf(HTTP(con), "Transfer-Encoding: chunked\r\n\r\n") < 0)
+ return (0);
- httpPrintf(HTTP(con), "Transfer-Encoding: chunked\r\n\r\n");
+ if (cupsdFlushHeader(con) < 0)
+ return (0);
+
+ con->http.data_encoding = HTTP_ENCODE_CHUNKED;
}
else
+#endif /* CUPSD_USE_CHUNKING */
{
+ size_t length; /* Length of response */
+
+
+ length = ippLength(con->response);
+
+ if (con->file >= 0 && !con->pipe_pid)
+ {
+ struct stat fileinfo; /* File information */
+
+
+ if (!fstat(con->file, &fileinfo))
+ length += fileinfo.st_size;
+ }
+
+ if (httpPrintf(HTTP(con), "Content-Length: " CUPS_LLFMT "\r\n\r\n",
+ CUPS_LLCAST length) < 0)
+ return (0);
+
+ if (cupsdFlushHeader(con) < 0)
+ return (0);
+
con->http.data_encoding = HTTP_ENCODE_LENGTH;
- con->http.data_remaining = ippLength(con->response);
+ con->http.data_remaining = length;
- if (con->http.data_remaining < INT_MAX)
+ if (con->http.data_remaining <= INT_MAX)
con->http._data_remaining = con->http.data_remaining;
else
con->http._data_remaining = INT_MAX;
-
- httpPrintf(HTTP(con), "Content-Length: " CUPS_LLFMT "\r\n\r\n",
- CUPS_LLCAST con->http.data_remaining);
}
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "cupsdProcessIPPRequest: Adding fd %d to OutputSet...",
- con->http.fd);
-
- FD_SET(con->http.fd, OutputSet);
+ cupsdAddSelect(con->http.fd, (cupsd_selfunc_t)cupsdReadClient,
+ (cupsd_selfunc_t)cupsdWriteClient, con);
/*
* Tell the caller the response header was sent successfully...
}
+/*
+ * 'cupsdTimeoutJob()' - Timeout a job waiting on job files.
+ */
+
+void
+cupsdTimeoutJob(cupsd_job_t *job) /* I - Job to timeout */
+{
+ cupsd_printer_t *printer; /* Destination printer or class */
+ ipp_attribute_t *attr; /* job-sheets attribute */
+ int kbytes; /* Kilobytes in banner */
+
+
+ job->pending_timeout = 0;
+
+ /*
+ * See if we need to add the ending sheet...
+ */
+
+ printer = cupsdFindDest(job->dest);
+ attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
+
+ if (printer &&
+ !(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)) &&
+ attr && attr->num_values > 1)
+ {
+ /*
+ * Yes...
+ */
+
+ cupsdLogMessage(CUPSD_LOG_INFO, "[Job %d] Adding end banner page \"%s\".",
+ job->id, attr->values[1].string.text);
+
+ kbytes = copy_banner(NULL, job, attr->values[1].string.text);
+
+ cupsdUpdateQuota(printer, job->username, 0, kbytes);
+ }
+}
+
+
/*
* 'accept_jobs()' - Accept print jobs to a printer.
*/
ipp_attribute_t *uri) /* I - Printer or class URI */
{
http_status_t status; /* Policy status */
- cups_ptype_t dtype; /* Destination type (printer or class) */
- char method[HTTP_MAX_URI], /* Method portion of URI */
- username[HTTP_MAX_URI], /* Username portion of URI */
- host[HTTP_MAX_URI], /* Host portion of URI */
- resource[HTTP_MAX_URI]; /* Resource portion of URI */
- int port; /* Port portion of URI */
- const char *name; /* Printer name */
+ cups_ptype_t dtype; /* Destination type (printer/class) */
cupsd_printer_t *printer; /* Printer data */
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
-
- if ((name = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
+ if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer))
{
/*
* Bad URI...
if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, printer);
return;
}
cupsdAddPrinterHistory(printer);
if (dtype & CUPS_PRINTER_CLASS)
+ {
cupsdSaveAllClasses();
+
+ cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" now accepting jobs (\"%s\").",
+ printer->name, get_username(con));
+ }
else
+ {
cupsdSaveAllPrinters();
- cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" now accepting jobs (\"%s\").", name,
- con->username);
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Printer \"%s\" now accepting jobs (\"%s\").",
+ printer->name, get_username(con));
+ }
/*
* Everything was ok, so return OK status...
cupsd_printer_t *pclass, /* Class */
*member; /* Member printer/class */
cups_ptype_t dtype; /* Destination type */
- const char *dest; /* Printer or class name */
ipp_attribute_t *attr; /* Printer attribute */
int modify; /* Non-zero if we just modified */
+ char newname[IPP_MAX_NAME]; /* New class name */
+ int need_restart_job; /* Need to restart job? */
cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_class(%p[%d], %s)", con,
* Do we have a valid URI?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
- if (strncmp(resource, "/classes/", 9) != 0 || strlen(resource) == 9)
+ if (strncmp(resource, "/classes/", 9) || strlen(resource) == 9)
{
/*
* No, return an error...
if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, NULL);
return;
}
*/
if ((pclass = cupsdFindPrinter(resource + 9)) != NULL &&
- !(pclass->type & CUPS_PRINTER_REMOTE))
+ !(pclass->type & CUPS_PRINTER_DISCOVERED))
{
/*
* Yes, return an error...
if (ImplicitAnyClasses)
{
- cupsArrayRemove(Printers, pclass);
- cupsdSetStringf(&pclass->name, "Any%s", resource + 9);
- cupsArrayAdd(Printers, pclass);
+ snprintf(newname, sizeof(newname), "Any%s", resource + 9);
+ cupsdRenamePrinter(pclass, newname);
}
else
cupsdDeletePrinter(pclass, 1);
pclass = cupsdAddClass(resource + 9);
modify = 0;
}
- else if (pclass->type & CUPS_PRINTER_REMOTE)
+ else if (pclass->type & CUPS_PRINTER_DISCOVERED)
{
/*
* Rename the remote class to "Class"...
*/
- cupsdDeletePrinterFilters(pclass);
- cupsArrayRemove(Printers, pclass);
- cupsdSetStringf(&pclass->name, "%s@%s", resource + 9, pclass->hostname);
- cupsdSetPrinterAttrs(pclass);
- cupsArrayAdd(Printers, pclass);
+ snprintf(newname, sizeof(newname), "%s@%s", resource + 9, pclass->hostname);
+ cupsdRenamePrinter(pclass, newname);
/*
* Add the class as a new local class...
* Look for attributes and copy them over as needed...
*/
- if ((attr = ippFindAttribute(con->request, "printer-location", IPP_TAG_TEXT)) != NULL)
+ need_restart_job = 0;
+
+ if ((attr = ippFindAttribute(con->request, "printer-location",
+ IPP_TAG_TEXT)) != NULL)
cupsdSetString(&pclass->location, attr->values[0].string.text);
- if ((attr = ippFindAttribute(con->request, "printer-info", IPP_TAG_TEXT)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-info",
+ IPP_TAG_TEXT)) != NULL)
cupsdSetString(&pclass->info, attr->values[0].string.text);
- if ((attr = ippFindAttribute(con->request, "printer-is-accepting-jobs", IPP_TAG_BOOLEAN)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-is-accepting-jobs",
+ IPP_TAG_BOOLEAN)) != NULL)
{
- cupsdLogMessage(CUPSD_LOG_INFO, "Setting %s printer-is-accepting-jobs to %d (was %d.)",
- pclass->name, attr->values[0].boolean, pclass->accepting);
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Setting %s printer-is-accepting-jobs to %d (was %d.)",
+ pclass->name, attr->values[0].boolean, pclass->accepting);
pclass->accepting = attr->values[0].boolean;
cupsdAddPrinterHistory(pclass);
}
- if ((attr = ippFindAttribute(con->request, "printer-is-shared", IPP_TAG_BOOLEAN)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-is-shared",
+ IPP_TAG_BOOLEAN)) != NULL)
{
if (pclass->shared && !attr->values[0].boolean)
- cupsdSendBrowseDelete(pclass);
+ cupsdDeregisterPrinter(pclass, 1);
cupsdLogMessage(CUPSD_LOG_INFO,
"Setting %s printer-is-shared to %d (was %d.)",
pclass->shared = attr->values[0].boolean;
}
- if ((attr = ippFindAttribute(con->request, "printer-state", IPP_TAG_ENUM)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-state",
+ IPP_TAG_ENUM)) != NULL)
{
if (attr->values[0].integer != IPP_PRINTER_IDLE &&
attr->values[0].integer != IPP_PRINTER_STOPPED)
return;
}
- cupsdLogMessage(CUPSD_LOG_INFO, "Setting %s printer-state to %d (was %d.)", pclass->name,
- attr->values[0].integer, pclass->state);
+ cupsdLogMessage(CUPSD_LOG_INFO, "Setting %s printer-state to %d (was %d.)",
+ pclass->name, attr->values[0].integer, pclass->state);
if (attr->values[0].integer == IPP_PRINTER_STOPPED)
cupsdStopPrinter(pclass, 0);
else
+ {
cupsdSetPrinterState(pclass, (ipp_pstate_t)(attr->values[0].integer), 0);
+ need_restart_job = 1;
+ }
}
- if ((attr = ippFindAttribute(con->request, "printer-state-message", IPP_TAG_TEXT)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-state-message",
+ IPP_TAG_TEXT)) != NULL)
{
strlcpy(pclass->state_message, attr->values[0].string.text,
sizeof(pclass->state_message));
cupsdAddPrinterHistory(pclass);
}
- if ((attr = ippFindAttribute(con->request, "job-sheets-default", IPP_TAG_ZERO)) != NULL &&
- !Classification)
- {
- cupsdSetString(&pclass->job_sheets[0], attr->values[0].string.text);
- if (attr->num_values > 1)
- cupsdSetString(&pclass->job_sheets[1], attr->values[1].string.text);
- else
- cupsdSetString(&pclass->job_sheets[1], "none");
- }
- if ((attr = ippFindAttribute(con->request, "requesting-user-name-allowed",
- IPP_TAG_ZERO)) != NULL)
- {
- cupsdFreePrinterUsers(pclass);
-
- pclass->deny_users = 0;
- if (attr->value_tag == IPP_TAG_NAME &&
- (attr->num_values > 1 ||
- strcmp(attr->values[0].string.text, "all") != 0))
- for (i = 0; i < attr->num_values; i ++)
- cupsdAddPrinterUser(pclass, attr->values[i].string.text);
- }
- else if ((attr = ippFindAttribute(con->request, "requesting-user-name-denied",
- IPP_TAG_ZERO)) != NULL)
- {
- cupsdFreePrinterUsers(pclass);
-
- pclass->deny_users = 1;
- if (attr->value_tag == IPP_TAG_NAME &&
- (attr->num_values > 1 ||
- strcmp(attr->values[0].string.text, "none") != 0))
- for (i = 0; i < attr->num_values; i ++)
- cupsdAddPrinterUser(pclass, attr->values[i].string.text);
- }
- if ((attr = ippFindAttribute(con->request, "job-quota-period",
- IPP_TAG_INTEGER)) != NULL)
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "add_class: Setting job-quota-period to %d...",
- attr->values[0].integer);
- cupsdFreeQuotas(pclass);
- pclass->quota_period = attr->values[0].integer;
- }
- if ((attr = ippFindAttribute(con->request, "job-k-limit",
- IPP_TAG_INTEGER)) != NULL)
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "add_class: Setting job-k-limit to %d...",
- attr->values[0].integer);
- cupsdFreeQuotas(pclass);
- pclass->k_limit = attr->values[0].integer;
- }
- if ((attr = ippFindAttribute(con->request, "job-page-limit",
- IPP_TAG_INTEGER)) != NULL)
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "add_class: Setting job-page-limit to %d...",
- attr->values[0].integer);
- cupsdFreeQuotas(pclass);
- pclass->page_limit = attr->values[0].integer;
- }
- if ((attr = ippFindAttribute(con->request, "printer-op-policy",
- IPP_TAG_NAME)) != NULL)
- {
- cupsd_policy_t *p; /* Policy */
-
-
- if ((p = cupsdFindPolicy(attr->values[0].string.text)) != NULL)
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "add_class: Setting printer-op-policy to \"%s\"...",
- attr->values[0].string.text);
- cupsdSetString(&pclass->op_policy, attr->values[0].string.text);
- pclass->op_policy_ptr = p;
- }
- else
- {
- send_ipp_status(con, IPP_NOT_POSSIBLE,
- _("add_class: Unknown printer-op-policy \"%s\"."),
- attr->values[0].string.text);
- return;
- }
- }
- if ((attr = ippFindAttribute(con->request, "printer-error-policy",
- IPP_TAG_NAME)) != NULL)
- {
- if (strcmp(attr->values[0].string.text, "abort-job") &&
- strcmp(attr->values[0].string.text, "retry-job") &&
- strcmp(attr->values[0].string.text, "stop-printer"))
- {
- send_ipp_status(con, IPP_NOT_POSSIBLE,
- _("add_class: Unknown printer-error-policy \"%s\"."),
- attr->values[0].string.text);
- return;
- }
-
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "add_class: Setting printer-error-policy to \"%s\"...",
- attr->values[0].string.text);
- cupsdSetString(&pclass->error_policy, attr->values[0].string.text);
- }
- if ((attr = ippFindAttribute(con->request, "member-uris", IPP_TAG_URI)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "member-uris",
+ IPP_TAG_URI)) != NULL)
{
/*
* Clear the printer array as needed...
*/
+ need_restart_job = 1;
+
if (pclass->num_printers > 0)
{
free(pclass->printers);
* Search for the printer or class URI...
*/
- httpSeparateURI(attr->values[i].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
-
- if ((dest = cupsdValidateDest(host, resource, &dtype, &member)) == NULL)
+ if (!cupsdValidateDest(attr->values[i].string.text, &dtype, &member))
{
/*
* Bad URI...
}
}
+ set_printer_defaults(con, pclass);
+
+ if ((attr = ippFindAttribute(con->request, "auth-info-required",
+ IPP_TAG_KEYWORD)) != NULL)
+ cupsdSetAuthInfoRequired(pclass, NULL, attr);
+
/*
* Update the printer class attributes and return...
*/
cupsdSetPrinterAttrs(pclass);
cupsdSaveAllClasses();
- cupsdCheckJobs();
+
+ if (need_restart_job && pclass->job)
+ {
+ cupsd_job_t *job;
+
+ /*
+ * Stop the current job and then restart it below...
+ */
+
+ job = (cupsd_job_t *)pclass->job;
+
+ cupsdStopJob(job, 1);
+
+ job->state->values[0].integer = IPP_JOB_PENDING;
+ job->state_value = IPP_JOB_PENDING;
+ }
+
+ if (need_restart_job)
+ cupsdCheckJobs();
cupsdWritePrintcap();
{
cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED, pclass, NULL,
"Class \"%s\" modified by \"%s\".", pclass->name,
- con->username);
+ get_username(con));
cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" modified by \"%s\".",
- pclass->name, con->username);
+ pclass->name, get_username(con));
}
else
{
cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED, pclass, NULL,
"New class \"%s\" added by \"%s\".", pclass->name,
- con->username);
+ get_username(con));
cupsdLogMessage(CUPSD_LOG_INFO, "New class \"%s\" added by \"%s\".",
- pclass->name, con->username);
+ pclass->name, get_username(con));
}
con->response->request.status.status_code = IPP_OK;
cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "add_file(con=%p[%d], job=%d, filetype=%s/%s, compression=%d)",
- con, con->http.fd, job->id, filetype->super, filetype->type,
- compression);
+ "add_file(con=%p[%d], job=%d, filetype=%s/%s, "
+ "compression=%d)", con, con ? con->http.fd : -1, job->id,
+ filetype->super, filetype->type, compression);
/*
* Add the file to the job...
sizeof(mime_type_t *));
}
- if (compressions == NULL || filetypes == NULL)
+ if (!compressions || !filetypes)
{
- cupsdCancelJob(job, 1);
+ cupsdCancelJob(job, 1, IPP_JOB_ABORTED);
+
+ if (con)
+ send_ipp_status(con, IPP_INTERNAL_ERROR,
+ _("Unable to allocate memory for file types!"));
- send_ipp_status(con, IPP_INTERNAL_ERROR,
- _("Unable to allocate memory for file types!"));
return (-1);
}
/*
- * 'add_job_state_reasons()' - Add the "job-state-reasons" attribute based
- * upon the job and printer state...
+ * 'add_job()' - Add a job to a print queue.
*/
-static void
-add_job_state_reasons(
- cupsd_client_t *con, /* I - Client connection */
- cupsd_job_t *job) /* I - Job info */
+static cupsd_job_t * /* O - Job object */
+add_job(cupsd_client_t *con, /* I - Client connection */
+ cupsd_printer_t *printer, /* I - Destination printer */
+ mime_type_t *filetype) /* I - First print file type, if any */
{
- cupsd_printer_t *dest; /* Destination printer */
+ http_status_t status; /* Policy status */
+ ipp_attribute_t *attr, /* Current attribute */
+ *auth_info; /* auth-info attribute */
+ const char *val; /* Default option value */
+ int priority; /* Job priority */
+ char *title; /* Job name/title */
+ cupsd_job_t *job; /* Current job */
+ char job_uri[HTTP_MAX_URI]; /* Job URI */
+ int kbytes; /* Size of print file */
+ int i; /* Looping var */
+ int lowerpagerange; /* Page range bound */
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job_state_reasons(%p[%d], %d)",
- con, con->http.fd, job ? job->id : 0);
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))",
+ con, con->http.fd, printer, printer->name,
+ filetype, filetype->super, filetype->type);
- switch (job ? job->state->values[0].integer : IPP_JOB_CANCELLED)
- {
- case IPP_JOB_PENDING :
- if (job->dtype & CUPS_PRINTER_CLASS)
- dest = cupsdFindClass(job->dest);
- else
- dest = cupsdFindPrinter(job->dest);
+ /*
+ * Check remote printing to non-shared printer...
+ */
- if (dest != NULL && dest->state == IPP_PRINTER_STOPPED)
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
- "job-state-reasons", NULL, "printer-stopped");
- else
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
- "job-state-reasons", NULL, "none");
- break;
+ if (!printer->shared &&
+ strcasecmp(con->http.hostname, "localhost") &&
+ strcasecmp(con->http.hostname, ServerName))
+ {
+ send_ipp_status(con, IPP_NOT_AUTHORIZED,
+ _("The printer or class is not shared!"));
+ return (NULL);
+ }
- case IPP_JOB_HELD :
- if (ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_KEYWORD) != NULL ||
- ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME) != NULL)
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
- "job-state-reasons", NULL, "job-hold-until-specified");
- else
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
- "job-state-reasons", NULL, "job-incoming");
- break;
+ /*
+ * Check policy...
+ */
- case IPP_JOB_PROCESSING :
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
- "job-state-reasons", NULL, "job-printing");
- break;
+ auth_info = ippFindAttribute(con->request, "auth-info", IPP_TAG_TEXT);
- case IPP_JOB_STOPPED :
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
- "job-state-reasons", NULL, "job-stopped");
- break;
+ if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
+ {
+ send_http_error(con, status, printer);
+ return (NULL);
+ }
+ else if ((printer->type & CUPS_PRINTER_AUTHENTICATED) &&
+ !con->username[0] && !auth_info)
+ {
+ send_http_error(con, HTTP_UNAUTHORIZED, printer);
+ return (NULL);
+ }
+#ifdef HAVE_SSL
+ else if (auth_info && !con->http.tls &&
+ !httpAddrLocalhost(con->http.hostaddr))
+ {
+ /*
+ * Require encryption of auth-info over non-local connections...
+ */
- case IPP_JOB_CANCELLED :
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
- "job-state-reasons", NULL, "job-canceled-by-user");
- break;
+ send_http_error(con, HTTP_UPGRADE_REQUIRED, printer);
+ return (NULL);
+ }
+#endif /* HAVE_SSL */
- case IPP_JOB_ABORTED :
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
- "job-state-reasons", NULL, "aborted-by-system");
- break;
+ /*
+ * See if the printer is accepting jobs...
+ */
- case IPP_JOB_COMPLETED :
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
- "job-state-reasons", NULL, "job-completed-successfully");
- break;
+ if (!printer->accepting)
+ {
+ send_ipp_status(con, IPP_NOT_ACCEPTING,
+ _("Destination \"%s\" is not accepting jobs."),
+ printer->name);
+ return (NULL);
}
-}
+ /*
+ * Validate job template attributes; for now just document-format,
+ * copies, number-up, and page-ranges...
+ */
-/*
- * 'add_job_subscriptions()' - Add any subcriptions for a job.
- */
-
-static void
-add_job_subscriptions(
- cupsd_client_t *con, /* I - Client connection */
- cupsd_job_t *job) /* I - Newly created job */
-{
- int i; /* Looping var */
- ipp_attribute_t *prev, /* Previous attribute */
- *next, /* Next attribute */
- *attr; /* Current attribute */
- cupsd_subscription_t *sub; /* Subscription object */
- const char *recipient, /* notify-recipient-uri */
- *pullmethod; /* notify-pull-method */
- ipp_attribute_t *user_data; /* notify-user-data */
- int interval; /* notify-time-interval */
- unsigned mask; /* notify-events */
+ if (filetype && printer->filetypes &&
+ !cupsArrayFind(printer->filetypes, filetype))
+ {
+ char mimetype[MIME_MAX_SUPER + MIME_MAX_TYPE + 2];
+ /* MIME media type string */
- /*
- * Find the first subscription group attribute; return if we have
- * none...
- */
+ snprintf(mimetype, sizeof(mimetype), "%s/%s", filetype->super,
+ filetype->type);
- for (attr = job->attrs->attrs, prev = NULL;
- attr;
- prev = attr, attr = attr->next)
- if (attr->group_tag == IPP_TAG_SUBSCRIPTION)
- break;
+ send_ipp_status(con, IPP_DOCUMENT_FORMAT,
+ _("Unsupported format \'%s\'!"), mimetype);
- if (!attr)
- return;
+ ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_MIMETYPE,
+ "document-format", NULL, mimetype);
- /*
- * Process the subscription attributes in the request...
- */
+ return (NULL);
+ }
- while (attr)
+ if ((attr = ippFindAttribute(con->request, "copies",
+ IPP_TAG_INTEGER)) != NULL)
{
- recipient = NULL;
- pullmethod = NULL;
- user_data = NULL;
- interval = 0;
- mask = CUPSD_EVENT_NONE;
+ if (attr->values[0].integer < 1 || attr->values[0].integer > MaxCopies)
+ {
+ send_ipp_status(con, IPP_ATTRIBUTES, _("Bad copies value %d."),
+ attr->values[0].integer);
+ ippAddInteger(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_INTEGER,
+ "copies", attr->values[0].integer);
+ return (NULL);
+ }
+ }
- while (attr && attr->group_tag != IPP_TAG_ZERO)
+ if ((attr = ippFindAttribute(con->request, "number-up",
+ IPP_TAG_INTEGER)) != NULL)
+ {
+ if (attr->values[0].integer != 1 &&
+ attr->values[0].integer != 2 &&
+ attr->values[0].integer != 4 &&
+ attr->values[0].integer != 6 &&
+ attr->values[0].integer != 9 &&
+ attr->values[0].integer != 16)
{
- if (!strcmp(attr->name, "notify-recipient") &&
- attr->value_tag == IPP_TAG_URI)
- recipient = attr->values[0].string.text;
- else if (!strcmp(attr->name, "notify-pull-method") &&
- attr->value_tag == IPP_TAG_KEYWORD)
- pullmethod = attr->values[0].string.text;
- else if (!strcmp(attr->name, "notify-charset") &&
- attr->value_tag == IPP_TAG_CHARSET &&
- strcmp(attr->values[0].string.text, "us-ascii") &&
- strcmp(attr->values[0].string.text, "utf-8"))
- {
- send_ipp_status(con, IPP_CHARSET,
- _("Character set \"%s\" not supported!"),
- attr->values[0].string.text);
- return;
- }
- else if (!strcmp(attr->name, "notify-natural-language") &&
- (attr->value_tag != IPP_TAG_LANGUAGE ||
- strcmp(attr->values[0].string.text, DefaultLanguage)))
- {
- send_ipp_status(con, IPP_CHARSET,
- _("Language \"%s\" not supported!"),
- attr->values[0].string.text);
- return;
- }
- else if (!strcmp(attr->name, "notify-user-data") &&
- attr->value_tag == IPP_TAG_STRING)
- {
- if (attr->num_values > 1 || attr->values[0].unknown.length > 63)
- {
- send_ipp_status(con, IPP_REQUEST_VALUE,
- _("The notify-user-data value is too large "
- "(%d > 63 octets)!"),
- attr->values[0].unknown.length);
- return;
- }
+ send_ipp_status(con, IPP_ATTRIBUTES, _("Bad number-up value %d."),
+ attr->values[0].integer);
+ ippAddInteger(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_INTEGER,
+ "number-up", attr->values[0].integer);
+ return (NULL);
+ }
+ }
- user_data = attr;
- }
- else if (!strcmp(attr->name, "notify-events") &&
- attr->value_tag == IPP_TAG_KEYWORD)
- {
- for (i = 0; i < attr->num_values; i ++)
- mask |= cupsdEventValue(attr->values[i].string.text);
- }
- else if (!strcmp(attr->name, "notify-lease-duration"))
+ if ((attr = ippFindAttribute(con->request, "page-ranges",
+ IPP_TAG_RANGE)) != NULL)
+ {
+ for (i = 0, lowerpagerange = 1; i < attr->num_values; i ++)
+ {
+ if (attr->values[i].range.lower < lowerpagerange ||
+ attr->values[i].range.lower > attr->values[i].range.upper)
{
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("The notify-lease-duration attribute cannot be "
- "used with job subscriptions."));
- return;
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("Bad page-ranges values %d-%d."),
+ attr->values[i].range.lower,
+ attr->values[i].range.upper);
+ return (NULL);
}
- else if (!strcmp(attr->name, "notify-time-interval") &&
- attr->value_tag == IPP_TAG_INTEGER)
- interval = attr->values[0].integer;
- attr = attr->next;
+ lowerpagerange = attr->values[i].range.upper + 1;
}
+ }
- if (!recipient && !pullmethod)
- break;
-
- if (mask == CUPSD_EVENT_NONE)
- mask = CUPSD_EVENT_JOB_COMPLETED;
-
- sub = cupsdAddSubscription(mask, cupsdFindDest(job->dest), job, recipient,
- 0);
-
- sub->interval = interval;
-
- cupsdSetString(&sub->owner, job->username);
-
- if (user_data)
- {
- sub->user_data_len = user_data->values[0].unknown.length;
- memcpy(sub->user_data, user_data->values[0].unknown.data,
- sub->user_data_len);
- }
+ /*
+ * Make sure we aren't over our limit...
+ */
- ippAddSeparator(con->response);
- ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
- "notify-subscription-id", sub->id);
+ if (MaxJobs && cupsArrayCount(Jobs) >= MaxJobs)
+ cupsdCleanJobs();
- if (attr)
- attr = attr->next;
+ if (MaxJobs && cupsArrayCount(Jobs) >= MaxJobs)
+ {
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("Too many active jobs."));
+ return (NULL);
}
- cupsdSaveAllSubscriptions();
+ if ((i = check_quotas(con, printer)) < 0)
+ {
+ send_ipp_status(con, IPP_NOT_POSSIBLE, _("Quota limit reached."));
+ return (NULL);
+ }
+ else if (i == 0)
+ {
+ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Not allowed to print."));
+ return (NULL);
+ }
/*
- * Remove all of the subscription attributes from the job request...
+ * Create the job and set things up...
*/
- for (attr = job->attrs->attrs, prev = NULL; attr; attr = next)
+ if ((attr = ippFindAttribute(con->request, "job-priority",
+ IPP_TAG_INTEGER)) != NULL)
+ priority = attr->values[0].integer;
+ else
{
- next = attr->next;
+ if ((val = cupsGetOption("job-priority", printer->num_options,
+ printer->options)) != NULL)
+ priority = atoi(val);
+ else
+ priority = 50;
- if (attr->group_tag == IPP_TAG_SUBSCRIPTION ||
- attr->group_tag == IPP_TAG_ZERO)
- {
- /*
- * Free and remove this attribute...
- */
+ ippAddInteger(con->request, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-priority",
+ priority);
+ }
- _ipp_free_attr(attr);
+ if ((attr = ippFindAttribute(con->request, "job-name",
+ IPP_TAG_NAME)) != NULL)
+ title = attr->values[0].string.text;
+ else
+ ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
+ title = "Untitled");
- if (prev)
- prev->next = next;
- else
- job->attrs->attrs = next;
- }
- else
- prev = attr;
+ if ((job = cupsdAddJob(priority, printer->name)) == NULL)
+ {
+ send_ipp_status(con, IPP_INTERNAL_ERROR,
+ _("Unable to add job for destination \"%s\"!"),
+ printer->name);
+ return (NULL);
}
- job->attrs->last = prev;
- job->attrs->current = prev;
-}
-
+ job->dtype = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT |
+ CUPS_PRINTER_REMOTE);
+ job->attrs = con->request;
+ con->request = ippNewRequest(job->attrs->request.op.operation_id);
-/*
- * 'add_printer()' - Add a printer to the system.
- */
+ add_job_uuid(con, job);
+ apply_printer_defaults(printer, job);
-static void
-add_printer(cupsd_client_t *con, /* I - Client connection */
- ipp_attribute_t *uri) /* I - URI of printer */
-{
- http_status_t status; /* Policy status */
- int i; /* Looping var */
- char method[HTTP_MAX_URI], /* Method portion of URI */
- username[HTTP_MAX_URI], /* Username portion of URI */
- host[HTTP_MAX_URI], /* Host portion of URI */
- resource[HTTP_MAX_URI]; /* Resource portion of URI */
- int port; /* Port portion of URI */
- cupsd_printer_t *printer; /* Printer/class */
- ipp_attribute_t *attr; /* Printer attribute */
- cups_file_t *fp; /* Script/PPD file */
- char line[1024]; /* Line from file... */
- char srcfile[1024], /* Source Script/PPD file */
- dstfile[1024]; /* Destination Script/PPD file */
- int modify; /* Non-zero if we are modifying */
+ attr = ippFindAttribute(job->attrs, "requesting-user-name", IPP_TAG_NAME);
+ if (con->username[0])
+ {
+ cupsdSetString(&job->username, con->username);
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_printer(%p[%d], %s)", con,
- con->http.fd, uri->values[0].string.text);
+ if (attr)
+ cupsdSetString(&attr->values[0].string.text, con->username);
+ }
+ else if (attr)
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "add_job: requesting-user-name=\"%s\"",
+ attr->values[0].string.text);
- /*
- * Do we have a valid URI?
- */
+ cupsdSetString(&job->username, attr->values[0].string.text);
+ }
+ else
+ cupsdSetString(&job->username, "anonymous");
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ if (!attr)
+ ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME,
+ "job-originating-user-name", NULL, job->username);
+ else
+ {
+ attr->group_tag = IPP_TAG_JOB;
+ _cupsStrFree(attr->name);
+ attr->name = _cupsStrAlloc("job-originating-user-name");
+ }
- if (strncmp(resource, "/printers/", 10) != 0 || strlen(resource) == 10)
+ if (con->username[0] || auth_info)
{
+ save_auth_info(con, job, auth_info);
+
/*
- * No, return an error...
+ * Remove the auth-info attribute from the attribute data...
*/
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("The printer-uri must be of the form "
- "\"ipp://HOSTNAME/printers/PRINTERNAME\"."));
- return;
- }
+ if (auth_info)
+ {
+ if (job->attrs->prev)
+ job->attrs->prev->next = auth_info->next;
+ else
+ job->attrs->attrs = auth_info->next;
- /*
- * Do we have a valid printer name?
- */
+ if (job->attrs->last == auth_info)
+ job->attrs->last = job->attrs->prev;
- if (!validate_name(resource + 10))
+ _ippFreeAttr(auth_info);
+ }
+ }
+
+ if ((attr = ippFindAttribute(job->attrs, "job-originating-host-name",
+ IPP_TAG_ZERO)) != NULL)
{
/*
- * No, return an error...
+ * Request contains a job-originating-host-name attribute; validate it...
*/
- send_ipp_status(con, IPP_BAD_REQUEST,
+ if (attr->value_tag != IPP_TAG_NAME ||
+ attr->num_values != 1 ||
+ strcmp(con->http.hostname, "localhost"))
+ {
+ /*
+ * Can't override the value if we aren't connected via localhost.
+ * Also, we can only have 1 value and it must be a name value.
+ */
+
+ switch (attr->value_tag)
+ {
+ case IPP_TAG_STRING :
+ case IPP_TAG_TEXTLANG :
+ case IPP_TAG_NAMELANG :
+ case IPP_TAG_TEXT :
+ case IPP_TAG_NAME :
+ case IPP_TAG_KEYWORD :
+ case IPP_TAG_URI :
+ case IPP_TAG_URISCHEME :
+ case IPP_TAG_CHARSET :
+ case IPP_TAG_LANGUAGE :
+ case IPP_TAG_MIMETYPE :
+ /*
+ * Free old strings...
+ */
+
+ for (i = 0; i < attr->num_values; i ++)
+ {
+ _cupsStrFree(attr->values[i].string.text);
+ attr->values[i].string.text = NULL;
+ if (attr->values[i].string.charset)
+ {
+ _cupsStrFree(attr->values[i].string.charset);
+ attr->values[i].string.charset = NULL;
+ }
+ }
+
+ default :
+ break;
+ }
+
+ /*
+ * Use the default connection hostname instead...
+ */
+
+ attr->value_tag = IPP_TAG_NAME;
+ attr->num_values = 1;
+ attr->values[0].string.text = _cupsStrAlloc(con->http.hostname);
+ }
+
+ attr->group_tag = IPP_TAG_JOB;
+ }
+ else
+ {
+ /*
+ * No job-originating-host-name attribute, so use the hostname from
+ * the connection...
+ */
+
+ ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME,
+ "job-originating-host-name", NULL, con->http.hostname);
+ }
+
+ ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER, "time-at-creation",
+ time(NULL));
+ attr = ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER,
+ "time-at-processing", 0);
+ attr->value_tag = IPP_TAG_NOVALUE;
+ attr = ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER,
+ "time-at-completed", 0);
+ attr->value_tag = IPP_TAG_NOVALUE;
+
+ /*
+ * Add remaining job attributes...
+ */
+
+ ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-id", job->id);
+ job->state = ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_ENUM,
+ "job-state", IPP_JOB_STOPPED);
+ job->state_value = (ipp_jstate_t)job->state->values[0].integer;
+ job->sheets = ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER,
+ "job-media-sheets-completed", 0);
+ ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_URI, "job-printer-uri", NULL,
+ printer->uri);
+ ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
+ title);
+
+ if ((attr = ippFindAttribute(job->attrs, "job-k-octets",
+ IPP_TAG_INTEGER)) != NULL)
+ attr->values[0].integer = 0;
+ else
+ attr = ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER,
+ "job-k-octets", 0);
+
+ if ((attr = ippFindAttribute(job->attrs, "job-hold-until",
+ IPP_TAG_KEYWORD)) == NULL)
+ attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
+ if (!attr)
+ {
+ if ((val = cupsGetOption("job-hold-until", printer->num_options,
+ printer->options)) == NULL)
+ val = "no-hold";
+
+ attr = ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_KEYWORD,
+ "job-hold-until", NULL, val);
+ }
+ if (attr && strcmp(attr->values[0].string.text, "no-hold") &&
+ !(printer->type & CUPS_PRINTER_REMOTE))
+ {
+ /*
+ * Hold job until specified time...
+ */
+
+ cupsdSetJobHoldUntil(job, attr->values[0].string.text);
+
+ job->state->values[0].integer = IPP_JOB_HELD;
+ job->state_value = IPP_JOB_HELD;
+ }
+ else if (job->attrs->request.op.operation_id == IPP_CREATE_JOB)
+ {
+ job->hold_until = time(NULL) + 60;
+ job->state->values[0].integer = IPP_JOB_HELD;
+ job->state_value = IPP_JOB_HELD;
+ }
+ else
+ {
+ job->state->values[0].integer = IPP_JOB_PENDING;
+ job->state_value = IPP_JOB_PENDING;
+ }
+
+ if (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)) ||
+ Classification)
+ {
+ /*
+ * Add job sheets options...
+ */
+
+ if ((attr = ippFindAttribute(job->attrs, "job-sheets",
+ IPP_TAG_ZERO)) == NULL)
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Adding default job-sheets values \"%s,%s\"...",
+ printer->job_sheets[0], printer->job_sheets[1]);
+
+ attr = ippAddStrings(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME, "job-sheets",
+ 2, NULL, NULL);
+ attr->values[0].string.text = _cupsStrAlloc(printer->job_sheets[0]);
+ attr->values[1].string.text = _cupsStrAlloc(printer->job_sheets[1]);
+ }
+
+ job->job_sheets = attr;
+
+ /*
+ * Enforce classification level if set...
+ */
+
+ if (Classification)
+ {
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Classification=\"%s\", ClassifyOverride=%d",
+ Classification ? Classification : "(null)",
+ ClassifyOverride);
+
+ if (ClassifyOverride)
+ {
+ if (!strcmp(attr->values[0].string.text, "none") &&
+ (attr->num_values == 1 ||
+ !strcmp(attr->values[1].string.text, "none")))
+ {
+ /*
+ * Force the leading banner to have the classification on it...
+ */
+
+ cupsdSetString(&attr->values[0].string.text, Classification);
+
+ cupsdLogMessage(CUPSD_LOG_NOTICE, "[Job %d] CLASSIFICATION FORCED "
+ "job-sheets=\"%s,none\", "
+ "job-originating-user-name=\"%s\"",
+ job->id, Classification, job->username);
+ }
+ else if (attr->num_values == 2 &&
+ strcmp(attr->values[0].string.text,
+ attr->values[1].string.text) &&
+ strcmp(attr->values[0].string.text, "none") &&
+ strcmp(attr->values[1].string.text, "none"))
+ {
+ /*
+ * Can't put two different security markings on the same document!
+ */
+
+ cupsdSetString(&attr->values[1].string.text, attr->values[0].string.text);
+
+ cupsdLogMessage(CUPSD_LOG_NOTICE, "[Job %d] CLASSIFICATION FORCED "
+ "job-sheets=\"%s,%s\", "
+ "job-originating-user-name=\"%s\"",
+ job->id, attr->values[0].string.text,
+ attr->values[1].string.text, job->username);
+ }
+ else if (strcmp(attr->values[0].string.text, Classification) &&
+ strcmp(attr->values[0].string.text, "none") &&
+ (attr->num_values == 1 ||
+ (strcmp(attr->values[1].string.text, Classification) &&
+ strcmp(attr->values[1].string.text, "none"))))
+ {
+ if (attr->num_values == 1)
+ cupsdLogMessage(CUPSD_LOG_NOTICE,
+ "[Job %d] CLASSIFICATION OVERRIDDEN "
+ "job-sheets=\"%s\", "
+ "job-originating-user-name=\"%s\"",
+ job->id, attr->values[0].string.text, job->username);
+ else
+ cupsdLogMessage(CUPSD_LOG_NOTICE,
+ "[Job %d] CLASSIFICATION OVERRIDDEN "
+ "job-sheets=\"%s,%s\",fffff "
+ "job-originating-user-name=\"%s\"",
+ job->id, attr->values[0].string.text,
+ attr->values[1].string.text, job->username);
+ }
+ }
+ else if (strcmp(attr->values[0].string.text, Classification) &&
+ (attr->num_values == 1 ||
+ strcmp(attr->values[1].string.text, Classification)))
+ {
+ /*
+ * Force the banner to have the classification on it...
+ */
+
+ if (attr->num_values > 1 &&
+ !strcmp(attr->values[0].string.text, attr->values[1].string.text))
+ {
+ cupsdSetString(&(attr->values[0].string.text), Classification);
+ cupsdSetString(&(attr->values[1].string.text), Classification);
+ }
+ else
+ {
+ if (attr->num_values == 1 ||
+ strcmp(attr->values[0].string.text, "none"))
+ cupsdSetString(&(attr->values[0].string.text), Classification);
+
+ if (attr->num_values > 1 &&
+ strcmp(attr->values[1].string.text, "none"))
+ cupsdSetString(&(attr->values[1].string.text), Classification);
+ }
+
+ if (attr->num_values > 1)
+ cupsdLogMessage(CUPSD_LOG_NOTICE,
+ "[Job %d] CLASSIFICATION FORCED "
+ "job-sheets=\"%s,%s\", "
+ "job-originating-user-name=\"%s\"",
+ job->id, attr->values[0].string.text,
+ attr->values[1].string.text, job->username);
+ else
+ cupsdLogMessage(CUPSD_LOG_NOTICE,
+ "[Job %d] CLASSIFICATION FORCED "
+ "job-sheets=\"%s\", "
+ "job-originating-user-name=\"%s\"",
+ job->id, Classification, job->username);
+ }
+ }
+
+ /*
+ * See if we need to add the starting sheet...
+ */
+
+ if (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)))
+ {
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "[Job %d] Adding start banner page \"%s\".",
+ job->id, attr->values[0].string.text);
+
+ kbytes = copy_banner(con, job, attr->values[0].string.text);
+
+ cupsdUpdateQuota(printer, job->username, 0, kbytes);
+ }
+ }
+ else if ((attr = ippFindAttribute(job->attrs, "job-sheets",
+ IPP_TAG_ZERO)) != NULL)
+ job->sheets = attr;
+
+ /*
+ * Fill in the response info...
+ */
+
+ snprintf(job_uri, sizeof(job_uri), "http://%s:%d/jobs/%d", ServerName,
+ LocalPort, job->id);
+
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI, "job-uri", NULL,
+ job_uri);
+
+ ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-id", job->id);
+
+ ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_ENUM, "job-state",
+ job->state_value);
+ add_job_state_reasons(con, job);
+
+ con->response->request.status.status_code = IPP_OK;
+
+ /*
+ * Add any job subscriptions...
+ */
+
+ add_job_subscriptions(con, job);
+
+ /*
+ * Set all but the first two attributes to the job attributes group...
+ */
+
+ for (attr = job->attrs->attrs->next->next; attr; attr = attr->next)
+ attr->group_tag = IPP_TAG_JOB;
+
+ /*
+ * Fire the "job created" event...
+ */
+
+ cupsdAddEvent(CUPSD_EVENT_JOB_CREATED, printer, job, "Job created.");
+
+ /*
+ * Return the new job...
+ */
+
+ return (job);
+}
+
+
+/*
+ * 'add_job_state_reasons()' - Add the "job-state-reasons" attribute based
+ * upon the job and printer state...
+ */
+
+static void
+add_job_state_reasons(
+ cupsd_client_t *con, /* I - Client connection */
+ cupsd_job_t *job) /* I - Job info */
+{
+ cupsd_printer_t *dest; /* Destination printer */
+
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job_state_reasons(%p[%d], %d)",
+ con, con->http.fd, job ? job->id : 0);
+
+ switch (job ? job->state_value : IPP_JOB_CANCELED)
+ {
+ case IPP_JOB_PENDING :
+ dest = cupsdFindDest(job->dest);
+
+ if (dest && dest->state == IPP_PRINTER_STOPPED)
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
+ "job-state-reasons", NULL, "printer-stopped");
+ else
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
+ "job-state-reasons", NULL, "none");
+ break;
+
+ case IPP_JOB_HELD :
+ if (ippFindAttribute(job->attrs, "job-hold-until",
+ IPP_TAG_KEYWORD) != NULL ||
+ ippFindAttribute(job->attrs, "job-hold-until",
+ IPP_TAG_NAME) != NULL)
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
+ "job-state-reasons", NULL, "job-hold-until-specified");
+ else
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
+ "job-state-reasons", NULL, "job-incoming");
+ break;
+
+ case IPP_JOB_PROCESSING :
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
+ "job-state-reasons", NULL, "job-printing");
+ break;
+
+ case IPP_JOB_STOPPED :
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
+ "job-state-reasons", NULL, "job-stopped");
+ break;
+
+ case IPP_JOB_CANCELED :
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
+ "job-state-reasons", NULL, "job-canceled-by-user");
+ break;
+
+ case IPP_JOB_ABORTED :
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
+ "job-state-reasons", NULL, "aborted-by-system");
+ break;
+
+ case IPP_JOB_COMPLETED :
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
+ "job-state-reasons", NULL, "job-completed-successfully");
+ break;
+ }
+}
+
+
+/*
+ * 'add_job_subscriptions()' - Add any subcriptions for a job.
+ */
+
+static void
+add_job_subscriptions(
+ cupsd_client_t *con, /* I - Client connection */
+ cupsd_job_t *job) /* I - Newly created job */
+{
+ int i; /* Looping var */
+ ipp_attribute_t *prev, /* Previous attribute */
+ *next, /* Next attribute */
+ *attr; /* Current attribute */
+ cupsd_subscription_t *sub; /* Subscription object */
+ const char *recipient, /* notify-recipient-uri */
+ *pullmethod; /* notify-pull-method */
+ ipp_attribute_t *user_data; /* notify-user-data */
+ int interval; /* notify-time-interval */
+ unsigned mask; /* notify-events */
+
+
+ /*
+ * Find the first subscription group attribute; return if we have
+ * none...
+ */
+
+ for (attr = job->attrs->attrs, prev = NULL;
+ attr;
+ prev = attr, attr = attr->next)
+ if (attr->group_tag == IPP_TAG_SUBSCRIPTION)
+ break;
+
+ if (!attr)
+ return;
+
+ /*
+ * Process the subscription attributes in the request...
+ */
+
+ while (attr)
+ {
+ recipient = NULL;
+ pullmethod = NULL;
+ user_data = NULL;
+ interval = 0;
+ mask = CUPSD_EVENT_NONE;
+
+ while (attr && attr->group_tag != IPP_TAG_ZERO)
+ {
+ if (!strcmp(attr->name, "notify-recipient-uri") &&
+ attr->value_tag == IPP_TAG_URI)
+ recipient = attr->values[0].string.text;
+ else if (!strcmp(attr->name, "notify-pull-method") &&
+ attr->value_tag == IPP_TAG_KEYWORD)
+ pullmethod = attr->values[0].string.text;
+ else if (!strcmp(attr->name, "notify-charset") &&
+ attr->value_tag == IPP_TAG_CHARSET &&
+ strcmp(attr->values[0].string.text, "us-ascii") &&
+ strcmp(attr->values[0].string.text, "utf-8"))
+ {
+ send_ipp_status(con, IPP_CHARSET,
+ _("Character set \"%s\" not supported!"),
+ attr->values[0].string.text);
+ return;
+ }
+ else if (!strcmp(attr->name, "notify-natural-language") &&
+ (attr->value_tag != IPP_TAG_LANGUAGE ||
+ strcmp(attr->values[0].string.text, DefaultLanguage)))
+ {
+ send_ipp_status(con, IPP_CHARSET,
+ _("Language \"%s\" not supported!"),
+ attr->values[0].string.text);
+ return;
+ }
+ else if (!strcmp(attr->name, "notify-user-data") &&
+ attr->value_tag == IPP_TAG_STRING)
+ {
+ if (attr->num_values > 1 || attr->values[0].unknown.length > 63)
+ {
+ send_ipp_status(con, IPP_REQUEST_VALUE,
+ _("The notify-user-data value is too large "
+ "(%d > 63 octets)!"),
+ attr->values[0].unknown.length);
+ return;
+ }
+
+ user_data = attr;
+ }
+ else if (!strcmp(attr->name, "notify-events") &&
+ attr->value_tag == IPP_TAG_KEYWORD)
+ {
+ for (i = 0; i < attr->num_values; i ++)
+ mask |= cupsdEventValue(attr->values[i].string.text);
+ }
+ else if (!strcmp(attr->name, "notify-lease-duration"))
+ {
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("The notify-lease-duration attribute cannot be "
+ "used with job subscriptions."));
+ return;
+ }
+ else if (!strcmp(attr->name, "notify-time-interval") &&
+ attr->value_tag == IPP_TAG_INTEGER)
+ interval = attr->values[0].integer;
+
+ attr = attr->next;
+ }
+
+ if (!recipient && !pullmethod)
+ break;
+
+ if (mask == CUPSD_EVENT_NONE)
+ mask = CUPSD_EVENT_JOB_COMPLETED;
+
+ sub = cupsdAddSubscription(mask, cupsdFindDest(job->dest), job, recipient,
+ 0);
+
+ sub->interval = interval;
+
+ cupsdSetString(&sub->owner, job->username);
+
+ if (user_data)
+ {
+ sub->user_data_len = user_data->values[0].unknown.length;
+ memcpy(sub->user_data, user_data->values[0].unknown.data,
+ sub->user_data_len);
+ }
+
+ ippAddSeparator(con->response);
+ ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
+ "notify-subscription-id", sub->id);
+
+ if (attr)
+ attr = attr->next;
+ }
+
+ cupsdSaveAllSubscriptions();
+
+ /*
+ * Remove all of the subscription attributes from the job request...
+ */
+
+ for (attr = job->attrs->attrs, prev = NULL; attr; attr = next)
+ {
+ next = attr->next;
+
+ if (attr->group_tag == IPP_TAG_SUBSCRIPTION ||
+ attr->group_tag == IPP_TAG_ZERO)
+ {
+ /*
+ * Free and remove this attribute...
+ */
+
+ _ippFreeAttr(attr);
+
+ if (prev)
+ prev->next = next;
+ else
+ job->attrs->attrs = next;
+ }
+ else
+ prev = attr;
+ }
+
+ job->attrs->last = prev;
+ job->attrs->current = prev;
+}
+
+
+/*
+ * 'add_job_uuid()' - Add job-uuid attribute to a job.
+ *
+ * See RFC 4122 for the definition of UUIDs and the format.
+ */
+
+static void
+add_job_uuid(cupsd_client_t *con, /* I - Client connection */
+ cupsd_job_t *job) /* I - Job */
+{
+ char uuid[1024]; /* job-uuid string */
+ _cups_md5_state_t md5state; /* MD5 state */
+ unsigned char md5sum[16]; /* MD5 digest/sum */
+
+
+ /*
+ * First see if the job already has a job-uuid attribute; if so, return...
+ */
+
+ if (ippFindAttribute(job->attrs, "job-uuid", IPP_TAG_URI))
+ return;
+
+ /*
+ * No job-uuid attribute, so build a version 3 UUID with the local job
+ * ID at the end; see RFC 4122 for details. Start with the MD5 sum of
+ * the ServerName, server name and port that the client connected to,
+ * and local job ID...
+ */
+
+ snprintf(uuid, sizeof(uuid), "%s:%s:%d:%d", ServerName, con->servername,
+ con->serverport, job->id);
+
+ _cupsMD5Init(&md5state);
+ _cupsMD5Append(&md5state, (unsigned char *)uuid, strlen(uuid));
+ _cupsMD5Finish(&md5state, md5sum);
+
+ /*
+ * Format the UUID URI using the MD5 sum and job ID.
+ */
+
+ snprintf(uuid, sizeof(uuid),
+ "urn:uuid:%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-"
+ "%02x%02x%02x%02x%02x%02x",
+ md5sum[0], md5sum[1], md5sum[2], md5sum[3], md5sum[4], md5sum[5],
+ (md5sum[6] & 15) | 0x30, md5sum[7], (md5sum[8] & 0x3f) | 0x40,
+ md5sum[9], md5sum[10], md5sum[11], md5sum[12], md5sum[13],
+ md5sum[14], md5sum[15]);
+
+ ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_URI, "job-uuid", NULL, uuid);
+}
+
+
+/*
+ * 'add_printer()' - Add a printer to the system.
+ */
+
+static void
+add_printer(cupsd_client_t *con, /* I - Client connection */
+ ipp_attribute_t *uri) /* I - URI of printer */
+{
+ http_status_t status; /* Policy status */
+ int i; /* Looping var */
+ char scheme[HTTP_MAX_URI], /* Method portion of URI */
+ username[HTTP_MAX_URI], /* Username portion of URI */
+ host[HTTP_MAX_URI], /* Host portion of URI */
+ resource[HTTP_MAX_URI]; /* Resource portion of URI */
+ int port; /* Port portion of URI */
+ cupsd_printer_t *printer; /* Printer/class */
+ ipp_attribute_t *attr; /* Printer attribute */
+ cups_file_t *fp; /* Script/PPD file */
+ char line[1024]; /* Line from file... */
+ char srcfile[1024], /* Source Script/PPD file */
+ dstfile[1024]; /* Destination Script/PPD file */
+ int modify; /* Non-zero if we are modifying */
+ char newname[IPP_MAX_NAME]; /* New printer name */
+ int need_restart_job; /* Need to restart job? */
+ int set_device_uri, /* Did we set the device URI? */
+ set_port_monitor; /* Did we set the port monitor? */
+
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_printer(%p[%d], %s)", con,
+ con->http.fd, uri->values[0].string.text);
+
+ /*
+ * Do we have a valid URI?
+ */
+
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, scheme,
+ sizeof(scheme), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
+
+ if (strncmp(resource, "/printers/", 10) || strlen(resource) == 10)
+ {
+ /*
+ * No, return an error...
+ */
+
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("The printer-uri must be of the form "
+ "\"ipp://HOSTNAME/printers/PRINTERNAME\"."));
+ return;
+ }
+
+ /*
+ * Do we have a valid printer name?
+ */
+
+ if (!validate_name(resource + 10))
+ {
+ /*
+ * No, return an error...
+ */
+
+ send_ipp_status(con, IPP_BAD_REQUEST,
_("The printer-uri \"%s\" contains invalid characters."),
uri->values[0].string.text);
return;
if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, NULL);
return;
}
*/
if ((printer = cupsdFindClass(resource + 10)) != NULL &&
- !(printer->type & CUPS_PRINTER_REMOTE))
+ !(printer->type & CUPS_PRINTER_DISCOVERED))
{
/*
* Yes, return an error...
if (ImplicitAnyClasses)
{
- cupsArrayRemove(Printers, printer);
- cupsdSetStringf(&printer->name, "Any%s", resource + 10);
- cupsArrayAdd(Printers, printer);
+ snprintf(newname, sizeof(newname), "Any%s", resource + 10);
+ cupsdRenamePrinter(printer, newname);
}
else
cupsdDeletePrinter(printer, 1);
printer = cupsdAddPrinter(resource + 10);
modify = 0;
}
- else if (printer->type & CUPS_PRINTER_REMOTE)
+ else if (printer->type & CUPS_PRINTER_DISCOVERED)
{
/*
* Rename the remote printer to "Printer@server"...
*/
- cupsdDeletePrinterFilters(printer);
- cupsArrayRemove(Printers, printer);
- cupsdSetStringf(&printer->name, "%s@%s", resource + 10, printer->hostname);
- cupsdSetPrinterAttrs(printer);
- cupsArrayAdd(Printers, printer);
+ snprintf(newname, sizeof(newname), "%s@%s", resource + 10,
+ printer->hostname);
+ cupsdRenamePrinter(printer, newname);
/*
* Add the printer as a new local printer...
* Look for attributes and copy them over as needed...
*/
- if ((attr = ippFindAttribute(con->request, "printer-location", IPP_TAG_TEXT)) != NULL)
+ need_restart_job = 0;
+
+ if ((attr = ippFindAttribute(con->request, "printer-location",
+ IPP_TAG_TEXT)) != NULL)
cupsdSetString(&printer->location, attr->values[0].string.text);
- if ((attr = ippFindAttribute(con->request, "printer-info", IPP_TAG_TEXT)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-info",
+ IPP_TAG_TEXT)) != NULL)
cupsdSetString(&printer->info, attr->values[0].string.text);
- if ((attr = ippFindAttribute(con->request, "device-uri", IPP_TAG_URI)) != NULL)
+ set_device_uri = 0;
+
+ if ((attr = ippFindAttribute(con->request, "device-uri",
+ IPP_TAG_URI)) != NULL)
{
/*
* Do we have a valid device URI?
*/
- httpSeparateURI(attr->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ need_restart_job = 1;
+
+ httpSeparateURI(HTTP_URI_CODING_ALL, attr->values[0].string.text, scheme,
+ sizeof(scheme), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
- if (!strcmp(method, "file"))
+ if (!strcmp(scheme, "file"))
{
/*
* See if the administrator has enabled file devices...
* See if the backend exists and is executable...
*/
- snprintf(srcfile, sizeof(srcfile), "%s/backend/%s", ServerBin, method);
+ snprintf(srcfile, sizeof(srcfile), "%s/backend/%s", ServerBin, scheme);
if (access(srcfile, X_OK))
{
/*
sizeof(resource)));
cupsdSetString(&printer->device_uri, attr->values[0].string.text);
+ set_device_uri = 1;
}
- if ((attr = ippFindAttribute(con->request, "port-monitor", IPP_TAG_KEYWORD)) != NULL)
+ set_port_monitor = 0;
+
+ if ((attr = ippFindAttribute(con->request, "port-monitor",
+ IPP_TAG_NAME)) != NULL)
{
ipp_attribute_t *supported; /* port-monitor-supported attribute */
+ need_restart_job = 1;
+
supported = ippFindAttribute(printer->attrs, "port-monitor-supported",
IPP_TAG_KEYWORD);
for (i = 0; i < supported->num_values; i ++)
cupsdLogMessage(CUPSD_LOG_INFO,
"Setting %s port-monitor to \"%s\" (was \"%s\".)",
printer->name, attr->values[0].string.text,
- printer->port_monitor);
+ printer->port_monitor ? printer->port_monitor : "none");
if (strcmp(attr->values[0].string.text, "none"))
cupsdSetString(&printer->port_monitor, attr->values[0].string.text);
else
cupsdClearString(&printer->port_monitor);
+
+ set_port_monitor = 1;
}
- if ((attr = ippFindAttribute(con->request, "printer-is-accepting-jobs", IPP_TAG_BOOLEAN)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-is-accepting-jobs",
+ IPP_TAG_BOOLEAN)) != NULL)
{
cupsdLogMessage(CUPSD_LOG_INFO,
"Setting %s printer-is-accepting-jobs to %d (was %d.)",
cupsdAddPrinterHistory(printer);
}
- if ((attr = ippFindAttribute(con->request, "printer-is-shared", IPP_TAG_BOOLEAN)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-is-shared",
+ IPP_TAG_BOOLEAN)) != NULL)
{
if (printer->shared && !attr->values[0].boolean)
- cupsdSendBrowseDelete(printer);
+ cupsdDeregisterPrinter(printer, 1);
cupsdLogMessage(CUPSD_LOG_INFO,
"Setting %s printer-is-shared to %d (was %d.)",
printer->shared = attr->values[0].boolean;
}
- if ((attr = ippFindAttribute(con->request, "printer-state", IPP_TAG_ENUM)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-state",
+ IPP_TAG_ENUM)) != NULL)
{
if (attr->values[0].integer != IPP_PRINTER_IDLE &&
attr->values[0].integer != IPP_PRINTER_STOPPED)
return;
}
- cupsdLogMessage(CUPSD_LOG_INFO, "Setting %s printer-state to %d (was %d.)", printer->name,
- attr->values[0].integer, printer->state);
+ cupsdLogMessage(CUPSD_LOG_INFO, "Setting %s printer-state to %d (was %d.)",
+ printer->name, attr->values[0].integer, printer->state);
if (attr->values[0].integer == IPP_PRINTER_STOPPED)
cupsdStopPrinter(printer, 0);
else
+ {
+ need_restart_job = 1;
cupsdSetPrinterState(printer, (ipp_pstate_t)(attr->values[0].integer), 0);
+ }
}
- if ((attr = ippFindAttribute(con->request, "printer-state-message", IPP_TAG_TEXT)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-state-message",
+ IPP_TAG_TEXT)) != NULL)
{
strlcpy(printer->state_message, attr->values[0].string.text,
sizeof(printer->state_message));
cupsdAddPrinterHistory(printer);
}
- if ((attr = ippFindAttribute(con->request, "job-sheets-default", IPP_TAG_ZERO)) != NULL &&
- !Classification)
- {
- cupsdSetString(&printer->job_sheets[0], attr->values[0].string.text);
- if (attr->num_values > 1)
- cupsdSetString(&printer->job_sheets[1], attr->values[1].string.text);
- else
- cupsdSetString(&printer->job_sheets[1], "none");
- }
- if ((attr = ippFindAttribute(con->request, "requesting-user-name-allowed",
- IPP_TAG_ZERO)) != NULL)
- {
- cupsdFreePrinterUsers(printer);
-
- printer->deny_users = 0;
- if (attr->value_tag == IPP_TAG_NAME &&
- (attr->num_values > 1 ||
- strcmp(attr->values[0].string.text, "all") != 0))
- for (i = 0; i < attr->num_values; i ++)
- cupsdAddPrinterUser(printer, attr->values[i].string.text);
- }
- else if ((attr = ippFindAttribute(con->request, "requesting-user-name-denied",
- IPP_TAG_ZERO)) != NULL)
- {
- cupsdFreePrinterUsers(printer);
-
- printer->deny_users = 1;
- if (attr->value_tag == IPP_TAG_NAME &&
- (attr->num_values > 1 ||
- strcmp(attr->values[0].string.text, "none") != 0))
- for (i = 0; i < attr->num_values; i ++)
- cupsdAddPrinterUser(printer, attr->values[i].string.text);
- }
- if ((attr = ippFindAttribute(con->request, "job-quota-period",
- IPP_TAG_INTEGER)) != NULL)
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG, "Setting job-quota-period to %d...",
- attr->values[0].integer);
- cupsdFreeQuotas(printer);
- printer->quota_period = attr->values[0].integer;
- }
- if ((attr = ippFindAttribute(con->request, "job-k-limit",
- IPP_TAG_INTEGER)) != NULL)
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG, "Setting job-k-limit to %d...",
- attr->values[0].integer);
- cupsdFreeQuotas(printer);
- printer->k_limit = attr->values[0].integer;
- }
- if ((attr = ippFindAttribute(con->request, "job-page-limit",
- IPP_TAG_INTEGER)) != NULL)
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG, "Setting job-page-limit to %d...",
- attr->values[0].integer);
- cupsdFreeQuotas(printer);
- printer->page_limit = attr->values[0].integer;
- }
- if ((attr = ippFindAttribute(con->request, "printer-op-policy",
- IPP_TAG_NAME)) != NULL)
- {
- cupsd_policy_t *p; /* Policy */
-
- if ((p = cupsdFindPolicy(attr->values[0].string.text)) != NULL)
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "Setting printer-op-policy to \"%s\"...",
- attr->values[0].string.text);
- cupsdSetString(&printer->op_policy, attr->values[0].string.text);
- printer->op_policy_ptr = p;
- }
- else
- {
- send_ipp_status(con, IPP_NOT_POSSIBLE,
- _("Unknown printer-op-policy \"%s\"."),
- attr->values[0].string.text);
- return;
- }
- }
- if ((attr = ippFindAttribute(con->request, "printer-error-policy",
- IPP_TAG_NAME)) != NULL)
- {
- if (strcmp(attr->values[0].string.text, "abort-job") &&
- strcmp(attr->values[0].string.text, "retry-job") &&
- strcmp(attr->values[0].string.text, "stop-printer"))
- {
- send_ipp_status(con, IPP_NOT_POSSIBLE,
- _("Unknown printer-error-policy \"%s\"."),
- attr->values[0].string.text);
- return;
- }
+ set_printer_defaults(con, printer);
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "Setting printer-error-policy to \"%s\"...",
- attr->values[0].string.text);
- cupsdSetString(&printer->error_policy, attr->values[0].string.text);
- }
+ if ((attr = ippFindAttribute(con->request, "auth-info-required",
+ IPP_TAG_KEYWORD)) != NULL)
+ cupsdSetAuthInfoRequired(printer, NULL, attr);
/*
* See if we have all required attributes...
*/
if (!printer->device_uri)
- cupsdSetString(&printer->device_uri, "file:/dev/null");
+ cupsdSetString(&printer->device_uri, "file:///dev/null");
/*
* See if we have an interface script or PPD file attached to the request...
if (con->filename)
{
+ need_restart_job = 1;
+
strlcpy(srcfile, con->filename, sizeof(srcfile));
- if ((fp = cupsFileOpen(srcfile, "rb")) != NULL)
+ if ((fp = cupsFileOpen(srcfile, "rb")))
{
/*
* Yes; get the first line from it...
}
}
}
- else if ((attr = ippFindAttribute(con->request, "ppd-name", IPP_TAG_NAME)) != NULL)
+ else if ((attr = ippFindAttribute(con->request, "ppd-name",
+ IPP_TAG_NAME)) != NULL)
{
+ need_restart_job = 1;
+
if (!strcmp(attr->values[0].string.text, "raw"))
{
/*
}
/*
- * Make this printer the default if there is none...
+ * If we set the device URI but not the port monitor, check which port
+ * monitor to use by default...
*/
- if (DefaultPrinter == NULL)
- DefaultPrinter = printer;
+ if (set_device_uri && !set_port_monitor)
+ {
+ ppd_file_t *ppd; /* PPD file */
+ ppd_attr_t *ppdattr; /* cupsPortMonitor attribute */
+
+
+ httpSeparateURI(HTTP_URI_CODING_ALL, printer->device_uri, scheme,
+ sizeof(scheme), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
+
+ snprintf(srcfile, sizeof(srcfile), "%s/ppd/%s.ppd", ServerRoot,
+ printer->name);
+ if ((ppd = ppdOpenFile(srcfile)) != NULL)
+ {
+ for (ppdattr = ppdFindAttr(ppd, "cupsPortMonitor", NULL);
+ ppdattr;
+ ppdattr = ppdFindNextAttr(ppd, "cupsPortMonitor", NULL))
+ if (!strcmp(scheme, ppdattr->spec))
+ {
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Setting %s port-monitor to \"%s\" (was \"%s\".)",
+ printer->name, ppdattr->value,
+ printer->port_monitor ? printer->port_monitor
+ : "none");
+
+ if (strcmp(ppdattr->value, "none"))
+ cupsdSetString(&printer->port_monitor, ppdattr->value);
+ else
+ cupsdClearString(&printer->port_monitor);
+
+ break;
+ }
+
+ ppdClose(ppd);
+ }
+ }
/*
* Update the printer attributes and return...
cupsdSetPrinterAttrs(printer);
cupsdSaveAllPrinters();
- if (printer->job != NULL)
+ if (need_restart_job && printer->job)
{
cupsd_job_t *job;
job = (cupsd_job_t *)printer->job;
cupsdStopJob(job, 1);
+
job->state->values[0].integer = IPP_JOB_PENDING;
+ job->state_value = IPP_JOB_PENDING;
}
- cupsdCheckJobs();
+ if (need_restart_job)
+ cupsdCheckJobs();
cupsdWritePrintcap();
{
cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED, printer, NULL,
"Printer \"%s\" modified by \"%s\".", printer->name,
- con->username);
+ get_username(con));
cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" modified by \"%s\".",
- printer->name, con->username);
+ printer->name, get_username(con));
}
else
{
cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED, printer, NULL,
"New printer \"%s\" added by \"%s\".", printer->name,
- con->username);
+ get_username(con));
cupsdLogMessage(CUPSD_LOG_INFO, "New printer \"%s\" added by \"%s\".",
- printer->name, con->username);
+ printer->name, get_username(con));
}
con->response->request.status.status_code = IPP_OK;
}
+/*
+ * 'apply_printer_defaults()' - Apply printer default options to a job.
+ */
+
+static void
+apply_printer_defaults(
+ cupsd_printer_t *printer, /* I - Printer */
+ cupsd_job_t *job) /* I - Job */
+{
+ int i, /* Looping var */
+ num_options; /* Number of default options */
+ cups_option_t *options, /* Default options */
+ *option; /* Current option */
+
+
+ /*
+ * Collect all of the default options and add the missing ones to the
+ * job object...
+ */
+
+ for (i = printer->num_options, num_options = 0, option = printer->options;
+ i > 0;
+ i --, option ++)
+ if (!ippFindAttribute(job->attrs, option->name, IPP_TAG_ZERO))
+ {
+ num_options = cupsAddOption(option->name, option->value, num_options,
+ &options);
+ }
+
+ /*
+ * Encode these options as attributes in the job object...
+ */
+
+ cupsEncodeOptions2(job->attrs, num_options, options, IPP_TAG_JOB);
+ cupsFreeOptions(num_options, options);
+}
+
+
/*
* 'authenticate_job()' - Set job authentication info.
*/
authenticate_job(cupsd_client_t *con, /* I - Client connection */
ipp_attribute_t *uri) /* I - Job URI */
{
- ipp_attribute_t *attr; /* Job-id attribute */
+ ipp_attribute_t *attr, /* job-id attribute */
+ *auth_info; /* auth-info attribute */
int jobid; /* Job ID */
cupsd_job_t *job; /* Current job */
char method[HTTP_MAX_URI],
* Got a printer URI; see if we also have a job-id attribute...
*/
- if ((attr = ippFindAttribute(con->request, "job-id", IPP_TAG_INTEGER)) == NULL)
+ if ((attr = ippFindAttribute(con->request, "job-id",
+ IPP_TAG_INTEGER)) == NULL)
{
send_ipp_status(con, IPP_BAD_REQUEST,
_("Got a printer-uri attribute but no job-id!"));
* Got a job URI; parse it to get the job ID...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
-
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
+
if (strncmp(resource, "/jobs/", 6))
{
/*
* See if the job has been completed...
*/
- if (job->state->values[0].integer != IPP_JOB_HELD)
+ if (job->state_value != IPP_JOB_HELD)
{
/*
* Return a "not-possible" error...
* See if we have already authenticated...
*/
- if (!con->username[0])
+ auth_info = ippFindAttribute(con->request, "auth-info", IPP_TAG_TEXT);
+
+ if (!con->username[0] && !auth_info)
{
- send_ipp_status(con, IPP_NOT_AUTHORIZED,
- _("No authentication information provided!"));
+ cupsd_printer_t *printer; /* Job destination */
+
+
+ /*
+ * No auth data. If we need to authenticate via Kerberos, send a
+ * HTTP auth challenge, otherwise just return an IPP error...
+ */
+
+ printer = cupsdFindDest(job->dest);
+
+ if (printer && printer->num_auth_info_required > 0 &&
+ !strcmp(printer->auth_info_required[0], "negotiate"))
+ send_http_error(con, HTTP_UNAUTHORIZED, printer);
+ else
+ send_ipp_status(con, IPP_NOT_AUTHORIZED,
+ _("No authentication information provided!"));
return;
}
if (!validate_user(job, con, job->username, username, sizeof(username)))
{
- send_ipp_status(con, IPP_FORBIDDEN,
- _("You are not authorized to authenticate "
- "job #%d owned by \"%s\"!"),
- jobid, job->username);
+ send_http_error(con, HTTP_UNAUTHORIZED, NULL);
return;
}
* Save the authentication information for this job...
*/
- save_auth_info(con, job);
+ save_auth_info(con, job, auth_info);
/*
* Reset the job-hold-until value to "no-hold"...
*/
- if ((attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_KEYWORD)) == NULL)
+ if ((attr = ippFindAttribute(job->attrs, "job-hold-until",
+ IPP_TAG_KEYWORD)) == NULL)
attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
- if (attr != NULL)
+ if (attr)
{
attr->value_tag = IPP_TAG_KEYWORD;
cupsdSetString(&(attr->values[0].string.text), "no-hold");
cupsdReleaseJob(job);
- cupsdLogMessage(CUPSD_LOG_INFO, "Job %d was authenticated by \"%s\".", jobid,
+ cupsdLogMessage(CUPSD_LOG_INFO, "[Job %d] Authenticated by \"%s\".", jobid,
con->username);
}
ipp_attribute_t *uri) /* I - Job or Printer URI */
{
http_status_t status; /* Policy status */
- const char *dest; /* Destination */
cups_ptype_t dtype; /* Destination type */
- char method[HTTP_MAX_URI], /* Method portion of URI */
+ char scheme[HTTP_MAX_URI], /* Scheme portion of URI */
userpass[HTTP_MAX_URI], /* Username portion of URI */
- host[HTTP_MAX_URI], /* Host portion of URI */
+ hostname[HTTP_MAX_URI], /* Host portion of URI */
resource[HTTP_MAX_URI]; /* Resource portion of URI */
int port; /* Port portion of URI */
ipp_attribute_t *attr; /* Attribute in request */
* "my-jobs" is specified...
*/
- if ((attr = ippFindAttribute(con->request, "my-jobs", IPP_TAG_BOOLEAN)) != NULL &&
+ if ((attr = ippFindAttribute(con->request, "my-jobs",
+ IPP_TAG_BOOLEAN)) != NULL &&
attr->values[0].boolean)
{
- if ((attr = ippFindAttribute(con->request, "requesting-user-name", IPP_TAG_NAME)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "requesting-user-name",
+ IPP_TAG_NAME)) != NULL)
username = attr->values[0].string.text;
else
{
* Look for the "purge-jobs" attribute...
*/
- if ((attr = ippFindAttribute(con->request, "purge-jobs", IPP_TAG_BOOLEAN)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "purge-jobs",
+ IPP_TAG_BOOLEAN)) != NULL)
purge = attr->values[0].boolean;
else
purge = 1;
* And if the destination is valid...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- userpass, sizeof(userpass), host, sizeof(host), &port,
- resource, sizeof(resource));
-
- if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
+ if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer))
{
/*
* Bad URI?
*/
- if (!strncmp(resource, "/printers/", 10) ||
- !strncmp(resource, "/classes/", 9))
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text,
+ scheme, sizeof(scheme), userpass, sizeof(userpass),
+ hostname, sizeof(hostname), &port,
+ resource, sizeof(resource));
+
+ if ((!strncmp(resource, "/printers/", 10) && resource[10]) ||
+ (!strncmp(resource, "/classes/", 9) && resource[9]))
{
send_ipp_status(con, IPP_NOT_FOUND,
_("The printer or class was not found."));
return;
}
- else if (strcmp(resource, "/printers/"))
- {
- send_ipp_status(con, IPP_NOT_FOUND,
- _("The printer-uri \"%s\" is not valid."),
- uri->values[0].string.text);
- return;
- }
/*
* Check policy...
if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, NULL);
return;
}
cupsdCancelJobs(NULL, username, purge);
cupsdLogMessage(CUPSD_LOG_INFO, "All jobs were %s by \"%s\".",
- purge ? "purged" : "cancelled", con->username);
+ purge ? "purged" : "canceled", get_username(con));
}
else
{
* Check policy...
*/
- if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
+ if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con,
+ NULL)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, printer);
return;
}
* Cancel all of the jobs on the named printer...
*/
- cupsdCancelJobs(dest, username, purge);
+ cupsdCancelJobs(printer->name, username, purge);
cupsdLogMessage(CUPSD_LOG_INFO, "All jobs on \"%s\" were %s by \"%s\".",
- dest, purge ? "purged" : "cancelled", con->username);
+ printer->name, purge ? "purged" : "canceled",
+ get_username(con));
}
con->response->request.status.status_code = IPP_OK;
{
ipp_attribute_t *attr; /* Current attribute */
int jobid; /* Job ID */
- char method[HTTP_MAX_URI], /* Method portion of URI */
+ char scheme[HTTP_MAX_URI], /* Scheme portion of URI */
username[HTTP_MAX_URI], /* Username portion of URI */
host[HTTP_MAX_URI], /* Host portion of URI */
resource[HTTP_MAX_URI]; /* Resource portion of URI */
int port; /* Port portion of URI */
cupsd_job_t *job; /* Job information */
- const char *dest; /* Destination */
- cups_ptype_t dtype; /* Destination type (printer or class) */
+ cups_ptype_t dtype; /* Destination type (printer/class) */
cupsd_printer_t *printer; /* Printer data */
* Got a printer URI; see if we also have a job-id attribute...
*/
- if ((attr = ippFindAttribute(con->request, "job-id", IPP_TAG_INTEGER)) == NULL)
+ if ((attr = ippFindAttribute(con->request, "job-id",
+ IPP_TAG_INTEGER)) == NULL)
{
send_ipp_status(con, IPP_BAD_REQUEST,
_("Got a printer-uri attribute but no job-id!"));
* Find the current job on the specified printer...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
-
- if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
+ if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer))
{
/*
* Bad URI...
/*
* No, see if there are any pending jobs...
*/
-
+
for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
job;
job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
- if (job->state->values[0].integer <= IPP_JOB_PROCESSING &&
- !strcasecmp(job->dest, dest))
+ if (job->state_value <= IPP_JOB_PROCESSING &&
+ !strcasecmp(job->dest, printer->name))
break;
- if (job != NULL)
+ if (job)
jobid = job->id;
else
{
- send_ipp_status(con, IPP_NOT_POSSIBLE, _("No active jobs on %s!"),
- dest);
- return;
+ for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
+ job;
+ job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
+ if (job->state_value == IPP_JOB_STOPPED &&
+ !strcasecmp(job->dest, printer->name))
+ break;
+
+ if (job)
+ jobid = job->id;
+ else
+ {
+ send_ipp_status(con, IPP_NOT_POSSIBLE, _("No active jobs on %s!"),
+ printer->name);
+ return;
+ }
}
}
}
* Got a job URI; parse it to get the job ID...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
-
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, scheme,
+ sizeof(scheme), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
+
if (strncmp(resource, "/jobs/", 6))
{
/*
if (!validate_user(job, con, job->username, username, sizeof(username)))
{
- send_ipp_status(con, IPP_FORBIDDEN,
- _("You are not authorized to delete job #%d "
- "owned by \"%s\"!"),
- jobid, job->username);
+ send_http_error(con, HTTP_UNAUTHORIZED, NULL);
return;
}
/*
- * See if the job is already completed, cancelled, or aborted; if so,
+ * See if the job is already completed, canceled, or aborted; if so,
* we can't cancel...
*/
- if (job->state->values[0].integer >= IPP_JOB_CANCELLED)
+ if (job->state_value >= IPP_JOB_CANCELED)
{
- send_ipp_status(con, IPP_NOT_POSSIBLE,
- _("Job #%d is already %s - can\'t cancel."), jobid,
- job->state->values[0].integer == IPP_JOB_CANCELLED ? "cancelled" :
- job->state->values[0].integer == IPP_JOB_ABORTED ? "aborted" :
- "completed");
+ switch (job->state_value)
+ {
+ case IPP_JOB_CANCELED :
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("Job #%d is already canceled - can\'t cancel."),
+ jobid);
+ break;
+
+ case IPP_JOB_ABORTED :
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("Job #%d is already aborted - can\'t cancel."),
+ jobid);
+ break;
+
+ default :
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("Job #%d is already completed - can\'t cancel."),
+ jobid);
+ break;
+ }
+
return;
}
* Cancel the job and return...
*/
- cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, job->printer, job,
- "Job cancelled by \"%s\".", username);
-
- cupsdCancelJob(job, 0);
+ cupsdCancelJob(job, 0, IPP_JOB_CANCELED);
cupsdCheckJobs();
- cupsdLogMessage(CUPSD_LOG_INFO, "Job %d was cancelled by \"%s\".", jobid,
+ cupsdLogMessage(CUPSD_LOG_INFO, "[Job %d] Canceled by \"%s\".", jobid,
username);
con->response->request.status.status_code = IPP_OK;
cupsd_client_t *con, /* I - Client connection */
int sub_id) /* I - Subscription ID */
{
+ http_status_t status; /* Policy status */
+ cupsd_subscription_t *sub; /* Subscription */
+
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG2,
+ "cancel_subscription(con=%p[%d], sub_id=%d)",
+ con, con->http.fd, sub_id);
+
+ /*
+ * Is the subscription ID valid?
+ */
+
+ if ((sub = cupsdFindSubscription(sub_id)) == NULL)
+ {
+ /*
+ * Bad subscription ID...
+ */
+
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("notify-subscription-id %d no good!"), sub_id);
+ return;
+ }
+
+ /*
+ * Check policy...
+ */
+
+ if ((status = cupsdCheckPolicy(sub->dest ? sub->dest->op_policy_ptr :
+ DefaultPolicyPtr,
+ con, sub->owner)) != HTTP_OK)
+ {
+ send_http_error(con, status, sub->dest);
+ return;
+ }
+
+ /*
+ * Cancel the subscription...
+ */
+
+ cupsdDeleteSubscription(sub, 1);
+
+ con->response->request.status.status_code = IPP_OK;
}
cupsd_printer_t *p) /* I - Printer or class */
{
int i; /* Looping var */
- ipp_attribute_t *attr; /* Current attribute */
char username[33]; /* Username */
cupsd_quota_t *q; /* Quota data */
+#ifdef HAVE_MBR_UID_TO_UUID
+ /*
+ * Use Apple membership APIs which require that all names represent
+ * valid user account or group records accessible by the server.
+ */
+
+ uuid_t usr_uuid; /* UUID for job requesting user */
+ uuid_t usr2_uuid; /* UUID for ACL user name entry */
+ uuid_t grp_uuid; /* UUID for ACL group name entry */
+ int mbr_err; /* Error from membership function */
+ int is_member; /* Is this user a member? */
+#else
+ /*
+ * Use standard POSIX APIs for checking users and groups...
+ */
+
struct passwd *pw; /* User password data */
+#endif /* HAVE_MBR_UID_TO_UUID */
cupsdLogMessage(CUPSD_LOG_DEBUG2, "check_quotas(%p[%d], %p[%s])",
* Check input...
*/
- if (con == NULL || p == NULL)
+ if (!con || !p)
return (0);
/*
* Figure out who is printing...
*/
- attr = ippFindAttribute(con->request, "requesting-user-name", IPP_TAG_NAME);
-
- if (con->username[0])
- strlcpy(username, con->username, sizeof(username));
- else if (attr != NULL)
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "check_quotas: requesting-user-name = \"%s\"",
- attr->values[0].string.text);
-
- strlcpy(username, attr->values[0].string.text, sizeof(username));
- }
- else
- strcpy(username, "anonymous");
+ strlcpy(username, get_username(con), sizeof(username));
/*
* Check global active job limits for printers and users...
if (p->num_users)
{
+#ifdef HAVE_MBR_UID_TO_UUID
+ /*
+ * Get UUID for job requesting user...
+ */
+
+ if (mbr_user_name_to_uuid((char *)username, usr_uuid))
+ {
+ /*
+ * Unknown user...
+ */
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "check_quotas: UUID lookup failed for user \"%s\"",
+ username);
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Denying user \"%s\" access to printer \"%s\" "
+ "(unknown user)...",
+ username, p->name);
+ return (0);
+ }
+#else
+ /*
+ * Get UID and GID of requesting user...
+ */
+
pw = getpwnam(username);
endpwent();
+#endif /* HAVE_MBR_UID_TO_UUID */
for (i = 0; i < p->num_users; i ++)
if (p->users[i][0] == '@')
* Check group membership...
*/
- if (cupsdCheckGroup(username, pw, p->users[i] + 1))
- break;
+#ifdef HAVE_MBR_UID_TO_UUID
+ if ((mbr_err = mbr_group_name_to_uuid((char *)p->users[i] + 1,
+ grp_uuid)) != 0)
+ {
+ /*
+ * Invalid ACL entries are ignored for matching; just record a
+ * warning in the log...
+ */
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "check_quotas: UUID lookup failed for ACL entry "
+ "\"%s\" (err=%d)", p->users[i], mbr_err);
+ cupsdLogMessage(CUPSD_LOG_WARN,
+ "Access control entry \"%s\" not a valid group name; "
+ "entry ignored", p->users[i]);
+ }
+ else
+ {
+ if ((mbr_err = mbr_check_membership(usr_uuid, grp_uuid,
+ &is_member)) != 0)
+ {
+ /*
+ * At this point, there should be no errors, but check anyways...
+ */
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "check_quotas: group \"%s\" membership check "
+ "failed (err=%d)", p->users[i] + 1, mbr_err);
+ is_member = 0;
+ }
+
+ /*
+ * Stop if we found a match...
+ */
+
+ if (is_member)
+ break;
+ }
+#else
+ if (cupsdCheckGroup(username, pw, p->users[i] + 1))
+ break;
+#endif /* HAVE_MBR_UID_TO_UUID */
+ }
+#ifdef HAVE_MBR_UID_TO_UUID
+ else
+ {
+ if ((mbr_err = mbr_user_name_to_uuid((char *)p->users[i],
+ usr2_uuid)) != 0)
+ {
+ /*
+ * Invalid ACL entries are ignored for matching; just record a
+ * warning in the log...
+ */
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "check_quotas: UUID lookup failed for ACL entry "
+ "\"%s\" (err=%d)", p->users[i], mbr_err);
+ cupsdLogMessage(CUPSD_LOG_WARN,
+ "Access control entry \"%s\" not a valid user name; "
+ "entry ignored", p->users[i]);
+ }
+ else
+ {
+ if ((mbr_err = mbr_check_membership(usr_uuid, usr2_uuid,
+ &is_member)) != 0)
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "check_quotas: User \"%s\" identity check failed "
+ "(err=%d)", p->users[i], mbr_err);
+ is_member = 0;
+ }
+
+ if (is_member)
+ break;
+ }
}
+#else
else if (!strcasecmp(username, p->users[i]))
break;
+#endif /* HAVE_MBR_UID_TO_UUID */
if ((i < p->num_users) == p->deny_users)
{
* Check quotas...
*/
+#ifdef __APPLE__
+ if (AppleQuotas && (q = cupsdFindQuota(p, username)) != NULL)
+ {
+ /*
+ * TODO: Define these special page count values as constants!
+ */
+
+ if (q->page_count == -4) /* special case: unlimited user */
+ {
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "User \"%s\" request approved for printer %s (%s): "
+ "unlimited quota.",
+ username, p->name, p->info);
+ q->page_count = 0; /* allow user to print */
+ return (1);
+ }
+ else if (q->page_count == -3) /* quota exceeded */
+ {
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "User \"%s\" request denied for printer %s (%s): "
+ "quota limit exceeded.",
+ username, p->name, p->info);
+ q->page_count = 2; /* force quota exceeded failure */
+ return (-1);
+ }
+ else if (q->page_count == -2) /* quota disabled for user */
+ {
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "User \"%s\" request denied for printer %s (%s): "
+ "printing disabled for user.",
+ username, p->name, p->info);
+ q->page_count = 2; /* force quota exceeded failure */
+ return (-1);
+ }
+ else if (q->page_count == -1) /* quota access error */
+ {
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "User \"%s\" request denied for printer %s (%s): "
+ "unable to determine quota limit.",
+ username, p->name, p->info);
+ q->page_count = 2; /* force quota exceeded failure */
+ return (-1);
+ }
+ else if (q->page_count < 0) /* user not found or other error */
+ {
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "User \"%s\" request denied for printer %s (%s): "
+ "user disabled / missing quota.",
+ username, p->name, p->info);
+ q->page_count = 2; /* force quota exceeded failure */
+ return (-1);
+ }
+ else /* page within user limits */
+ {
+ q->page_count = 0; /* allow user to print */
+ return (1);
+ }
+ }
+ else
+#endif /* __APPLE__ */
if (p->k_limit || p->page_limit)
{
if ((q = cupsdUpdateQuota(p, username, 0, 0)) == NULL)
cupsdLogMessage(CUPSD_LOG_ERROR,
"Unable to allocate quota data for user \"%s\"!",
username);
- return (0);
+ return (-1);
}
if ((q->k_count >= p->k_limit && p->k_limit) ||
{
cupsdLogMessage(CUPSD_LOG_INFO, "User \"%s\" is over the quota limit...",
username);
- return (0);
+ return (-1);
}
}
else
{
for (i = 0; i < attr->num_values; i ++)
- toattr->values[i].string.text = strdup(attr->values[i].string.text);
+ toattr->values[i].string.text =
+ _cupsStrAlloc(attr->values[i].string.text);
}
break;
{
if (!i)
toattr->values[i].string.charset =
- strdup(attr->values[i].string.charset);
+ _cupsStrAlloc(attr->values[i].string.charset);
else
toattr->values[i].string.charset =
toattr->values[0].string.charset;
- toattr->values[i].string.text = strdup(attr->values[i].string.text);
+ toattr->values[i].string.text =
+ _cupsStrAlloc(attr->values[i].string.text);
}
}
break;
if (toattr->values[i].unknown.length > 0)
{
- if ((toattr->values[i].unknown.data = malloc(toattr->values[i].unknown.length)) == NULL)
+ if ((toattr->values[i].unknown.data =
+ malloc(toattr->values[i].unknown.length)) == NULL)
toattr->values[i].unknown.length = 0;
else
memcpy(toattr->values[i].unknown.data,
*/
static void
-copy_attrs(ipp_t *to, /* I - Destination request */
- ipp_t *from, /* I - Source request */
- ipp_attribute_t *req, /* I - Requested attributes */
- ipp_tag_t group, /* I - Group to copy */
- int quickcopy) /* I - Do a quick copy? */
+copy_attrs(ipp_t *to, /* I - Destination request */
+ ipp_t *from, /* I - Source request */
+ cups_array_t *ra, /* I - Requested attributes */
+ ipp_tag_t group, /* I - Group to copy */
+ int quickcopy) /* I - Do a quick copy? */
{
- int i; /* Looping var */
ipp_attribute_t *fromattr; /* Source attribute */
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_attrs(%p, %p, %p, %x)", to, from,
- req, group);
+ cupsdLogMessage(CUPSD_LOG_DEBUG2,
+ "copy_attrs(to=%p, from=%p, ra=%p, group=%x, quickcopy=%d)",
+ to, from, ra, group, quickcopy);
- if (to == NULL || from == NULL)
+ if (!to || !from)
return;
- if (req != NULL && strcmp(req->values[0].string.text, "all") == 0)
- req = NULL; /* "all" means no filter... */
-
- for (fromattr = from->attrs; fromattr != NULL; fromattr = fromattr->next)
+ for (fromattr = from->attrs; fromattr; fromattr = fromattr->next)
{
/*
* Filter attributes as needed...
*/
- if (group != IPP_TAG_ZERO && fromattr->group_tag != group &&
- fromattr->group_tag != IPP_TAG_ZERO)
+ if ((group != IPP_TAG_ZERO && fromattr->group_tag != group &&
+ fromattr->group_tag != IPP_TAG_ZERO) || !fromattr->name)
continue;
- if (req != NULL && fromattr->name != NULL)
- {
- for (i = 0; i < req->num_values; i ++)
- if (strcmp(fromattr->name, req->values[i].string.text) == 0)
- break;
-
- if (i == req->num_values)
- continue;
- }
-
- copy_attribute(to, fromattr, quickcopy);
+ if (!ra || cupsArrayFind(ra, fromattr->name))
+ copy_attribute(to, fromattr, quickcopy);
}
}
cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_banner(%p[%d], %p[%d], %s)",
- con, con->http.fd, job, job->id, name ? name : "(null)");
+ con, con ? con->http.fd : -1, job, job->id,
+ name ? name : "(null)");
/*
* Find the banner; return if not found or "none"...
*/
- if (name == NULL ||
- strcmp(name, "none") == 0 ||
+ if (!name || !strcmp(name, "none") ||
(banner = cupsdFindBanner(name)) == NULL)
return (0);
* Try the localized banner file under the subdirectory...
*/
- strlcpy(attrname, con->request->attrs->next->values[0].string.text,
+ strlcpy(attrname, job->attrs->attrs->next->values[0].string.text,
sizeof(attrname));
if (strlen(attrname) > 2 && attrname[2] == '-')
{
else
s = attrname;
- if (strcmp(s, "printer-name") == 0)
+ if (!strcmp(s, "printer-name"))
{
cupsFilePuts(out, job->dest);
continue;
{
case IPP_TAG_INTEGER :
case IPP_TAG_ENUM :
- if (strncmp(s, "time-at-", 8) == 0)
+ if (!strncmp(s, "time-at-", 8))
cupsFilePuts(out, cupsdGetDateTime(attr->values[i].integer));
else
cupsFilePrintf(out, "%d", attr->values[i].integer);
case IPP_TAG_KEYWORD :
case IPP_TAG_CHARSET :
case IPP_TAG_LANGUAGE :
- if (strcasecmp(banner->filetype->type, "postscript") == 0)
+ if (!strcasecmp(banner->filetype->type, "postscript"))
{
/*
* Need to quote strings for PS banners...
kbytes = (cupsFileTell(out) + 1023) / 1024;
- if ((attr = ippFindAttribute(job->attrs, "job-k-octets", IPP_TAG_INTEGER)) != NULL)
+ if ((attr = ippFindAttribute(job->attrs, "job-k-octets",
+ IPP_TAG_INTEGER)) != NULL)
attr->values[0].integer += kbytes;
cupsFileClose(out);
const char *from, /* I - Source file */
const char *to) /* I - Destination file */
{
- fd_set *input; /* select() input set */
+ fd_set input; /* select() input set */
struct timeval timeout; /* select() timeout */
- int maxfd; /* Maximum file descriptor for select() */
+ int maxfd; /* Max file descriptor for select() */
char tempfile[1024]; /* Temporary PPD file */
int tempfd; /* Temporary PPD file descriptor */
int temppid; /* Process ID of cups-driverd */
int temppipe[2]; /* Temporary pipes */
char *argv[4], /* Command-line arguments */
- *envp[100]; /* Environment */
+ *envp[MAX_ENV]; /* Environment */
cups_file_t *src, /* Source file */
*dst; /* Destination file */
+ ppd_file_t *ppd; /* PPD file */
int bytes, /* Bytes from pipe */
total; /* Total bytes from pipe */
- char buffer[2048], /* Copy buffer */
- *ptr; /* Pointer into buffer */
+ char buffer[2048]; /* Copy buffer */
int i; /* Looping var */
char option[PPD_MAX_NAME], /* Option name */
choice[PPD_MAX_NAME]; /* Choice name */
int num_defaults; /* Number of default options */
- ppd_default_t *defaults; /* Default options */
+ cups_option_t *defaults; /* Default options */
char cups_protocol[PPD_MAX_LINE];
/* cupsProtocol attribute */
int have_letter, /* Have Letter size */
cupsdOpenPipe(temppipe);
- if ((input = calloc(1, SetSize)) == NULL)
- {
- close(tempfd);
- unlink(tempfile);
-
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "copy_model: Unable to allocate %d bytes for select()...",
- SetSize);
- return (-1);
- }
-
cupsdLogMessage(CUPSD_LOG_DEBUG,
"copy_model: Running \"cups-driverd cat %s\"...", from);
if (!cupsdStartProcess(buffer, argv, envp, -1, temppipe[1], CGIPipes[1],
- -1, 0, &temppid))
+ -1, -1, 0, &temppid))
{
close(tempfd);
unlink(tempfile);
bytes = 0;
- FD_SET(temppipe[0], input);
- FD_SET(CGIPipes[0], input);
+ FD_ZERO(&input);
+ FD_SET(temppipe[0], &input);
+ FD_SET(CGIPipes[0], &input);
timeout.tv_sec = 30;
timeout.tv_usec = 0;
- if ((i = select(maxfd, input, NULL, NULL, &timeout)) < 0)
+ if ((i = select(maxfd, &input, NULL, NULL, &timeout)) < 0)
{
if (errno == EINTR)
continue;
break;
}
- if (FD_ISSET(temppipe[0], input))
+ if (FD_ISSET(temppipe[0], &input))
{
/*
* Read the PPD file from the pipe, and write it to the PPD file.
break;
}
- if (FD_ISSET(CGIPipes[0], input))
+ if (FD_ISSET(CGIPipes[0], &input))
cupsdUpdateCGI();
}
* Read the source file and see what page sizes are supported...
*/
- if ((src = cupsFileOpen(tempfile, "rb")) == NULL)
+ if ((ppd = ppdOpenFile(tempfile)) == NULL)
{
unlink(tempfile);
return (-1);
}
- have_letter = 0;
- have_a4 = 0;
-
- while (cupsFileGets(src, buffer, sizeof(buffer)) != NULL)
- if (!strncmp(buffer, "*PageSize ", 10))
- {
- /*
- * Strip UI text and command data from the end of the line...
- */
-
- if ((ptr = strchr(buffer + 10, '/')) != NULL)
- *ptr = '\0';
- if ((ptr = strchr(buffer + 10, ':')) != NULL)
- *ptr = '\0';
-
- for (ptr = buffer + 10; isspace(*ptr); ptr ++);
-
- /*
- * Look for Letter and A4 page sizes...
- */
-
- if (!strcmp(ptr, "Letter"))
- have_letter = 1;
-
- if (!strcmp(ptr, "A4"))
- have_a4 = 1;
- }
-
- cupsFileRewind(src);
+ have_letter = ppdPageSize(ppd, "Letter") != NULL;
+ have_a4 = ppdPageSize(ppd, "A4") != NULL;
/*
* Open the destination (if possible) and set the default options...
* Read all of the default lines from the old PPD...
*/
- while (cupsFileGets(dst, buffer, sizeof(buffer)) != NULL)
+ while (cupsFileGets(dst, buffer, sizeof(buffer)))
if (!strncmp(buffer, "*Default", 8))
{
/*
if (!ppd_parse_line(buffer, option, sizeof(option),
choice, sizeof(choice)))
- num_defaults = ppd_add_default(option, choice, num_defaults,
+ {
+ ppd_option_t *ppdo; /* PPD option */
+
+
+ /*
+ * Only add the default if the default hasn't already been
+ * set and the choice exists in the new PPD...
+ */
+
+ if (!cupsGetOption(option, num_defaults, defaults) &&
+ (ppdo = ppdFindOption(ppd, option)) != NULL &&
+ ppdFindChoice(ppdo, choice))
+ num_defaults = cupsAddOption(option, choice, num_defaults,
&defaults);
+ }
}
else if (!strncmp(buffer, "*cupsProtocol:", 14))
strlcpy(cups_protocol, buffer, sizeof(cups_protocol));
if ((!strcmp(system_paper, "Letter") && have_letter) ||
(!strcmp(system_paper, "A4") && have_a4))
{
- num_defaults = ppd_add_default("PageSize", system_paper,
- num_defaults, &defaults);
- num_defaults = ppd_add_default("PageRegion", system_paper,
- num_defaults, &defaults);
- num_defaults = ppd_add_default("PaperDimension", system_paper,
- num_defaults, &defaults);
- num_defaults = ppd_add_default("ImageableArea", system_paper,
- num_defaults, &defaults);
+ num_defaults = cupsAddOption("PageSize", system_paper,
+ num_defaults, &defaults);
+ num_defaults = cupsAddOption("PageRegion", system_paper,
+ num_defaults, &defaults);
+ num_defaults = cupsAddOption("PaperDimension", system_paper,
+ num_defaults, &defaults);
+ num_defaults = cupsAddOption("ImageableArea", system_paper,
+ num_defaults, &defaults);
}
}
#endif /* HAVE_LIBPAPER */
!strcasecmp(DefaultLanguage, "C") ||
!strcasecmp(DefaultLanguage, "POSIX") ||
!strcasecmp(DefaultLanguage, "en") ||
+ !strncasecmp(DefaultLanguage, "en.", 3) ||
!strncasecmp(DefaultLanguage, "en_US", 5) ||
!strncasecmp(DefaultLanguage, "en_CA", 5) ||
!strncasecmp(DefaultLanguage, "fr_CA", 5))
if (have_letter)
{
- num_defaults = ppd_add_default("PageSize", "Letter", num_defaults,
- &defaults);
- num_defaults = ppd_add_default("PageRegion", "Letter", num_defaults,
- &defaults);
- num_defaults = ppd_add_default("PaperDimension", "Letter", num_defaults,
- &defaults);
- num_defaults = ppd_add_default("ImageableArea", "Letter", num_defaults,
- &defaults);
+ num_defaults = cupsAddOption("PageSize", "Letter", num_defaults,
+ &defaults);
+ num_defaults = cupsAddOption("PageRegion", "Letter", num_defaults,
+ &defaults);
+ num_defaults = cupsAddOption("PaperDimension", "Letter", num_defaults,
+ &defaults);
+ num_defaults = cupsAddOption("ImageableArea", "Letter", num_defaults,
+ &defaults);
}
}
else if (have_a4)
* The rest default to "a4" size...
*/
- num_defaults = ppd_add_default("PageSize", "A4", num_defaults,
- &defaults);
- num_defaults = ppd_add_default("PageRegion", "A4", num_defaults,
- &defaults);
- num_defaults = ppd_add_default("PaperDimension", "A4", num_defaults,
- &defaults);
- num_defaults = ppd_add_default("ImageableArea", "A4", num_defaults,
- &defaults);
+ num_defaults = cupsAddOption("PageSize", "A4", num_defaults,
+ &defaults);
+ num_defaults = cupsAddOption("PageRegion", "A4", num_defaults,
+ &defaults);
+ num_defaults = cupsAddOption("PaperDimension", "A4", num_defaults,
+ &defaults);
+ num_defaults = cupsAddOption("ImageableArea", "A4", num_defaults,
+ &defaults);
}
}
+ ppdClose(ppd);
+
+ /*
+ * Open the source file for a copy...
+ */
+
+ if ((src = cupsFileOpen(tempfile, "rb")) == NULL)
+ {
+ cupsFreeOptions(num_defaults, defaults);
+ unlink(tempfile);
+ return (-1);
+ }
+
/*
* Open the destination file for a copy...
*/
if ((dst = cupsFileOpen(to, "wb")) == NULL)
{
- if (num_defaults > 0)
- free(defaults);
-
+ cupsFreeOptions(num_defaults, defaults);
cupsFileClose(src);
unlink(tempfile);
return (-1);
* Copy the source file to the destination...
*/
- while (cupsFileGets(src, buffer, sizeof(buffer)) != NULL)
+ while (cupsFileGets(src, buffer, sizeof(buffer)))
{
if (!strncmp(buffer, "*Default", 8))
{
if (!ppd_parse_line(buffer, option, sizeof(option),
choice, sizeof(choice)))
{
- for (i = 0; i < num_defaults; i ++)
- if (!strcmp(option, defaults[i].option))
- {
- /*
- * Substitute the previous choice...
- */
+ const char *val; /* Default option value */
- snprintf(buffer, sizeof(buffer), "*Default%s: %s", option,
- defaults[i].choice);
- break;
- }
+
+ if ((val = cupsGetOption(option, num_defaults, defaults)) != NULL)
+ {
+ /*
+ * Substitute the previous choice...
+ */
+
+ snprintf(buffer, sizeof(buffer), "*Default%s: %s", option, val);
+ }
}
}
if (cups_protocol[0])
cupsFilePrintf(dst, "%s\n", cups_protocol);
- if (num_defaults > 0)
- free(defaults);
+ cupsFreeOptions(num_defaults, defaults);
/*
* Close both files and return...
/*
- * 'copy_subscription_attrs()' - Copy subscription attributes.
- */
-
-static void
-copy_subscription_attrs(
- cupsd_client_t *con, /* I - Client connection */
- cupsd_subscription_t *sub, /* I - Subscription */
- cups_array_t *ra) /* I - Requested attributes array */
-{
- ipp_attribute_t *attr; /* Current attribute */
- char printer_uri[HTTP_MAX_URI];
- /* Printer URI */
- int count; /* Number of events */
- unsigned mask; /* Current event mask */
- const char *name; /* Current event name */
-
-
- /*
- * Copy the subscription attributes to the response using the
- * requested-attributes attribute that may be provided by the client.
- */
-
- if (!ra || cupsArrayFind(ra, "notify-subscription-id"))
- ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
- "notify-subscription-id", sub->id);
-
- if (!ra || cupsArrayFind(ra, "notify-events"))
- {
- if ((name = cupsdEventName((cupsd_eventmask_t)sub->mask)) != NULL)
- {
- /*
- * Simple event list...
- */
-
- ippAddString(con->response, IPP_TAG_SUBSCRIPTION,
- IPP_TAG_KEYWORD | IPP_TAG_COPY,
- "notify-events", NULL, name);
- }
- else
- {
- /*
- * Complex event list...
- */
-
- for (mask = 1, count = 0; mask < CUPSD_EVENT_ALL; mask <<= 1)
- if (sub->mask & mask)
- count ++;
-
- attr = ippAddStrings(con->response, IPP_TAG_SUBSCRIPTION,
- IPP_TAG_KEYWORD | IPP_TAG_COPY,
- "notify-events", count, NULL, NULL);
-
- for (mask = 1, count = 0; mask < CUPSD_EVENT_ALL; mask <<= 1)
- if (sub->mask & mask)
- {
- attr->values[count].string.text =
- (char *)cupsdEventName((cupsd_eventmask_t)mask);
-
- count ++;
- }
- }
- }
-
- if (!ra || cupsArrayFind(ra, "notify-subscriber-user-name"))
- ippAddString(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_NAME,
- "notify-subscriber-user-name", NULL, sub->owner);
-
- if (sub->recipient && (!ra || cupsArrayFind(ra, "notify-recipient-uri")))
- ippAddString(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_URI,
- "notify-recipient-uri", NULL, sub->recipient);
- else if (!ra || cupsArrayFind(ra, "notify-pull-method"))
- ippAddString(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_KEYWORD,
- "notify-pull-method", NULL, "ippget");
-
- if (sub->user_data_len > 0 && (!ra || cupsArrayFind(ra, "notify-user-data")))
- ippAddOctetString(con->response, IPP_TAG_SUBSCRIPTION, "notify-user-data",
- sub->user_data, sub->user_data_len);
-
- if (!sub->job && (!ra || cupsArrayFind(ra, "notify-lease-duration")))
- ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
- "notify-lease-duration", sub->lease);
-
- if (!ra || cupsArrayFind(ra, "notify-time-interval"))
- ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
- "notify-time-interval", sub->interval);
-
- if (sub->dest && (!ra || cupsArrayFind(ra, "notify-printer-uri")))
- {
- httpAssembleURIf(printer_uri, sizeof(printer_uri), "ipp", NULL,
- con->servername, con->serverport, "/printers/%s",
- sub->dest->name);
- ippAddString(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_URI,
- "notify-printer-uri", NULL, printer_uri);
- }
-
- if (sub->job && (!ra || cupsArrayFind(ra, "notify-job-id")))
- ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
- "notify-job-id", sub->job->id);
-}
-
-
-/*
- * 'create_job()' - Print a file to a printer or class.
+ * 'copy_job_attrs()' - Copy job attributes.
*/
-static void
-create_job(cupsd_client_t *con, /* I - Client connection */
- ipp_attribute_t *uri) /* I - Printer URI */
-{
- http_status_t status; /* Policy status */
- ipp_attribute_t *attr; /* Current attribute */
- const char *dest; /* Destination */
- cups_ptype_t dtype; /* Destination type (printer or class) */
- int priority; /* Job priority */
- char *title; /* Job name/title */
- cupsd_job_t *job; /* Current job */
- char job_uri[HTTP_MAX_URI], /* Job URI */
- method[HTTP_MAX_URI], /* Method portion of URI */
- username[HTTP_MAX_URI], /* Username portion of URI */
- host[HTTP_MAX_URI], /* Host portion of URI */
- resource[HTTP_MAX_URI]; /* Resource portion of URI */
- int port; /* Port portion of URI */
- cupsd_printer_t *printer; /* Printer data */
- int kbytes; /* Size of print file */
- int i; /* Looping var */
- int lowerpagerange; /* Page range bound */
-
-
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "create_job(%p[%d], %s)", con,
- con->http.fd, uri->values[0].string.text);
-
- /*
- * Is the destination valid?
- */
-
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
-
- if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
- {
- /*
- * Bad URI...
- */
-
- send_ipp_status(con, IPP_NOT_FOUND,
- _("The printer or class was not found."));
- return;
- }
-
- /*
- * Check remote printing to non-shared printer...
- */
-
- if (!printer->shared &&
- strcasecmp(con->http.hostname, "localhost") &&
- strcasecmp(con->http.hostname, ServerName))
- {
- send_ipp_status(con, IPP_NOT_AUTHORIZED,
- _("The printer or class is not shared!"));
- return;
- }
-
- /*
- * Check policy...
- */
+static void
+copy_job_attrs(cupsd_client_t *con, /* I - Client connection */
+ cupsd_job_t *job, /* I - Job */
+ cups_array_t *ra) /* I - Requested attributes array */
+{
+ char job_uri[HTTP_MAX_URI]; /* Job URI */
- if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
- {
- send_http_error(con, status);
- return;
- }
- else if ((printer->type & CUPS_PRINTER_AUTHENTICATED) && !con->username[0])
- {
- send_http_error(con, HTTP_UNAUTHORIZED);
- return;
- }
/*
- * See if the printer is accepting jobs...
+ * Send the requested attributes for each job...
*/
- if (!printer->accepting)
- {
- send_ipp_status(con, IPP_NOT_ACCEPTING,
- _("Destination \"%s\" is not accepting jobs."),
- dest);
- return;
- }
+ httpAssembleURIf(HTTP_URI_CODING_ALL, job_uri, sizeof(job_uri), "ipp", NULL,
+ con->servername, con->serverport, "/jobs/%d",
+ job->id);
- /*
- * Validate job template attributes; for now just copies and page-ranges...
- */
+ if (!ra || cupsArrayFind(ra, "job-more-info"))
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI,
+ "job-more-info", NULL, job_uri);
- if ((attr = ippFindAttribute(con->request, "copies", IPP_TAG_INTEGER)) != NULL)
- {
- if (attr->values[0].integer < 1 || attr->values[0].integer > MaxCopies)
- {
- send_ipp_status(con, IPP_ATTRIBUTES, _("Bad copies value %d."),
- attr->values[0].integer);
- ippAddInteger(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_INTEGER,
- "copies", attr->values[0].integer);
- return;
- }
- }
+ if (job->state_value > IPP_JOB_PROCESSING &&
+ (!ra || cupsArrayFind(ra, "job-preserved")))
+ ippAddBoolean(con->response, IPP_TAG_JOB, "job-preserved",
+ job->num_files > 0);
- if ((attr = ippFindAttribute(con->request, "page-ranges", IPP_TAG_RANGE)) != NULL)
- {
- for (i = 0, lowerpagerange = 1; i < attr->num_values; i ++)
- {
- if (attr->values[i].range.lower < lowerpagerange ||
- attr->values[i].range.lower > attr->values[i].range.upper)
- {
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("Bad page-ranges values %d-%d."),
- attr->values[i].range.lower,
- attr->values[i].range.upper);
- return;
- }
+ if (!ra || cupsArrayFind(ra, "job-printer-up-time"))
+ ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER,
+ "job-printer-up-time", time(NULL));
- lowerpagerange = attr->values[i].range.upper + 1;
- }
- }
+ if (!ra || cupsArrayFind(ra, "job-state-reasons"))
+ add_job_state_reasons(con, job);
- /*
- * Make sure we aren't over our limit...
- */
+ if (!ra || cupsArrayFind(ra, "job-uri"))
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI,
+ "job-uri", NULL, job_uri);
- if (cupsArrayCount(Jobs) >= MaxJobs && MaxJobs)
- cupsdCleanJobs();
+ copy_attrs(con->response, job->attrs, ra, IPP_TAG_JOB, 0);
+}
- if (cupsArrayCount(Jobs) >= MaxJobs && MaxJobs)
- {
- send_ipp_status(con, IPP_NOT_POSSIBLE,
- _("Too many active jobs."));
- return;
- }
- if (!check_quotas(con, printer))
- {
- send_ipp_status(con, IPP_NOT_POSSIBLE, _("Quota limit reached."));
- return;
- }
+/*
+ * 'copy_printer_attrs()' - Copy printer attributes.
+ */
+
+static void
+copy_printer_attrs(
+ cupsd_client_t *con, /* I - Client connection */
+ cupsd_printer_t *printer, /* I - Printer */
+ cups_array_t *ra) /* I - Requested attributes array */
+{
+ char printer_uri[HTTP_MAX_URI];
+ /* Printer URI */
+ time_t curtime; /* Current time */
+ int i; /* Looping var */
+ ipp_attribute_t *history; /* History collection */
+
/*
- * Create the job and set things up...
+ * Copy the printer attributes to the response using requested-attributes
+ * and document-format attributes that may be provided by the client.
*/
- if ((attr = ippFindAttribute(con->request, "job-priority", IPP_TAG_INTEGER)) != NULL)
- priority = attr->values[0].integer;
- else
- ippAddInteger(con->request, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-priority",
- priority = 50);
+ curtime = time(NULL);
- if ((attr = ippFindAttribute(con->request, "job-name", IPP_TAG_NAME)) != NULL)
- title = attr->values[0].string.text;
- else
- ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
- title = "Untitled");
+#ifdef __APPLE__
+ if ((!ra || cupsArrayFind(ra, "com.apple.print.recoverable-message")) &&
+ printer->recoverable)
+ ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_TEXT,
+ "com.apple.print.recoverable-message", NULL,
+ printer->recoverable);
+#endif /* __APPLE__ */
- if ((job = cupsdAddJob(priority, printer->name)) == NULL)
- {
- send_ipp_status(con, IPP_INTERNAL_ERROR,
- _("Unable to add job for destination \"%s\"!"), dest);
- return;
- }
+ if (printer->alert && (!ra || cupsArrayFind(ra, "printer-alert")))
+ ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_STRING,
+ "printer-alert", NULL, printer->alert);
- job->dtype = dtype;
- job->attrs = con->request;
- con->request = NULL;
+ if (printer->alert_description &&
+ (!ra || cupsArrayFind(ra, "printer-alert-description")))
+ ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_TEXT,
+ "printer-alert-description", NULL,
+ printer->alert_description);
- attr = ippFindAttribute(job->attrs, "requesting-user-name", IPP_TAG_NAME);
+ if (!ra || cupsArrayFind(ra, "printer-current-time"))
+ ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
+ ippTimeToDate(curtime));
- if (con->username[0])
- {
- cupsdSetString(&job->username, con->username);
+ if (!ra || cupsArrayFind(ra, "printer-error-policy"))
+ ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
+ "printer-error-policy", NULL, printer->error_policy);
- if (attr)
- cupsdSetString(&attr->values[0].string.text, con->username);
+ if (!ra || cupsArrayFind(ra, "printer-is-accepting-jobs"))
+ ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-accepting-jobs",
+ printer->accepting);
- save_auth_info(con, job);
- }
- else if (attr != NULL)
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "create_job: requesting-user-name = \"%s\"",
- attr->values[0].string.text);
+ if (!ra || cupsArrayFind(ra, "printer-is-shared"))
+ ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-shared",
+ printer->shared);
- cupsdSetString(&job->username, attr->values[0].string.text);
- }
- else
- cupsdSetString(&job->username, "anonymous");
+ if (!ra || cupsArrayFind(ra, "printer-op-policy"))
+ ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
+ "printer-op-policy", NULL, printer->op_policy);
- if (attr == NULL)
- ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME,
- "job-originating-user-name", NULL, job->username);
- else
- {
- attr->group_tag = IPP_TAG_JOB;
- cupsdSetString(&attr->name, "job-originating-user-name");
- }
+ if (!ra || cupsArrayFind(ra, "printer-state"))
+ ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-state",
+ printer->state);
- if ((attr = ippFindAttribute(job->attrs, "job-originating-host-name",
- IPP_TAG_ZERO)) != NULL)
+ if (!ra || cupsArrayFind(ra, "printer-state-change-time"))
+ ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
+ "printer-state-change-time", printer->state_time);
+
+ if (MaxPrinterHistory > 0 && printer->num_history > 0 &&
+ cupsArrayFind(ra, "printer-state-history"))
{
/*
- * Request contains a job-originating-host-name attribute; validate it...
+ * Printer history is only sent if specifically requested, so that
+ * older CUPS/IPP clients won't barf on the collection attributes.
*/
- if (attr->value_tag != IPP_TAG_NAME ||
- attr->num_values != 1 ||
- strcmp(con->http.hostname, "localhost") != 0)
- {
- /*
- * Can't override the value if we aren't connected via localhost.
- * Also, we can only have 1 value and it must be a name value.
- */
+ history = ippAddCollections(con->response, IPP_TAG_PRINTER,
+ "printer-state-history",
+ printer->num_history, NULL);
- switch (attr->value_tag)
- {
- case IPP_TAG_STRING :
- case IPP_TAG_TEXTLANG :
- case IPP_TAG_NAMELANG :
- case IPP_TAG_TEXT :
- case IPP_TAG_NAME :
- case IPP_TAG_KEYWORD :
- case IPP_TAG_URI :
- case IPP_TAG_URISCHEME :
- case IPP_TAG_CHARSET :
- case IPP_TAG_LANGUAGE :
- case IPP_TAG_MIMETYPE :
- /*
- * Free old strings...
- */
+ for (i = 0; i < printer->num_history; i ++)
+ copy_attrs(history->values[i].collection = ippNew(), printer->history[i],
+ NULL, IPP_TAG_ZERO, 0);
+ }
- for (i = 0; i < attr->num_values; i ++)
- {
- free(attr->values[i].string.text);
- attr->values[i].string.text = NULL;
- if (attr->values[i].string.charset)
- {
- free(attr->values[i].string.charset);
- attr->values[i].string.charset = NULL;
- }
- }
+ if (!ra || cupsArrayFind(ra, "printer-state-message"))
+ ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_TEXT,
+ "printer-state-message", NULL, printer->state_message);
- default :
- break;
- }
+ if (!ra || cupsArrayFind(ra, "printer-state-reasons"))
+ add_printer_state_reasons(con, printer);
- /*
- * Use the default connection hostname instead...
- */
+ if (!ra || cupsArrayFind(ra, "printer-type"))
+ {
+ int type; /* printer-type value */
- attr->value_tag = IPP_TAG_NAME;
- attr->num_values = 1;
- attr->values[0].string.text = strdup(con->http.hostname);
- }
- attr->group_tag = IPP_TAG_JOB;
- }
- else
- {
/*
- * No job-originating-host-name attribute, so use the hostname from
- * the connection...
+ * Add the CUPS-specific printer-type attribute...
*/
- ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME,
- "job-originating-host-name", NULL, con->http.hostname);
- }
+ type = printer->type;
- ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER, "time-at-creation",
- time(NULL));
- attr = ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER,
- "time-at-processing", 0);
- attr->value_tag = IPP_TAG_NOVALUE;
- attr = ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER,
- "time-at-completed", 0);
- attr->value_tag = IPP_TAG_NOVALUE;
+ if (printer == DefaultPrinter)
+ type |= CUPS_PRINTER_DEFAULT;
- /*
- * Add remaining job attributes...
- */
+ if (!printer->accepting)
+ type |= CUPS_PRINTER_REJECTING;
- ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-id", job->id);
- job->state = ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_ENUM,
- "job-state", IPP_JOB_STOPPED);
- job->sheets = ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER,
- "job-media-sheets-completed", 0);
- ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_URI, "job-printer-uri", NULL,
- printer->uri);
- ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
- title);
+ if (!printer->shared)
+ type |= CUPS_PRINTER_NOT_SHARED;
- if ((attr = ippFindAttribute(job->attrs, "job-k-octets", IPP_TAG_INTEGER)) != NULL)
- attr->values[0].integer = 0;
- else
- attr = ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER,
- "job-k-octets", 0);
+ ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-type",
+ type);
+ }
- if ((attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_KEYWORD)) == NULL)
- attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
- if (attr == NULL)
- attr = ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_KEYWORD,
- "job-hold-until", NULL, "no-hold");
- if (attr != NULL && strcmp(attr->values[0].string.text, "no-hold") != 0 &&
- !(printer->type & CUPS_PRINTER_REMOTE))
- {
- /*
- * Hold job until specified time...
- */
+ if (!ra || cupsArrayFind(ra, "printer-up-time"))
+ ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
+ "printer-up-time", curtime);
- cupsdSetJobHoldUntil(job, attr->values[0].string.text);
+ if ((!ra || cupsArrayFind(ra, "printer-uri-supported")) &&
+ !ippFindAttribute(printer->attrs, "printer-uri-supported",
+ IPP_TAG_URI))
+ {
+ httpAssembleURIf(HTTP_URI_CODING_ALL, printer_uri, sizeof(printer_uri),
+ "ipp", NULL, con->servername, con->serverport,
+ (printer->type & CUPS_PRINTER_CLASS) ?
+ "/classes/%s" : "/printers/%s", printer->name);
+ ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_URI,
+ "printer-uri-supported", NULL, printer_uri);
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "printer-uri-supported=\"%s\"",
+ printer_uri);
}
- else
- job->hold_until = time(NULL) + 60;
- job->state->values[0].integer = IPP_JOB_HELD;
+ if (!ra || cupsArrayFind(ra, "queued-job-count"))
+ add_queued_job_count(con, printer);
- if (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)) ||
- Classification)
- {
- /*
- * Add job sheets options...
- */
+ copy_attrs(con->response, printer->attrs, ra, IPP_TAG_ZERO, 0);
+ copy_attrs(con->response, CommonData, ra, IPP_TAG_ZERO, IPP_TAG_COPY);
+}
- if ((attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_ZERO)) == NULL)
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "Adding default job-sheets values \"%s,%s\"...",
- printer->job_sheets[0], printer->job_sheets[1]);
- attr = ippAddStrings(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME, "job-sheets",
- 2, NULL, NULL);
- attr->values[0].string.text = strdup(printer->job_sheets[0]);
- attr->values[1].string.text = strdup(printer->job_sheets[1]);
- }
+/*
+ * 'copy_subscription_attrs()' - Copy subscription attributes.
+ */
+
+static void
+copy_subscription_attrs(
+ cupsd_client_t *con, /* I - Client connection */
+ cupsd_subscription_t *sub, /* I - Subscription */
+ cups_array_t *ra) /* I - Requested attributes array */
+{
+ ipp_attribute_t *attr; /* Current attribute */
+ char printer_uri[HTTP_MAX_URI];
+ /* Printer URI */
+ int count; /* Number of events */
+ unsigned mask; /* Current event mask */
+ const char *name; /* Current event name */
- job->job_sheets = attr;
- /*
- * Enforce classification level if set...
- */
+ /*
+ * Copy the subscription attributes to the response using the
+ * requested-attributes attribute that may be provided by the client.
+ */
- if (Classification)
+ if (!ra || cupsArrayFind(ra, "notify-events"))
+ {
+ if ((name = cupsdEventName((cupsd_eventmask_t)sub->mask)) != NULL)
{
- cupsdLogMessage(CUPSD_LOG_INFO,
- "Classification=\"%s\", ClassifyOverride=%d",
- Classification ? Classification : "(null)",
- ClassifyOverride);
+ /*
+ * Simple event list...
+ */
- if (ClassifyOverride)
- {
- if (!strcmp(attr->values[0].string.text, "none") &&
- (attr->num_values == 1 ||
- !strcmp(attr->values[1].string.text, "none")))
- {
- /*
- * Force the leading banner to have the classification on it...
- */
+ ippAddString(con->response, IPP_TAG_SUBSCRIPTION,
+ (ipp_tag_t)(IPP_TAG_KEYWORD | IPP_TAG_COPY),
+ "notify-events", NULL, name);
+ }
+ else
+ {
+ /*
+ * Complex event list...
+ */
- cupsdSetString(&attr->values[0].string.text, Classification);
+ for (mask = 1, count = 0; mask < CUPSD_EVENT_ALL; mask <<= 1)
+ if (sub->mask & mask)
+ count ++;
- cupsdLogMessage(CUPSD_LOG_NOTICE, "[Job %d] CLASSIFICATION FORCED "
- "job-sheets=\"%s,none\", "
- "job-originating-user-name=\"%s\"",
- job->id, Classification, job->username);
- }
- else if (attr->num_values == 2 &&
- strcmp(attr->values[0].string.text, attr->values[1].string.text) != 0 &&
- strcmp(attr->values[0].string.text, "none") != 0 &&
- strcmp(attr->values[1].string.text, "none") != 0)
- {
- /*
- * Can't put two different security markings on the same document!
- */
+ attr = ippAddStrings(con->response, IPP_TAG_SUBSCRIPTION,
+ (ipp_tag_t)(IPP_TAG_KEYWORD | IPP_TAG_COPY),
+ "notify-events", count, NULL, NULL);
- cupsdSetString(&attr->values[1].string.text, attr->values[0].string.text);
+ for (mask = 1, count = 0; mask < CUPSD_EVENT_ALL; mask <<= 1)
+ if (sub->mask & mask)
+ {
+ attr->values[count].string.text =
+ (char *)cupsdEventName((cupsd_eventmask_t)mask);
- cupsdLogMessage(CUPSD_LOG_NOTICE, "[Job %d] CLASSIFICATION FORCED "
- "job-sheets=\"%s,%s\", "
- "job-originating-user-name=\"%s\"",
- job->id, attr->values[0].string.text,
- attr->values[1].string.text, job->username);
+ count ++;
}
- else if (strcmp(attr->values[0].string.text, Classification) &&
- strcmp(attr->values[0].string.text, "none") &&
- (attr->num_values == 1 ||
- (strcmp(attr->values[1].string.text, Classification) &&
- strcmp(attr->values[1].string.text, "none"))))
- {
- if (attr->num_values == 1)
- cupsdLogMessage(CUPSD_LOG_NOTICE,
- "[Job %d] CLASSIFICATION OVERRIDDEN "
- "job-sheets=\"%s\", "
- "job-originating-user-name=\"%s\"",
- job->id, attr->values[0].string.text, job->username);
- else
- cupsdLogMessage(CUPSD_LOG_NOTICE,
- "[Job %d] CLASSIFICATION OVERRIDDEN "
- "job-sheets=\"%s,%s\",fffff "
- "job-originating-user-name=\"%s\"",
- job->id, attr->values[0].string.text,
- attr->values[1].string.text, job->username);
- }
- }
- else if (strcmp(attr->values[0].string.text, Classification) != 0 &&
- (attr->num_values == 1 ||
- strcmp(attr->values[1].string.text, Classification) != 0))
- {
- /*
- * Force the banner to have the classification on it...
- */
+ }
+ }
- if (attr->num_values > 1 &&
- !strcmp(attr->values[0].string.text, attr->values[1].string.text))
- {
- cupsdSetString(&(attr->values[0].string.text), Classification);
- cupsdSetString(&(attr->values[1].string.text), Classification);
- }
- else
- {
- if (attr->num_values == 1 ||
- strcmp(attr->values[0].string.text, "none"))
- cupsdSetString(&(attr->values[0].string.text), Classification);
+ if (sub->job && (!ra || cupsArrayFind(ra, "notify-job-id")))
+ ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
+ "notify-job-id", sub->job->id);
- if (attr->num_values > 1 &&
- strcmp(attr->values[1].string.text, "none"))
- cupsdSetString(&(attr->values[1].string.text), Classification);
- }
+ if (!sub->job && (!ra || cupsArrayFind(ra, "notify-lease-duration")))
+ ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
+ "notify-lease-duration", sub->lease);
- if (attr->num_values > 1)
- cupsdLogMessage(CUPSD_LOG_NOTICE,
- "[Job %d] CLASSIFICATION FORCED "
- "job-sheets=\"%s,%s\", "
- "job-originating-user-name=\"%s\"",
- job->id, attr->values[0].string.text,
- attr->values[1].string.text, job->username);
- else
- cupsdLogMessage(CUPSD_LOG_NOTICE,
- "[Job %d] CLASSIFICATION FORCED "
- "job-sheets=\"%s\", "
- "job-originating-user-name=\"%s\"",
- job->id, Classification, job->username);
- }
- }
+ if (sub->dest && (!ra || cupsArrayFind(ra, "notify-printer-uri")))
+ {
+ httpAssembleURIf(HTTP_URI_CODING_ALL, printer_uri, sizeof(printer_uri),
+ "ipp", NULL, con->servername, con->serverport,
+ "/printers/%s", sub->dest->name);
+ ippAddString(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_URI,
+ "notify-printer-uri", NULL, printer_uri);
+ }
- /*
- * See if we need to add the starting sheet...
- */
+ if (sub->recipient && (!ra || cupsArrayFind(ra, "notify-recipient-uri")))
+ ippAddString(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_URI,
+ "notify-recipient-uri", NULL, sub->recipient);
+ else if (!ra || cupsArrayFind(ra, "notify-pull-method"))
+ ippAddString(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_KEYWORD,
+ "notify-pull-method", NULL, "ippget");
- if (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)))
- {
- cupsdLogMessage(CUPSD_LOG_INFO,
- "Adding start banner page \"%s\" to job %d.",
- attr->values[0].string.text, job->id);
+ if (!ra || cupsArrayFind(ra, "notify-subscriber-user-name"))
+ ippAddString(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_NAME,
+ "notify-subscriber-user-name", NULL, sub->owner);
- kbytes = copy_banner(con, job, attr->values[0].string.text);
+ if (!ra || cupsArrayFind(ra, "notify-subscription-id"))
+ ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
+ "notify-subscription-id", sub->id);
- cupsdUpdateQuota(printer, job->username, 0, kbytes);
- }
- }
- else if ((attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_ZERO)) != NULL)
- job->sheets = attr;
+ if (!ra || cupsArrayFind(ra, "notify-time-interval"))
+ ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
+ "notify-time-interval", sub->interval);
- /*
- * Fill in the response info...
- */
+ if (sub->user_data_len > 0 && (!ra || cupsArrayFind(ra, "notify-user-data")))
+ ippAddOctetString(con->response, IPP_TAG_SUBSCRIPTION, "notify-user-data",
+ sub->user_data, sub->user_data_len);
+}
- snprintf(job_uri, sizeof(job_uri), "http://%s:%d/jobs/%d", ServerName,
- LocalPort, job->id);
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI, "job-uri", NULL, job_uri);
+/*
+ * 'create_job()' - Print a file to a printer or class.
+ */
- ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-id", job->id);
+static void
+create_job(cupsd_client_t *con, /* I - Client connection */
+ ipp_attribute_t *uri) /* I - Printer URI */
+{
+ cupsd_printer_t *printer; /* Printer */
+ cupsd_job_t *job; /* New job */
- ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_ENUM, "job-state",
- job->state->values[0].integer);
- con->response->request.status.status_code = IPP_OK;
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "create_job(%p[%d], %s)", con,
+ con->http.fd, uri->values[0].string.text);
/*
- * Add any job subscriptions...
+ * Is the destination valid?
*/
- add_job_subscriptions(con, job);
+ if (!cupsdValidateDest(uri->values[0].string.text, NULL, &printer))
+ {
+ /*
+ * Bad URI...
+ */
+
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("The printer or class was not found."));
+ return;
+ }
/*
- * Set all but the first two attributes to the job attributes group...
+ * Create the job object...
*/
- for (attr = job->attrs->attrs->next->next; attr; attr = attr->next)
- attr->group_tag = IPP_TAG_JOB;
+ if ((job = add_job(con, printer, NULL)) == NULL)
+ return;
+
+ job->pending_timeout = 1;
/*
* Save and log the job...
*/
-
+
cupsdSaveJob(job);
- cupsdLogMessage(CUPSD_LOG_INFO, "Job %d created on \"%s\" by \"%s\".",
+ cupsdLogMessage(CUPSD_LOG_INFO, "[Job %d] Queued on \"%s\" by \"%s\".",
job->id, job->dest, job->username);
-
- cupsdAddEvent(CUPSD_EVENT_JOB_CREATED, printer, job, "Job created.");
}
cupsArrayAdd(ra, "notify-lease-duration-default");
cupsArrayAdd(ra, "notify-lease-duration-supported");
cupsArrayAdd(ra, "notify-max-events-supported");
- cupsArrayAdd(ra, "notify-notify-events-default");
- cupsArrayAdd(ra, "notify-notify-events-supported");
+ cupsArrayAdd(ra, "notify-events-default");
+ cupsArrayAdd(ra, "notify-events-supported");
cupsArrayAdd(ra, "notify-pull-method-supported");
cupsArrayAdd(ra, "notify-schemes-supported");
cupsArrayAdd(ra, "operations-supported");
cupsArrayAdd(ra, "pages-per-minute");
cupsArrayAdd(ra, "pages-per-minute-color");
cupsArrayAdd(ra, "pdl-override-supported");
+ cupsArrayAdd(ra, "printer-alert");
+ cupsArrayAdd(ra, "printer-alert-description");
cupsArrayAdd(ra, "printer-current-time");
cupsArrayAdd(ra, "printer-driver-installer");
cupsArrayAdd(ra, "printer-info");
cupsArrayAdd(ra, "uri-authentication-supported");
cupsArrayAdd(ra, "uri-security-supported");
}
+ else if (!strcmp(value, "printer-defaults"))
+ {
+ char *name; /* Option name */
+
+
+ for (name = (char *)cupsArrayFirst(CommonDefaults);
+ name;
+ name = (char *)cupsArrayNext(CommonDefaults))
+ cupsArrayAdd(ra, name);
+ }
else if (!strcmp(value, "subscription-template"))
{
cupsArrayAdd(ra, "notify-attributes");
http_status_t status; /* Policy status */
int i; /* Looping var */
ipp_attribute_t *attr; /* Current attribute */
- const char *dest; /* Destination */
- cups_ptype_t dtype; /* Destination type (printer or class) */
- char method[HTTP_MAX_URI],
- /* Method portion of URI */
+ cups_ptype_t dtype; /* Destination type (printer/class) */
+ char scheme[HTTP_MAX_URI],
+ /* Scheme portion of URI */
userpass[HTTP_MAX_URI],
/* Username portion of URI */
host[HTTP_MAX_URI],
cupsd_job_t *job; /* Job */
int jobid; /* Job ID */
cupsd_subscription_t *sub; /* Subscription object */
- const char *username, /* requesting-user-name or authenticated username */
+ const char *username, /* requesting-user-name or
+ authenticated username */
*recipient, /* notify-recipient-uri */
*pullmethod; /* notify-pull-method */
ipp_attribute_t *user_data; /* notify-user-data */
int interval, /* notify-time-interval */
lease; /* notify-lease-duration */
unsigned mask; /* notify-events */
+ ipp_attribute_t *notify_events,/* notify-events(-default) */
+ *notify_lease; /* notify-lease-duration(-default) */
+#ifdef DEBUG
+ for (attr = con->request->attrs; attr; attr = attr->next)
+ {
+ if (attr->group_tag != IPP_TAG_ZERO)
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "g%04x v%04x %s", attr->group_tag,
+ attr->value_tag, attr->name);
+ else
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "----SEP----");
+ }
+#endif /* DEBUG */
+
/*
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- userpass, sizeof(userpass), host, sizeof(host), &port,
- resource, sizeof(resource));
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "cupsdCreateSubscription(con=%p(%d), uri=\"%s\")",
+ con, con->http.fd, uri->values[0].string.text);
+
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, scheme,
+ sizeof(scheme), userpass, sizeof(userpass), host,
+ sizeof(host), &port, resource, sizeof(resource));
if (!strcmp(resource, "/"))
{
- dest = NULL;
dtype = (cups_ptype_t)0;
printer = NULL;
}
else if (!strncmp(resource, "/printers", 9) && strlen(resource) <= 10)
{
- dest = NULL;
dtype = (cups_ptype_t)0;
printer = NULL;
}
else if (!strncmp(resource, "/classes", 8) && strlen(resource) <= 9)
{
- dest = NULL;
dtype = CUPS_PRINTER_CLASS;
printer = NULL;
}
- else if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
+ else if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer))
{
/*
* Bad URI...
if (printer)
{
- if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
+ if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con,
+ NULL)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, printer);
return;
}
}
else if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, NULL);
return;
}
* Get the user that is requesting the subscription...
*/
- if (con->username[0])
- username = con->username;
- else if ((attr = ippFindAttribute(con->request, "requesting-user-name",
- IPP_TAG_NAME)) != NULL)
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "create_subscription: requesting-user-name = \"%s\"",
- attr->values[0].string.text);
-
- username = attr->values[0].string.text;
- }
- else
- username = "anonymous";
+ username = get_username(con);
/*
* Find the first subscription group attribute; return if we have
* Process the subscription attributes in the request...
*/
+ con->response->request.status.status_code = IPP_BAD_REQUEST;
+
while (attr)
{
recipient = NULL;
jobid = 0;
mask = CUPSD_EVENT_NONE;
+ if (printer)
+ {
+ notify_events = ippFindAttribute(printer->attrs, "notify-events-default",
+ IPP_TAG_KEYWORD);
+ notify_lease = ippFindAttribute(printer->attrs,
+ "notify-lease-duration-default",
+ IPP_TAG_INTEGER);
+
+ if (notify_lease)
+ lease = notify_lease->values[0].integer;
+ }
+ else
+ {
+ notify_events = NULL;
+ notify_lease = NULL;
+ }
+
while (attr && attr->group_tag != IPP_TAG_ZERO)
{
- if (!strcmp(attr->name, "notify-recipient") &&
+ if (!strcmp(attr->name, "notify-recipient-uri") &&
attr->value_tag == IPP_TAG_URI)
+ {
+ /*
+ * Validate the recipient scheme against the ServerBin/notifier
+ * directory...
+ */
+
+ char notifier[1024]; /* Notifier filename */
+
+
recipient = attr->values[0].string.text;
+
+ if (httpSeparateURI(HTTP_URI_CODING_ALL, recipient,
+ scheme, sizeof(scheme), userpass, sizeof(userpass),
+ host, sizeof(host), &port,
+ resource, sizeof(resource)) < HTTP_URI_OK)
+ {
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("Bad notify-recipient-uri URI \"%s\"!"), recipient);
+ ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_ENUM,
+ "notify-status-code", IPP_URI_SCHEME);
+ return;
+ }
+
+ snprintf(notifier, sizeof(notifier), "%s/notifier/%s", ServerBin,
+ scheme);
+ if (access(notifier, X_OK))
+ {
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("notify-recipient-uri URI \"%s\" uses unknown "
+ "scheme!"), recipient);
+ ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_ENUM,
+ "notify-status-code", IPP_URI_SCHEME);
+ return;
+ }
+ }
else if (!strcmp(attr->name, "notify-pull-method") &&
attr->value_tag == IPP_TAG_KEYWORD)
+ {
pullmethod = attr->values[0].string.text;
+
+ if (strcmp(pullmethod, "ippget"))
+ {
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("Bad notify-pull-method \"%s\"!"), pullmethod);
+ ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_ENUM,
+ "notify-status-code", IPP_ATTRIBUTES);
+ return;
+ }
+ }
else if (!strcmp(attr->name, "notify-charset") &&
attr->value_tag == IPP_TAG_CHARSET &&
strcmp(attr->values[0].string.text, "us-ascii") &&
}
else if (!strcmp(attr->name, "notify-events") &&
attr->value_tag == IPP_TAG_KEYWORD)
- {
- for (i = 0; i < attr->num_values; i ++)
- mask |= cupsdEventValue(attr->values[i].string.text);
- }
+ notify_events = attr;
else if (!strcmp(attr->name, "notify-lease-duration") &&
attr->value_tag == IPP_TAG_INTEGER)
lease = attr->values[0].integer;
attr = attr->next;
}
+ if (notify_events)
+ {
+ for (i = 0; i < notify_events->num_values; i ++)
+ mask |= cupsdEventValue(notify_events->values[i].string.text);
+ }
+
+ if (recipient)
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "recipient=\"%s\"", recipient);
+ if (pullmethod)
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "pullmethod=\"%s\"", pullmethod);
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "notify-lease-duration=%d", lease);
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "notify-time-interval=%d", interval);
+
if (!recipient && !pullmethod)
break;
}
}
- if (MaxLeaseDuration && lease > MaxLeaseDuration)
+ if (MaxLeaseDuration && (lease == 0 || lease > MaxLeaseDuration))
{
cupsdLogMessage(CUPSD_LOG_INFO,
"create_subscription: Limiting notify-lease-duration to "
sub = cupsdAddSubscription(mask, printer, job, recipient, 0);
+ if (job)
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Added subscription %d for job %d",
+ sub->id, job->id);
+ else if (printer)
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Added subscription %d for printer \"%s\"",
+ sub->id, printer->name);
+ else
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Added subscription %d for server",
+ sub->id);
+
sub->interval = interval;
sub->lease = lease;
- sub->expire = time(NULL) + lease;
+ sub->expire = lease ? time(NULL) + lease : 0;
cupsdSetString(&sub->owner, username);
ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
"notify-subscription-id", sub->id);
+ con->response->request.status.status_code = IPP_OK;
+
if (attr)
attr = attr->next;
}
cupsdSaveAllSubscriptions();
- con->response->request.status.status_code = IPP_OK;
}
ipp_attribute_t *uri) /* I - URI of printer or class */
{
http_status_t status; /* Policy status */
- const char *dest; /* Destination */
- cups_ptype_t dtype; /* Destination type (printer or class) */
- char method[HTTP_MAX_URI], /* Method portion of URI */
- username[HTTP_MAX_URI], /* Username portion of URI */
- host[HTTP_MAX_URI], /* Host portion of URI */
- resource[HTTP_MAX_URI]; /* Resource portion of URI */
- int port; /* Port portion of URI */
+ cups_ptype_t dtype; /* Destination type (printer/class) */
cupsd_printer_t *printer; /* Printer/class */
char filename[1024]; /* Script/PPD filename */
* Do we have a valid URI?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
-
- if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
+ if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer))
{
/*
* Bad URI...
if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, NULL);
return;
}
* Remove old jobs...
*/
- cupsdCancelJobs(dest, NULL, 1);
+ cupsdCancelJobs(printer->name, NULL, 1);
/*
* Remove old subscriptions and send a "deleted printer" event...
cupsdAddEvent(CUPSD_EVENT_PRINTER_DELETED, printer, NULL,
"%s \"%s\" deleted by \"%s\".",
(dtype & CUPS_PRINTER_CLASS) ? "Class" : "Printer",
- dest, con->username);
+ printer->name, get_username(con));
cupsdExpireSubscriptions(printer, NULL);
-
+
/*
* Remove any old PPD or script files...
*/
- snprintf(filename, sizeof(filename), "%s/interfaces/%s", ServerRoot, dest);
+ snprintf(filename, sizeof(filename), "%s/interfaces/%s", ServerRoot,
+ printer->name);
unlink(filename);
- snprintf(filename, sizeof(filename), "%s/ppd/%s.ppd", ServerRoot, dest);
+ snprintf(filename, sizeof(filename), "%s/ppd/%s.ppd", ServerRoot,
+ printer->name);
unlink(filename);
if (dtype & CUPS_PRINTER_CLASS)
{
- cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" deleted by \"%s\".", dest,
- con->username);
+ cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" deleted by \"%s\".",
+ printer->name, get_username(con));
cupsdDeletePrinter(printer, 0);
cupsdSaveAllClasses();
}
else
{
- cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" deleted by \"%s\".", dest,
- con->username);
+ cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" deleted by \"%s\".",
+ printer->name, get_username(con));
cupsdDeletePrinter(printer, 0);
cupsdSaveAllPrinters();
static void
get_default(cupsd_client_t *con) /* I - Client connection */
{
- http_status_t status; /* Policy status */
- int i; /* Looping var */
- ipp_attribute_t *requested, /* requested-attributes */
- *history; /* History collection */
- int need_history; /* Need to send history collection? */
- char printer_uri[HTTP_MAX_URI];
- /* Printer URI */
- time_t curtime; /* Current time */
+ http_status_t status; /* Policy status */
+ cups_array_t *ra; /* Requested attributes array */
cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_default(%p[%d])", con, con->http.fd);
if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, NULL);
return;
}
- if (DefaultPrinter != NULL)
+ if (DefaultPrinter)
{
- /*
- * Copy the printer attributes to the response using requested-attributes
- * and document-format attributes that may be provided by the client.
- */
-
- if (!ippFindAttribute(DefaultPrinter->attrs, "printer-uri-supported",
- IPP_TAG_URI))
- {
- httpAssembleURIf(printer_uri, sizeof(printer_uri), "ipp", NULL,
- con->servername, con->serverport, "/printers/%s",
- DefaultPrinter->name);
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_URI,
- "printer-uri-supported", NULL, printer_uri);
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "printer-uri-supported=\"%s\"",
- printer_uri);
- }
-
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-state",
- DefaultPrinter->state);
-
- add_printer_state_reasons(con, DefaultPrinter);
-
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_TEXT,
- "printer-state-message", NULL, DefaultPrinter->state_message);
-
- ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-accepting-jobs",
- DefaultPrinter->accepting);
- ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-shared",
- DefaultPrinter->shared);
-
- curtime = time(NULL);
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
- "printer-up-time", curtime);
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
- "printer-state-change-time", DefaultPrinter->state_time);
- ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
- ippTimeToDate(curtime));
-
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
- "printer-error-policy", NULL, DefaultPrinter->error_policy);
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
- "printer-op-policy", NULL, DefaultPrinter->op_policy);
-
- add_queued_job_count(con, DefaultPrinter);
-
- requested = ippFindAttribute(con->request, "requested-attributes",
- IPP_TAG_KEYWORD);
-
- copy_attrs(con->response, DefaultPrinter->attrs, requested, IPP_TAG_ZERO, 0);
- copy_attrs(con->response, CommonData, requested, IPP_TAG_ZERO, IPP_TAG_COPY);
-
- need_history = 0;
-
- if (MaxPrinterHistory > 0 && DefaultPrinter->num_history > 0 && requested)
- {
- for (i = 0; i < requested->num_values; i ++)
- if (!strcmp(requested->values[i].string.text, "all") ||
- !strcmp(requested->values[i].string.text, "printer-state-history"))
- {
- need_history = 1;
- break;
- }
- }
+ ra = create_requested_array(con->request);
- if (need_history)
- {
- history = ippAddCollections(con->response, IPP_TAG_PRINTER,
- "printer-state-history",
- DefaultPrinter->num_history, NULL);
+ copy_printer_attrs(con, DefaultPrinter, ra);
- for (i = 0; i < DefaultPrinter->num_history; i ++)
- copy_attrs(history->values[i].collection = ippNew(),
- DefaultPrinter->history[i],
- NULL, IPP_TAG_ZERO, 0);
- }
+ cupsArrayDelete(ra);
- con->response->request.status.status_code = requested ? IPP_OK_SUBST : IPP_OK;
+ con->response->request.status.status_code = IPP_OK;
}
else
send_ipp_status(con, IPP_NOT_FOUND, _("No default printer"));
get_devices(cupsd_client_t *con) /* I - Client connection */
{
http_status_t status; /* Policy status */
- int i; /* Looping var */
ipp_attribute_t *limit, /* Limit attribute */
*requested; /* requested-attributes attribute */
char command[1024], /* cups-deviced command */
options[1024], /* Options to pass to command */
- attrs[1024], /* String for requested attributes */
- *aptr; /* Pointer into string */
- int alen; /* Length of attribute value */
+ requested_str[256];
+ /* String for requested attributes */
cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_devices(%p[%d])", con, con->http.fd);
if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, NULL);
return;
}
IPP_TAG_KEYWORD);
if (requested)
- {
- for (i = 0, aptr = attrs; i < requested->num_values; i ++)
- {
- /*
- * Check that we have enough room...
- */
-
- alen = strlen(requested->values[i].string.text);
- if (alen > (sizeof(attrs) - (aptr - attrs) - 2))
- break;
-
- /*
- * Put commas between values...
- */
-
- if (i)
- *aptr++ = ',';
-
- /*
- * Add the value to the end of the string...
- */
-
- strcpy(aptr, requested->values[i].string.text);
- aptr += alen;
- }
-
- /*
- * If we have more attribute names than will fit, default to "all"...
- */
-
- if (i < requested->num_values)
- strcpy(attrs, "all");
- }
+ url_encode_attr(requested, requested_str, sizeof(requested_str));
else
- strcpy(attrs, "all");
+ strlcpy(requested_str, "requested-attributes=all", sizeof(requested_str));
snprintf(command, sizeof(command), "%s/daemon/cups-deviced", ServerBin);
snprintf(options, sizeof(options),
- "cups-deviced %d+%d+requested-attributes=%s",
+ "%d+%d+%d+%s",
con->request->request.op.request_id,
- limit ? limit->values[0].integer : 0,
- attrs);
+ limit ? limit->values[0].integer : 0, (int)User,
+ requested_str);
if (cupsdSendCommand(con, command, options, 1))
{
}
+/*
+ * 'get_job_attrs()' - Get job attributes.
+ */
+
+static void
+get_job_attrs(cupsd_client_t *con, /* I - Client connection */
+ ipp_attribute_t *uri) /* I - Job URI */
+{
+ http_status_t status; /* Policy status */
+ ipp_attribute_t *attr; /* Current attribute */
+ int jobid; /* Job ID */
+ cupsd_job_t *job; /* Current job */
+ char method[HTTP_MAX_URI], /* Method portion of URI */
+ username[HTTP_MAX_URI], /* Username portion of URI */
+ host[HTTP_MAX_URI], /* Host portion of URI */
+ resource[HTTP_MAX_URI]; /* Resource portion of URI */
+ int port; /* Port portion of URI */
+ cups_array_t *ra; /* Requested attributes array */
+
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_job_attrs(%p[%d], %s)", con,
+ con->http.fd, uri->values[0].string.text);
+
+ /*
+ * See if we have a job URI or a printer URI...
+ */
+
+ if (!strcmp(uri->name, "printer-uri"))
+ {
+ /*
+ * Got a printer URI; see if we also have a job-id attribute...
+ */
+
+ if ((attr = ippFindAttribute(con->request, "job-id",
+ IPP_TAG_INTEGER)) == NULL)
+ {
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("Got a printer-uri attribute but no job-id!"));
+ return;
+ }
+
+ jobid = attr->values[0].integer;
+ }
+ else
+ {
+ /*
+ * Got a job URI; parse it to get the job ID...
+ */
+
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
+
+ if (strncmp(resource, "/jobs/", 6))
+ {
+ /*
+ * Not a valid URI!
+ */
+
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("Bad job-uri attribute \"%s\"!"),
+ uri->values[0].string.text);
+ return;
+ }
+
+ jobid = atoi(resource + 6);
+ }
+
+ /*
+ * See if the job exists...
+ */
+
+ if ((job = cupsdFindJob(jobid)) == NULL)
+ {
+ /*
+ * Nope - return a "not found" error...
+ */
+
+ send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid);
+ return;
+ }
+
+ /*
+ * Check policy...
+ */
+
+ if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+ {
+ send_http_error(con, status, NULL);
+ return;
+ }
+
+ /*
+ * Copy attributes...
+ */
+
+ cupsdLoadJob(job);
+
+ ra = create_requested_array(con->request);
+ copy_job_attrs(con, job, ra);
+ cupsArrayDelete(ra);
+
+ con->response->request.status.status_code = IPP_OK;
+}
+
+
/*
* 'get_jobs()' - Get a list of jobs for the specified printer.
*/
ipp_attribute_t *uri) /* I - Printer URI */
{
http_status_t status; /* Policy status */
- ipp_attribute_t *attr, /* Current attribute */
- *requested; /* Requested attributes */
+ ipp_attribute_t *attr; /* Current attribute */
const char *dest; /* Destination */
- cups_ptype_t dtype; /* Destination type (printer or class) */
+ cups_ptype_t dtype; /* Destination type (printer/class) */
cups_ptype_t dmask; /* Destination type mask */
- char method[HTTP_MAX_URI], /* Method portion of URI */
+ char scheme[HTTP_MAX_URI], /* Scheme portion of URI */
username[HTTP_MAX_URI], /* Username portion of URI */
host[HTTP_MAX_URI], /* Host portion of URI */
resource[HTTP_MAX_URI]; /* Resource portion of URI */
int limit; /* Maximum number of jobs to return */
int count; /* Number of jobs that match */
cupsd_job_t *job; /* Current job pointer */
- char job_uri[HTTP_MAX_URI]; /* Job URI... */
cupsd_printer_t *printer; /* Printer */
cups_array_t *list; /* Which job list... */
+ cups_array_t *ra; /* Requested attributes array */
cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs(%p[%d], %s)", con, con->http.fd,
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, scheme,
+ sizeof(scheme), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
- if (strcmp(resource, "/") == 0 ||
- (strncmp(resource, "/jobs", 5) == 0 && strlen(resource) <= 6))
+ if (!strcmp(resource, "/") ||
+ (!strncmp(resource, "/jobs", 5) && strlen(resource) <= 6))
{
dest = NULL;
dtype = (cups_ptype_t)0;
dmask = (cups_ptype_t)0;
printer = NULL;
}
- else if (strncmp(resource, "/printers", 9) == 0 && strlen(resource) <= 10)
+ else if (!strncmp(resource, "/printers", 9) && strlen(resource) <= 10)
{
dest = NULL;
dtype = (cups_ptype_t)0;
dmask = CUPS_PRINTER_CLASS;
printer = NULL;
}
- else if (strncmp(resource, "/classes", 8) == 0 && strlen(resource) <= 9)
+ else if (!strncmp(resource, "/classes", 8) && strlen(resource) <= 9)
{
dest = NULL;
dtype = CUPS_PRINTER_CLASS;
dmask = CUPS_PRINTER_CLASS;
printer = NULL;
}
- else if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
+ else if ((dest = cupsdValidateDest(uri->values[0].string.text, &dtype,
+ &printer)) == NULL)
{
/*
* Bad URI...
return;
}
else
+ {
+ dtype &= CUPS_PRINTER_CLASS;
dmask = CUPS_PRINTER_CLASS;
+ }
/*
* Check policy...
if (printer)
{
- if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
+ if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con,
+ NULL)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, printer);
return;
}
}
else if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, NULL);
return;
}
* See if the "which-jobs" attribute have been specified...
*/
- if ((attr = ippFindAttribute(con->request, "which-jobs", IPP_TAG_KEYWORD)) != NULL &&
+ if ((attr = ippFindAttribute(con->request, "which-jobs",
+ IPP_TAG_KEYWORD)) != NULL &&
!strcmp(attr->values[0].string.text, "completed"))
{
completed = 1;
* See if they want to limit the number of jobs reported...
*/
- if ((attr = ippFindAttribute(con->request, "limit", IPP_TAG_INTEGER)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "limit",
+ IPP_TAG_INTEGER)) != NULL)
limit = attr->values[0].integer;
else
limit = 1000000;
- if ((attr = ippFindAttribute(con->request, "first-job-id",
- IPP_TAG_INTEGER)) != NULL)
- first_job_id = attr->values[0].integer;
- else
- first_job_id = 1;
+ if ((attr = ippFindAttribute(con->request, "first-job-id",
+ IPP_TAG_INTEGER)) != NULL)
+ first_job_id = attr->values[0].integer;
+ else
+ first_job_id = 1;
+
+ /*
+ * See if we only want to see jobs for a specific user...
+ */
+
+ if ((attr = ippFindAttribute(con->request, "my-jobs",
+ IPP_TAG_BOOLEAN)) != NULL &&
+ attr->values[0].boolean)
+ strlcpy(username, get_username(con), sizeof(username));
+ else
+ username[0] = '\0';
+
+ ra = create_requested_array(con->request);
+
+ /*
+ * OK, build a list of jobs for this printer...
+ */
+
+ for (count = 0, job = (cupsd_job_t *)cupsArrayFirst(list);
+ count < limit && job;
+ job = (cupsd_job_t *)cupsArrayNext(list))
+ {
+ /*
+ * Filter out jobs that don't match...
+ */
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: job->id = %d", job->id);
+
+ if ((dest && strcmp(job->dest, dest)) &&
+ (!job->printer || !dest || strcmp(job->printer->name, dest)))
+ continue;
+ if ((job->dtype & dmask) != dtype &&
+ (!job->printer || (job->printer->type & dmask) != dtype))
+ continue;
+ if (completed && job->state_value <= IPP_JOB_STOPPED)
+ continue;
+
+ if (job->id < first_job_id)
+ continue;
+
+ cupsdLoadJob(job);
+
+ if (!job->attrs)
+ continue;
+
+ if (username[0] && strcasecmp(username, job->username))
+ continue;
+
+ if (count > 0)
+ ippAddSeparator(con->response);
+
+ count ++;
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count);
+
+ copy_job_attrs(con, job, ra);
+ }
+
+ cupsArrayDelete(ra);
+
+ con->response->request.status.status_code = IPP_OK;
+}
+
+
+/*
+ * 'get_notifications()' - Get events for a subscription.
+ */
+
+static void
+get_notifications(cupsd_client_t *con) /* I - Client connection */
+{
+ int i, j; /* Looping vars */
+ http_status_t status; /* Policy status */
+ cupsd_subscription_t *sub; /* Subscription */
+ ipp_attribute_t *ids, /* notify-subscription-ids */
+ *sequences; /* notify-sequence-numbers */
+ int min_seq; /* Minimum sequence number */
+ int interval; /* Poll interval */
+
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_notifications(con=%p[%d])",
+ con, con->http.fd);
/*
- * See if we only want to see jobs for a specific user...
+ * Get subscription attributes...
*/
- if ((attr = ippFindAttribute(con->request, "my-jobs", IPP_TAG_BOOLEAN)) != NULL &&
- attr->values[0].boolean)
+ ids = ippFindAttribute(con->request, "notify-subscription-ids",
+ IPP_TAG_INTEGER);
+ sequences = ippFindAttribute(con->request, "notify-sequence-numbers",
+ IPP_TAG_INTEGER);
+
+ if (!ids)
{
- if (con->username[0])
- strlcpy(username, con->username, sizeof(username));
- else if ((attr = ippFindAttribute(con->request, "requesting-user-name", IPP_TAG_NAME)) != NULL)
- strlcpy(username, attr->values[0].string.text, sizeof(username));
- else
- strcpy(username, "anonymous");
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("Missing notify-subscription-ids attribute!"));
+ return;
}
- else
- username[0] = '\0';
-
- requested = ippFindAttribute(con->request, "requested-attributes",
- IPP_TAG_KEYWORD);
/*
- * OK, build a list of jobs for this printer...
+ * Are the subscription IDs valid?
*/
- for (count = 0, job = (cupsd_job_t *)cupsArrayFirst(list);
- count < limit && job;
- job = (cupsd_job_t *)cupsArrayNext(list))
+ for (i = 0, interval = 60; i < ids->num_values; i ++)
{
+ if ((sub = cupsdFindSubscription(ids->values[i].integer)) == NULL)
+ {
+ /*
+ * Bad subscription ID...
+ */
+
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("notify-subscription-id %d no good!"),
+ ids->values[i].integer);
+ return;
+ }
+
/*
- * Filter out jobs that don't match...
+ * Check policy...
*/
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: job->id = %d", job->id);
+ if ((status = cupsdCheckPolicy(sub->dest ? sub->dest->op_policy_ptr :
+ DefaultPolicyPtr,
+ con, sub->owner)) != HTTP_OK)
+ {
+ send_http_error(con, status, sub->dest);
+ return;
+ }
- if ((dest != NULL && strcmp(job->dest, dest) != 0) &&
- (job->printer == NULL || dest == NULL ||
- strcmp(job->printer->name, dest) != 0))
- continue;
- if ((job->dtype & dmask) != dtype &&
- (job->printer == NULL || (job->printer->type & dmask) != dtype))
- continue;
- if (username[0] != '\0' && strcasecmp(username, job->username) != 0)
- continue;
+ /*
+ * Check the subscription type and update the interval accordingly.
+ */
- if (completed && job->state->values[0].integer <= IPP_JOB_STOPPED)
- continue;
+ if (sub->job && sub->job->state_value == IPP_JOB_PROCESSING &&
+ interval > 10)
+ interval = 10;
+ else if (sub->job && sub->job->state_value >= IPP_JOB_STOPPED)
+ interval = 0;
+ else if (sub->dest && sub->dest->state == IPP_PRINTER_PROCESSING &&
+ interval > 30)
+ interval = 30;
+ }
- if (job->id < first_job_id)
- continue;
+ /*
+ * Tell the client to poll again in N seconds...
+ */
- count ++;
+ if (interval > 0)
+ ippAddInteger(con->response, IPP_TAG_OPERATION, IPP_TAG_INTEGER,
+ "notify-get-interval", interval);
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count);
+ ippAddInteger(con->response, IPP_TAG_OPERATION, IPP_TAG_INTEGER,
+ "printer-up-time", time(NULL));
+
+ /*
+ * Copy the subscription event attributes to the response.
+ */
+ con->response->request.status.status_code =
+ interval ? IPP_OK : IPP_OK_EVENTS_COMPLETE;
+
+ for (i = 0; i < ids->num_values; i ++)
+ {
/*
- * Send the requested attributes for each job...
+ * Get the subscription and sequence number...
*/
- snprintf(job_uri, sizeof(job_uri), "http://%s:%d/jobs/%d", ServerName,
- LocalPort, job->id);
+ sub = cupsdFindSubscription(ids->values[i].integer);
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI,
- "job-more-info", NULL, job_uri);
+ if (sequences && i < sequences->num_values)
+ min_seq = sequences->values[i].integer;
+ else
+ min_seq = 1;
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI,
- "job-uri", NULL, job_uri);
+ /*
+ * If we don't have any new events, nothing to do here...
+ */
- ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER,
- "job-printer-up-time", time(NULL));
+ if (min_seq > (sub->first_event_id + sub->num_events))
+ continue;
/*
- * Copy the job attributes to the response using the requested-attributes
- * attribute that may be provided by the client.
+ * Otherwise copy all of the new events...
*/
- copy_attrs(con->response, job->attrs, requested, IPP_TAG_JOB, 0);
+ if (sub->first_event_id > min_seq)
+ j = 0;
+ else
+ j = min_seq - sub->first_event_id;
- add_job_state_reasons(con, job);
+ for (; j < sub->num_events; j ++)
+ {
+ ippAddSeparator(con->response);
- ippAddSeparator(con->response);
+ copy_attrs(con->response, sub->events[j]->attrs, NULL,
+ IPP_TAG_EVENT_NOTIFICATION, 0);
+ }
}
-
- if (requested != NULL)
- con->response->request.status.status_code = IPP_OK_SUBST;
- else
- con->response->request.status.status_code = IPP_OK;
}
/*
- * 'get_job_attrs()' - Get job attributes.
+ * 'get_ppd()' - Get a named PPD from the local system.
*/
static void
-get_job_attrs(cupsd_client_t *con, /* I - Client connection */
- ipp_attribute_t *uri) /* I - Job URI */
+get_ppd(cupsd_client_t *con, /* I - Client connection */
+ ipp_attribute_t *uri) /* I - Printer URI or PPD name */
{
- http_status_t status; /* Policy status */
- ipp_attribute_t *attr, /* Current attribute */
- *requested; /* Requested attributes */
- int jobid; /* Job ID */
- cupsd_job_t *job; /* Current job */
- char method[HTTP_MAX_URI], /* Method portion of URI */
- username[HTTP_MAX_URI], /* Username portion of URI */
- host[HTTP_MAX_URI], /* Host portion of URI */
- resource[HTTP_MAX_URI]; /* Resource portion of URI */
- int port; /* Port portion of URI */
- char job_uri[HTTP_MAX_URI]; /* Job URI... */
-
+ http_status_t status; /* Policy status */
+ cupsd_printer_t *dest; /* Destination */
+ cups_ptype_t dtype; /* Destination type */
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_job_attrs(%p[%d], %s)", con,
- con->http.fd, uri->values[0].string.text);
- /*
- * See if we have a job URI or a printer URI...
- */
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_ppd(%p[%d], %p[%s=%s])", con,
+ con->http.fd, uri, uri->name, uri->values[0].string.text);
- if (strcmp(uri->name, "printer-uri") == 0)
+ if (!strcmp(uri->name, "ppd-name"))
{
/*
- * Got a printer URI; see if we also have a job-id attribute...
+ * Return a PPD file from cups-driverd...
+ */
+
+ char command[1024], /* cups-driverd command */
+ options[1024], /* Options to pass to command */
+ ppd_name[1024]; /* ppd-name */
+
+
+ /*
+ * Check policy...
*/
- if ((attr = ippFindAttribute(con->request, "job-id", IPP_TAG_INTEGER)) == NULL)
+ if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
{
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("Got a printer-uri attribute but no job-id!"));
+ send_http_error(con, status, NULL);
return;
}
- jobid = attr->values[0].integer;
- }
- else
- {
/*
- * Got a job URI; parse it to get the job ID...
+ * Run cups-driverd command with the given options...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ snprintf(command, sizeof(command), "%s/daemon/cups-driverd", ServerBin);
+ url_encode_string(uri->values[0].string.text, ppd_name, sizeof(ppd_name));
+ snprintf(options, sizeof(options), "get+%d+%s",
+ con->request->request.op.request_id, ppd_name);
- if (strncmp(resource, "/jobs/", 6) != 0)
+ if (cupsdSendCommand(con, command, options, 0))
{
/*
- * Not a valid URI!
+ * Command started successfully, don't send an IPP response here...
*/
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("Bad job-uri attribute \"%s\"!"),
- uri->values[0].string.text);
- return;
+ ippDelete(con->response);
+ con->response = NULL;
}
+ else
+ {
+ /*
+ * Command failed, return "internal error" so the user knows something
+ * went wrong...
+ */
- jobid = atoi(resource + 6);
+ send_ipp_status(con, IPP_INTERNAL_ERROR,
+ _("cups-driverd failed to execute."));
+ }
}
+ else if (!strcmp(uri->name, "printer-uri") &&
+ cupsdValidateDest(uri->values[0].string.text, &dtype, &dest))
+ {
+ int i; /* Looping var */
+ char filename[1024]; /* PPD filename */
- /*
- * See if the job exists...
- */
- if ((job = cupsdFindJob(jobid)) == NULL)
- {
/*
- * Nope - return a "not found" error...
+ * Check policy...
*/
- send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid);
- return;
- }
-
- /*
- * Check policy...
- */
-
- if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
- {
- send_http_error(con, status);
- return;
- }
-
- /*
- * Put out the standard attributes...
- */
+ if ((status = cupsdCheckPolicy(dest->op_policy_ptr, con, NULL)) != HTTP_OK)
+ {
+ send_http_error(con, status, NULL);
+ return;
+ }
- snprintf(job_uri, sizeof(job_uri), "http://%s:%d/jobs/%d",
- ServerName, LocalPort, job->id);
+ /*
+ * See if we need the PPD for a class or remote printer...
+ */
- ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-id", job->id);
+ snprintf(filename, sizeof(filename), "%s/ppd/%s.ppd", ServerRoot,
+ dest->name);
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI,
- "job-more-info", NULL, job_uri);
+ if ((dtype & CUPS_PRINTER_REMOTE) && access(filename, 0))
+ {
+ con->response->request.status.status_code = CUPS_SEE_OTHER;
+ ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_URI,
+ "printer-uri", NULL, dest->uri);
+ return;
+ }
+ else if (dtype & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT))
+ {
+ for (i = 0; i < dest->num_printers; i ++)
+ if (!(dest->printers[i]->type &
+ (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT)))
+ {
+ snprintf(filename, sizeof(filename), "%s/ppd/%s.ppd", ServerRoot,
+ dest->printers[i]->name);
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI,
- "job-uri", NULL, job_uri);
+ if (!access(filename, 0))
+ break;
+ }
- ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER,
- "job-printer-up-time", time(NULL));
+ if (i < dest->num_printers)
+ dest = dest->printers[i];
+ else
+ {
+ con->response->request.status.status_code = CUPS_SEE_OTHER;
+ ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_URI,
+ "printer-uri", NULL, dest->printers[0]->uri);
+ return;
+ }
+ }
- /*
- * Copy the job attributes to the response using the requested-attributes
- * attribute that may be provided by the client.
- */
+ /*
+ * Found the printer with the PPD file, now see if there is one...
+ */
- requested = ippFindAttribute(con->request, "requested-attributes",
- IPP_TAG_KEYWORD);
+ if ((con->file = open(filename, O_RDONLY)) < 0)
+ {
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("The PPD file \"%s\" could not be opened: %s"),
+ uri->values[0].string.text, strerror(errno));
+ return;
+ }
- copy_attrs(con->response, job->attrs, requested, IPP_TAG_JOB, 0);
+ fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
- add_job_state_reasons(con, job);
+ con->pipe_pid = 0;
- if (requested != NULL)
- con->response->request.status.status_code = IPP_OK_SUBST;
- else
con->response->request.status.status_code = IPP_OK;
-}
-
-
-/*
- * 'get_notifications()' - Get events for a subscription.
- */
-
-static void
-get_notifications(cupsd_client_t *con, /* I - Client connection */
- int id) /* I - Subscription ID */
-{
+ }
+ else
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("The PPD file \"%s\" could not be found."),
+ uri->values[0].string.text);
}
get_ppds(cupsd_client_t *con) /* I - Client connection */
{
http_status_t status; /* Policy status */
- int i; /* Looping var */
ipp_attribute_t *limit, /* Limit attribute */
+ *device, /* ppd-device-id attribute */
+ *language, /* ppd-natural-language attribute */
*make, /* ppd-make attribute */
+ *model, /* ppd-make-and-model attribute */
+ *model_number, /* ppd-model-number attribute */
+ *product, /* ppd-product attribute */
+ *psversion, /* ppd-psverion attribute */
+ *type, /* ppd-type attribute */
*requested; /* requested-attributes attribute */
- char command[1024], /* cups-deviced command */
+ char command[1024], /* cups-driverd command */
options[1024], /* Options to pass to command */
- attrs[1024], /* String for requested attributes */
- *aptr; /* Pointer into string */
- int alen; /* Length of attribute value */
+ device_str[256],/* Escaped ppd-device-id string */
+ language_str[256],
+ /* Escaped ppd-natural-language */
+ make_str[256], /* Escaped ppd-make string */
+ model_str[256], /* Escaped ppd-make-and-model string */
+ model_number_str[256],
+ /* ppd-model-number string */
+ product_str[256],
+ /* Escaped ppd-product string */
+ psversion_str[256],
+ /* Escaped ppd-psversion string */
+ type_str[256], /* Escaped ppd-type string */
+ requested_str[256];
+ /* String for requested attributes */
cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_ppds(%p[%d])", con, con->http.fd);
if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, NULL);
return;
}
* Run cups-driverd command with the given options...
*/
- limit = ippFindAttribute(con->request, "limit", IPP_TAG_INTEGER);
- make = ippFindAttribute(con->request, "ppd-make", IPP_TAG_TEXT);
- requested = ippFindAttribute(con->request, "requested-attributes",
- IPP_TAG_KEYWORD);
+ limit = ippFindAttribute(con->request, "limit", IPP_TAG_INTEGER);
+ device = ippFindAttribute(con->request, "ppd-device-id", IPP_TAG_TEXT);
+ language = ippFindAttribute(con->request, "ppd-natural-language",
+ IPP_TAG_LANGUAGE);
+ make = ippFindAttribute(con->request, "ppd-make", IPP_TAG_TEXT);
+ model = ippFindAttribute(con->request, "ppd-make-and-model",
+ IPP_TAG_TEXT);
+ model_number = ippFindAttribute(con->request, "ppd-model-number",
+ IPP_TAG_INTEGER);
+ product = ippFindAttribute(con->request, "ppd-product", IPP_TAG_TEXT);
+ psversion = ippFindAttribute(con->request, "ppd-psversion", IPP_TAG_TEXT);
+ type = ippFindAttribute(con->request, "ppd-type", IPP_TAG_KEYWORD);
+ requested = ippFindAttribute(con->request, "requested-attributes",
+ IPP_TAG_KEYWORD);
if (requested)
- {
- for (i = 0, aptr = attrs; i < requested->num_values; i ++)
- {
- /*
- * Check that we have enough room...
- */
+ url_encode_attr(requested, requested_str, sizeof(requested_str));
+ else
+ strlcpy(requested_str, "requested-attributes=all", sizeof(requested_str));
- alen = strlen(requested->values[i].string.text);
- if (alen > (sizeof(attrs) - (aptr - attrs) - 2))
- break;
+ if (device)
+ url_encode_attr(device, device_str, sizeof(device_str));
+ else
+ device_str[0] = '\0';
- /*
- * Put commas between values...
- */
+ if (language)
+ url_encode_attr(language, language_str, sizeof(language_str));
+ else
+ language_str[0] = '\0';
- if (i)
- *aptr++ = ',';
+ if (make)
+ url_encode_attr(make, make_str, sizeof(make_str));
+ else
+ make_str[0] = '\0';
- /*
- * Add the value to the end of the string...
- */
+ if (model)
+ url_encode_attr(model, model_str, sizeof(model_str));
+ else
+ model_str[0] = '\0';
- strcpy(aptr, requested->values[i].string.text);
- aptr += alen;
- }
+ if (model_number)
+ snprintf(model_number_str, sizeof(model_number_str), "ppd-model-number=%d",
+ model_number->values[0].integer);
+ else
+ model_number_str[0] = '\0';
- /*
- * If we have more attribute names than will fit, default to "all"...
- */
+ if (product)
+ url_encode_attr(product, product_str, sizeof(product_str));
+ else
+ product_str[0] = '\0';
- if (i < requested->num_values)
- strcpy(attrs, "all");
- }
+ if (psversion)
+ url_encode_attr(psversion, psversion_str, sizeof(psversion_str));
else
- strcpy(attrs, "all");
+ psversion_str[0] = '\0';
+
+ if (type)
+ url_encode_attr(type, type_str, sizeof(type_str));
+ else
+ type_str[0] = '\0';
snprintf(command, sizeof(command), "%s/daemon/cups-driverd", ServerBin);
snprintf(options, sizeof(options),
- "cups-driverd list+%d+%d+requested-attributes=%s%s%s",
+ "list+%d+%d+%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
con->request->request.op.request_id,
limit ? limit->values[0].integer : 0,
- attrs,
- make ? "%20ppd-make=" : "",
- make ? make->values[0].string.text : "");
+ requested_str,
+ device ? "%20" : "", device_str,
+ language ? "%20" : "", language_str,
+ make ? "%20" : "", make_str,
+ model ? "%20" : "", model_str,
+ model_number ? "%20" : "", model_number_str,
+ product ? "%20" : "", product_str,
+ psversion ? "%20" : "", psversion_str,
+ type ? "%20" : "", type_str);
if (cupsdSendCommand(con, command, options, 0))
{
ipp_attribute_t *uri) /* I - Printer URI */
{
http_status_t status; /* Policy status */
- const char *dest; /* Destination */
- cups_ptype_t dtype; /* Destination type (printer or class) */
- char method[HTTP_MAX_URI],
- /* Method portion of URI */
- username[HTTP_MAX_URI],
- /* Username portion of URI */
- host[HTTP_MAX_URI],
- /* Host portion of URI */
- resource[HTTP_MAX_URI];
- /* Resource portion of URI */
- int port; /* Port portion of URI */
+ cups_ptype_t dtype; /* Destination type (printer/class) */
cupsd_printer_t *printer; /* Printer/class */
- char printer_uri[HTTP_MAX_URI];
- /* Printer URI */
- time_t curtime; /* Current time */
- int i; /* Looping var */
- ipp_attribute_t *requested, /* requested-attributes */
- *history; /* History collection */
- int need_history; /* Need to send history collection? */
+ cups_array_t *ra; /* Requested attributes array */
cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_printer_attrs(%p[%d], %s)", con,
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
-
- if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
+ if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer))
{
/*
* Bad URI...
*/
if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
- {
- send_http_error(con, status);
- return;
- }
-
- curtime = time(NULL);
-
- /*
- * Copy the printer attributes to the response using requested-attributes
- * and document-format attributes that may be provided by the client.
- */
-
- if (!ippFindAttribute(printer->attrs, "printer-uri-supported",
- IPP_TAG_URI))
- {
- httpAssembleURIf(printer_uri, sizeof(printer_uri), "ipp", NULL,
- con->servername, con->serverport, "/printers/%s",
- printer->name);
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_URI,
- "printer-uri-supported", NULL, printer_uri);
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "printer-uri-supported=\"%s\"",
- printer_uri);
- }
-
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-state",
- printer->state);
-
- add_printer_state_reasons(con, printer);
-
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_TEXT,
- "printer-state-message", NULL, printer->state_message);
-
- ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-accepting-jobs",
- printer->accepting);
- ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-shared",
- printer->shared);
-
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
- "printer-up-time", curtime);
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
- "printer-state-change-time", printer->state_time);
- ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
- ippTimeToDate(curtime));
-
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
- "printer-error-policy", NULL, printer->error_policy);
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
- "printer-op-policy", NULL, printer->op_policy);
-
- add_queued_job_count(con, printer);
-
- requested = ippFindAttribute(con->request, "requested-attributes",
- IPP_TAG_KEYWORD);
-
- copy_attrs(con->response, printer->attrs, requested, IPP_TAG_ZERO, 0);
- copy_attrs(con->response, CommonData, requested, IPP_TAG_ZERO, IPP_TAG_COPY);
-
- need_history = 0;
-
- if (MaxPrinterHistory > 0 && printer->num_history > 0 && requested)
- {
- for (i = 0; i < requested->num_values; i ++)
- if (!strcmp(requested->values[i].string.text, "all") ||
- !strcmp(requested->values[i].string.text, "printer-state-history"))
- {
- need_history = 1;
- break;
- }
+ {
+ send_http_error(con, status, printer);
+ return;
}
- if (need_history)
- {
- history = ippAddCollections(con->response, IPP_TAG_PRINTER,
- "printer-state-history",
- printer->num_history, NULL);
+ /*
+ * Send the attributes...
+ */
- for (i = 0; i < printer->num_history; i ++)
- copy_attrs(history->values[i].collection = ippNew(), printer->history[i],
- NULL, IPP_TAG_ZERO, 0);
- }
+ ra = create_requested_array(con->request);
+
+ copy_printer_attrs(con, printer, ra);
+
+ cupsArrayDelete(ra);
- con->response->request.status.status_code = requested ? IPP_OK_SUBST : IPP_OK;
+ con->response->request.status.status_code = IPP_OK;
}
int type) /* I - 0 or CUPS_PRINTER_CLASS */
{
http_status_t status; /* Policy status */
- int i; /* Looping var */
- ipp_attribute_t *requested, /* requested-attributes */
- *history, /* History collection */
- *attr; /* Current attribute */
- int need_history; /* Need to send history collection? */
- int limit; /* Maximum number of printers to return */
+ ipp_attribute_t *attr; /* Current attribute */
+ int limit; /* Max number of printers to return */
int count; /* Number of printers that match */
cupsd_printer_t *printer; /* Current printer pointer */
- time_t curtime; /* Current time */
int printer_type, /* printer-type attribute */
printer_mask; /* printer-type-mask attribute */
char *location; /* Location string */
const char *username; /* Current user */
char *first_printer_name; /* first-printer-name attribute */
- char printer_uri[HTTP_MAX_URI];
- /* Printer URI */
+ cups_array_t *ra; /* Requested attributes array */
cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_printers(%p[%d], %x)", con,
con->http.fd, type);
- if (!Printers || !cupsArrayCount(Printers))
+ /*
+ * Check policy...
+ */
+
+ if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
{
- send_ipp_status(con, IPP_NOT_FOUND, _("No destinations added."));
+ send_http_error(con, status, NULL);
return;
}
/*
- * Check policy...
+ * Check for printers...
*/
- if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+ if (!Printers || !cupsArrayCount(Printers))
{
- send_http_error(con, status);
+ send_ipp_status(con, IPP_NOT_FOUND, _("No destinations added."));
return;
}
* See if they want to limit the number of printers reported...
*/
- if ((attr = ippFindAttribute(con->request, "limit", IPP_TAG_INTEGER)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "limit",
+ IPP_TAG_INTEGER)) != NULL)
limit = attr->values[0].integer;
else
limit = 10000000;
else
username = NULL;
- requested = ippFindAttribute(con->request, "requested-attributes",
- IPP_TAG_KEYWORD);
-
- need_history = 0;
-
- if (MaxPrinterHistory > 0 && requested)
- {
- for (i = 0; i < requested->num_values; i ++)
- if (!strcmp(requested->values[i].string.text, "all") ||
- !strcmp(requested->values[i].string.text, "printer-state-history"))
- {
- need_history = 1;
- break;
- }
- }
+ ra = create_requested_array(con->request);
/*
* OK, build a list of printers for this printer...
*/
- curtime = time(NULL);
-
if (first_printer_name)
{
if ((printer = cupsdFindDest(first_printer_name)) == NULL)
printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
for (count = 0;
- count < limit && printer != NULL;
+ count < limit && printer;
printer = (cupsd_printer_t *)cupsArrayNext(Printers))
+ {
if ((!type || (printer->type & CUPS_PRINTER_CLASS) == type) &&
(printer->type & printer_mask) == printer_type &&
- (location == NULL || printer->location == NULL ||
+ (!location || !printer->location ||
!strcasecmp(printer->location, location)))
{
/*
count ++;
/*
- * Send the following attributes for each printer:
- *
- * printer-state
- * printer-state-message
- * printer-is-accepting-jobs
- * printer-is-shared
- * printer-up-time
- * printer-state-change-time
- * + all printer attributes
+ * Send the attributes...
*/
- if (!ippFindAttribute(printer->attrs, "printer-uri-supported",
- IPP_TAG_URI))
- {
- httpAssembleURIf(printer_uri, sizeof(printer_uri), "ipp", NULL,
- con->servername, con->serverport, "/printers/%s",
- printer->name);
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_URI,
- "printer-uri-supported", NULL, printer_uri);
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "printer-uri-supported=\"%s\"", printer_uri);
- }
-
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_ENUM,
- "printer-state", printer->state);
-
- add_printer_state_reasons(con, printer);
-
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_TEXT,
- "printer-state-message", NULL, printer->state_message);
-
- ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-accepting-jobs",
- printer->accepting);
- ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-shared",
- printer->shared);
-
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
- "printer-up-time", curtime);
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
- "printer-state-change-time", printer->state_time);
- ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
- ippTimeToDate(curtime));
-
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
- "printer-error-policy", NULL, printer->error_policy);
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
- "printer-op-policy", NULL, printer->op_policy);
-
- add_queued_job_count(con, printer);
-
- copy_attrs(con->response, printer->attrs, requested, IPP_TAG_ZERO, 0);
-
- copy_attrs(con->response, CommonData, requested, IPP_TAG_ZERO,
- IPP_TAG_COPY);
-
- if (need_history && printer->num_history > 0)
- {
- history = ippAddCollections(con->response, IPP_TAG_PRINTER,
- "printer-state-history",
- printer->num_history, NULL);
-
- for (i = 0; i < printer->num_history; i ++)
- copy_attrs(history->values[i].collection = ippNew(),
- printer->history[i], NULL, IPP_TAG_ZERO, 0);
- }
+ copy_printer_attrs(con, printer, ra);
}
+ }
+
+ cupsArrayDelete(ra);
- con->response->request.status.status_code = requested ? IPP_OK_SUBST : IPP_OK;
+ con->response->request.status.status_code = IPP_OK;
}
DefaultPolicyPtr,
con, sub->owner)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, sub->dest);
return;
}
cupsd_subscription_t *sub; /* Subscription */
cups_array_t *ra; /* Requested attributes array */
ipp_attribute_t *attr; /* Attribute */
- cups_ptype_t dtype; /* Destination type (printer or class) */
- char method[HTTP_MAX_URI],
- /* Method portion of URI */
+ cups_ptype_t dtype; /* Destination type (printer/class) */
+ char scheme[HTTP_MAX_URI],
+ /* Scheme portion of URI */
username[HTTP_MAX_URI],
/* Username portion of URI */
host[HTTP_MAX_URI],
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, scheme,
+ sizeof(scheme), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if (!strcmp(resource, "/") ||
(!strncmp(resource, "/jobs", 5) && strlen(resource) <= 6) ||
return;
}
}
- else if (!cupsdValidateDest(host, resource, &dtype, &printer))
+ else if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer))
{
/*
* Bad URI...
DefaultPolicyPtr,
con, NULL)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, printer);
return;
}
ra = create_requested_array(con->request);
- if ((attr = ippFindAttribute(con->request, "limit", IPP_TAG_INTEGER)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "limit",
+ IPP_TAG_INTEGER)) != NULL)
limit = attr->values[0].integer;
else
limit = 0;
if ((attr = ippFindAttribute(con->request, "my-subscriptions",
IPP_TAG_BOOLEAN)) != NULL &&
attr->values[0].boolean)
- {
- if (con->username[0])
- strlcpy(username, con->username, sizeof(username));
- else if ((attr = ippFindAttribute(con->request, "requesting-user-name", IPP_TAG_NAME)) != NULL)
- strlcpy(username, attr->values[0].string.text, sizeof(username));
- else
- strcpy(username, "anonymous");
- }
+ strlcpy(username, get_username(con), sizeof(username));
else
username[0] = '\0';
/*
- * 'hold_job()' - Hold a print job.
+ * 'get_username()' - Get the username associated with a request.
*/
-static void
-hold_job(cupsd_client_t *con, /* I - Client connection */
- ipp_attribute_t *uri) /* I - Job or Printer URI */
+static const char * /* O - Username */
+get_username(cupsd_client_t *con) /* I - Connection */
{
- ipp_attribute_t *attr, /* Current job-hold-until */
- *newattr; /* New job-hold-until */
- int jobid; /* Job ID */
- char method[HTTP_MAX_URI], /* Method portion of URI */
- username[HTTP_MAX_URI], /* Username portion of URI */
- host[HTTP_MAX_URI], /* Host portion of URI */
- resource[HTTP_MAX_URI]; /* Resource portion of URI */
- int port; /* Port portion of URI */
- cupsd_job_t *job; /* Job information */
-
-
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "hold_job(%p[%d], %s)", con, con->http.fd,
- uri->values[0].string.text);
-
- /*
- * See if we have a job URI or a printer URI...
- */
-
- if (!strcmp(uri->name, "printer-uri"))
- {
- /*
- * Got a printer URI; see if we also have a job-id attribute...
- */
+ ipp_attribute_t *attr; /* Attribute */
- if ((attr = ippFindAttribute(con->request, "job-id", IPP_TAG_INTEGER)) == NULL)
- {
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("Got a printer-uri attribute but no job-id!"));
- return;
- }
- jobid = attr->values[0].integer;
- }
+ if (con->username[0])
+ return (con->username);
+ else if ((attr = ippFindAttribute(con->request, "requesting-user-name",
+ IPP_TAG_NAME)) != NULL)
+ return (attr->values[0].string.text);
else
- {
- /*
- * Got a job URI; parse it to get the job ID...
- */
-
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
-
- if (strncmp(resource, "/jobs/", 6))
- {
- /*
- * Not a valid URI!
- */
-
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("Bad job-uri attribute \"%s\"!"),
- uri->values[0].string.text);
- return;
- }
-
- jobid = atoi(resource + 6);
- }
-
- /*
- * See if the job exists...
- */
-
- if ((job = cupsdFindJob(jobid)) == NULL)
- {
- /*
- * Nope - return a "not found" error...
- */
-
- send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid);
- return;
- }
-
- /*
- * See if the job is owned by the requesting user...
- */
-
- if (!validate_user(job, con, job->username, username, sizeof(username)))
- {
- send_ipp_status(con, IPP_FORBIDDEN,
- _("Not authorized to hold job #%d owned by \"%s\"!"),
- jobid, job->username);
- return;
- }
-
- /*
- * Hold the job and return...
- */
-
- cupsdHoldJob(job);
-
- if ((newattr = ippFindAttribute(con->request, "job-hold-until",
- IPP_TAG_KEYWORD)) == NULL)
- newattr = ippFindAttribute(con->request, "job-hold-until", IPP_TAG_NAME);
-
- if ((attr = ippFindAttribute(job->attrs, "job-hold-until",
- IPP_TAG_KEYWORD)) == NULL)
- attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
-
- if (attr != NULL)
- {
- /*
- * Free the old hold value and copy the new one over...
- */
-
- free(attr->values[0].string.text);
-
- if (newattr != NULL)
- {
- attr->value_tag = newattr->value_tag;
- attr->values[0].string.text = strdup(newattr->values[0].string.text);
- }
- else
- {
- attr->value_tag = IPP_TAG_KEYWORD;
- attr->values[0].string.text = strdup("indefinite");
- }
-
- /*
- * Hold job until specified time...
- */
-
- cupsdSetJobHoldUntil(job, attr->values[0].string.text);
- }
-
- cupsdLogMessage(CUPSD_LOG_INFO, "Job %d was held by \"%s\".", jobid, username);
-
- con->response->request.status.status_code = IPP_OK;
+ return ("anonymous");
}
/*
- * 'move_job()' - Move a job to a new destination.
+ * 'hold_job()' - Hold a print job.
*/
static void
-move_job(cupsd_client_t *con, /* I - Client connection */
- ipp_attribute_t *uri) /* I - Job URI */
+hold_job(cupsd_client_t *con, /* I - Client connection */
+ ipp_attribute_t *uri) /* I - Job or Printer URI */
{
- http_status_t status; /* Policy status */
- ipp_attribute_t *attr; /* Current attribute */
+ ipp_attribute_t *attr, /* Current job-hold-until */
+ *newattr; /* New job-hold-until */
int jobid; /* Job ID */
- cupsd_job_t *job; /* Current job */
- const char *dest; /* Destination */
- cups_ptype_t dtype; /* Destination type (printer or class) */
char method[HTTP_MAX_URI], /* Method portion of URI */
username[HTTP_MAX_URI], /* Username portion of URI */
host[HTTP_MAX_URI], /* Host portion of URI */
resource[HTTP_MAX_URI]; /* Resource portion of URI */
int port; /* Port portion of URI */
- cupsd_printer_t *printer; /* Printer */
+ cupsd_job_t *job; /* Job information */
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "move_job(%p[%d], %s)", con, con->http.fd,
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "hold_job(%p[%d], %s)", con, con->http.fd,
uri->values[0].string.text);
/*
* See if we have a job URI or a printer URI...
*/
- if (strcmp(uri->name, "printer-uri") == 0)
+ if (!strcmp(uri->name, "printer-uri"))
{
/*
* Got a printer URI; see if we also have a job-id attribute...
*/
- if ((attr = ippFindAttribute(con->request, "job-id", IPP_TAG_INTEGER)) == NULL)
+ if ((attr = ippFindAttribute(con->request, "job-id",
+ IPP_TAG_INTEGER)) == NULL)
{
send_ipp_status(con, IPP_BAD_REQUEST,
_("Got a printer-uri attribute but no job-id!"));
* Got a job URI; parse it to get the job ID...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if (strncmp(resource, "/jobs/", 6))
{
if ((job = cupsdFindJob(jobid)) == NULL)
{
/*
- * Nope - return a "not found" error...
- */
-
- send_ipp_status(con, IPP_NOT_FOUND,
- _("Job #%d does not exist!"), jobid);
- return;
- }
-
- /*
- * See if the job has been completed...
- */
-
- if (job->state->values[0].integer > IPP_JOB_STOPPED)
- {
- /*
- * Return a "not-possible" error...
- */
-
- send_ipp_status(con, IPP_NOT_POSSIBLE,
- _("Job #%d is finished and cannot be altered!"),
- jobid);
- return;
- }
-
- /*
- * See if the job is owned by the requesting user...
- */
-
- if (!validate_user(job, con, job->username, username, sizeof(username)))
- {
- send_ipp_status(con, IPP_FORBIDDEN,
- _("You are not authorized to move job #%d owned "
- "by \"%s\"!"),
- jobid, job->username);
- return;
- }
-
- if ((attr = ippFindAttribute(con->request, "job-printer-uri", IPP_TAG_URI)) == NULL)
- {
- /*
- * Need job-printer-uri...
- */
-
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("job-printer-uri attribute missing!"));
- return;
- }
-
- /*
- * Get the new printer or class...
- */
-
- httpSeparateURI(attr->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
-
- if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
- {
- /*
- * Bad URI...
+ * Nope - return a "not found" error...
*/
- send_ipp_status(con, IPP_NOT_FOUND,
- _("The printer or class was not found."));
+ send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid);
return;
}
/*
- * Check policy...
+ * See if the job is owned by the requesting user...
*/
- if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
+ if (!validate_user(job, con, job->username, username, sizeof(username)))
{
- send_http_error(con, status);
+ send_http_error(con, HTTP_UNAUTHORIZED, NULL);
return;
}
/*
- * Move the job to a different printer or class...
- */
-
- cupsdMoveJob(job, dest);
-
- /*
- * Start jobs if possible...
- */
-
- cupsdCheckJobs();
-
- /*
- * Return with "everything is OK" status...
+ * Hold the job and return...
*/
- con->response->request.status.status_code = IPP_OK;
-}
+ cupsdHoldJob(job);
+ cupsdAddEvent(CUPSD_EVENT_JOB_STATE, job->printer, job,
+ "Job held by user.");
-/*
- * 'ppd_add_default()' - Add a PPD default choice.
- */
+ if ((newattr = ippFindAttribute(con->request, "job-hold-until",
+ IPP_TAG_KEYWORD)) == NULL)
+ newattr = ippFindAttribute(con->request, "job-hold-until", IPP_TAG_NAME);
-static int /* O - Number of defaults */
-ppd_add_default(
- const char *option, /* I - Option name */
- const char *choice, /* I - Choice name */
- int num_defaults, /* I - Number of defaults */
- ppd_default_t **defaults) /* IO - Defaults */
-{
- int i; /* Looping var */
- ppd_default_t *temp; /* Temporary defaults array */
+ if ((attr = ippFindAttribute(job->attrs, "job-hold-until",
+ IPP_TAG_KEYWORD)) == NULL)
+ attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
+ if (attr)
+ {
+ /*
+ * Free the old hold value and copy the new one over...
+ */
- /*
- * First check if the option already has a default value; the PPD spec
- * says that the first one is used...
- */
+ _cupsStrFree(attr->values[0].string.text);
- for (i = 0, temp = *defaults; i < num_defaults; i ++)
- if (!strcmp(option, temp[i].option))
- return (num_defaults);
+ if (newattr)
+ {
+ attr->value_tag = newattr->value_tag;
+ attr->values[0].string.text =
+ _cupsStrAlloc(newattr->values[0].string.text);
+ }
+ else
+ {
+ attr->value_tag = IPP_TAG_KEYWORD;
+ attr->values[0].string.text = _cupsStrAlloc("indefinite");
+ }
- /*
- * Now add the option...
- */
+ /*
+ * Hold job until specified time...
+ */
- if (num_defaults == 0)
- temp = malloc(sizeof(ppd_default_t));
- else
- temp = realloc(*defaults, (num_defaults + 1) * sizeof(ppd_default_t));
+ cupsdSetJobHoldUntil(job, attr->values[0].string.text);
- if (!temp)
- {
- cupsdLogMessage(CUPSD_LOG_ERROR, "ppd_add_default: Unable to add default value for \"%s\" - %s",
- option, strerror(errno));
- return (num_defaults);
+ cupsdAddEvent(CUPSD_EVENT_JOB_CONFIG_CHANGED, job->printer, job,
+ "Job job-hold-until value changed by user.");
}
- *defaults = temp;
- temp += num_defaults;
-
- strlcpy(temp->option, option, sizeof(temp->option));
- strlcpy(temp->choice, choice, sizeof(temp->choice));
+ cupsdLogMessage(CUPSD_LOG_INFO, "[Job %d] Held by \"%s\".", jobid,
+ username);
- return (num_defaults + 1);
+ con->response->request.status.status_code = IPP_OK;
}
/*
- * 'ppd_parse_line()' - Parse a PPD default line.
+ * 'move_job()' - Move a job to a new destination.
*/
-static int /* O - 0 on success, -1 on failure */
-ppd_parse_line(const char *line, /* I - Line */
- char *option, /* O - Option name */
- int olen, /* I - Size of option name */
- char *choice, /* O - Choice name */
- int clen) /* I - Size of choice name */
+static void
+move_job(cupsd_client_t *con, /* I - Client connection */
+ ipp_attribute_t *uri) /* I - Job URI */
{
- /*
- * Verify this is a default option line...
- */
-
- if (strncmp(line, "*Default", 8))
- return (-1);
-
- /*
- * Read the option name...
- */
+ http_status_t status; /* Policy status */
+ ipp_attribute_t *attr; /* Current attribute */
+ int jobid; /* Job ID */
+ cupsd_job_t *job; /* Current job */
+ const char *src; /* Source printer/class */
+ cups_ptype_t stype, /* Source type (printer or class) */
+ dtype; /* Destination type (printer/class) */
+ char scheme[HTTP_MAX_URI], /* Scheme portion of URI */
+ username[HTTP_MAX_URI], /* Username portion of URI */
+ host[HTTP_MAX_URI], /* Host portion of URI */
+ resource[HTTP_MAX_URI]; /* Resource portion of URI */
+ int port; /* Port portion of URI */
+ cupsd_printer_t *sprinter, /* Source printer */
+ *dprinter; /* Destination printer */
- for (line += 8, olen --; isalnum(*line & 255); line ++)
- if (olen > 0)
- {
- *option++ = *line;
- olen --;
- }
- *option = '\0';
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "move_job(%p[%d], %s)", con, con->http.fd,
+ uri->values[0].string.text);
/*
- * Skip everything else up to the colon (:)...
+ * Get the new printer or class...
*/
- while (*line && *line != ':')
- line ++;
+ if ((attr = ippFindAttribute(con->request, "job-printer-uri",
+ IPP_TAG_URI)) == NULL)
+ {
+ /*
+ * Need job-printer-uri...
+ */
- if (!*line)
- return (-1);
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("job-printer-uri attribute missing!"));
+ return;
+ }
- line ++;
+ if (!cupsdValidateDest(attr->values[0].string.text, &dtype, &dprinter))
+ {
+ /*
+ * Bad URI...
+ */
+
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("The printer or class was not found."));
+ return;
+ }
/*
- * Now grab the option choice, skipping leading whitespace...
+ * Check policy...
*/
- while (isspace(*line & 255))
- line ++;
-
- for (clen --; isalnum(*line & 255); line ++)
- if (clen > 0)
- {
- *choice++ = *line;
- clen --;
- }
-
- *choice = '\0';
+ if ((status = cupsdCheckPolicy(dprinter->op_policy_ptr, con,
+ NULL)) != HTTP_OK)
+ {
+ send_http_error(con, status, dprinter);
+ return;
+ }
/*
- * Return with no errors...
+ * See if we have a job URI or a printer URI...
*/
- return (0);
-}
-
-
-/*
- * 'print_job()' - Print a file to a printer or class.
- */
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, scheme,
+ sizeof(scheme), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
-static void
-print_job(cupsd_client_t *con, /* I - Client connection */
- ipp_attribute_t *uri) /* I - Printer URI */
-{
- http_status_t status; /* Policy status */
- ipp_attribute_t *attr; /* Current attribute */
- ipp_attribute_t *format; /* Document-format attribute */
- const char *dest; /* Destination */
- cups_ptype_t dtype; /* Destination type (printer or class) */
- int priority; /* Job priority */
- char *title; /* Job name/title */
- cupsd_job_t *job; /* Current job */
- char job_uri[HTTP_MAX_URI], /* Job URI */
- method[HTTP_MAX_URI], /* Method portion of URI */
- username[HTTP_MAX_URI], /* Username portion of URI */
- host[HTTP_MAX_URI], /* Host portion of URI */
- resource[HTTP_MAX_URI], /* Resource portion of URI */
- filename[1024]; /* Job filename */
- int port; /* Port portion of URI */
- mime_type_t *filetype; /* Type of file */
- char super[MIME_MAX_SUPER], /* Supertype of file */
- type[MIME_MAX_TYPE], /* Subtype of file */
- mimetype[MIME_MAX_SUPER + MIME_MAX_TYPE + 2];
- /* Textual name of mime type */
- cupsd_printer_t *printer; /* Printer data */
- struct stat fileinfo; /* File information */
- int kbytes; /* Size of file */
- int i; /* Looping var */
- int lowerpagerange; /* Page range bound */
- int compression; /* Document compression */
+ if (!strcmp(uri->name, "printer-uri"))
+ {
+ /*
+ * Got a printer URI; see if we also have a job-id attribute...
+ */
+ if ((attr = ippFindAttribute(con->request, "job-id",
+ IPP_TAG_INTEGER)) == NULL)
+ {
+ /*
+ * Move all jobs...
+ */
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "print_job(%p[%d], %s)", con, con->http.fd,
- uri->values[0].string.text);
+ if ((src = cupsdValidateDest(uri->values[0].string.text, &stype,
+ &sprinter)) == NULL)
+ {
+ /*
+ * Bad URI...
+ */
- /*
- * Validate job template attributes; for now just copies and page-ranges...
- */
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("The printer or class was not found."));
+ return;
+ }
- if ((attr = ippFindAttribute(con->request, "copies", IPP_TAG_INTEGER)) != NULL)
- {
- if (attr->values[0].integer < 1 || attr->values[0].integer > MaxCopies)
- {
- send_ipp_status(con, IPP_ATTRIBUTES, _("Bad copies value %d."),
- attr->values[0].integer);
- ippAddInteger(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_INTEGER,
- "copies", attr->values[0].integer);
- return;
+ job = NULL;
}
- }
-
- if ((attr = ippFindAttribute(con->request, "page-ranges", IPP_TAG_RANGE)) != NULL)
- {
- for (i = 0, lowerpagerange = 1; i < attr->num_values; i ++)
+ else
{
- if (attr->values[i].range.lower < lowerpagerange ||
- attr->values[i].range.lower > attr->values[i].range.upper)
+ /*
+ * Otherwise, just move a single job...
+ */
+
+ if ((job = cupsdFindJob(attr->values[0].integer)) == NULL)
{
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("Bad page-ranges values %d-%d."),
- attr->values[i].range.lower,
- attr->values[i].range.upper);
+ /*
+ * Nope - return a "not found" error...
+ */
+
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("Job #%d does not exist!"), attr->values[0].integer);
return;
}
+ else
+ {
+ /*
+ * Job found, initialize source pointers...
+ */
- lowerpagerange = attr->values[i].range.upper + 1;
+ src = NULL;
+ sprinter = NULL;
+ }
}
}
+ else
+ {
+ /*
+ * Got a job URI; parse it to get the job ID...
+ */
- /*
- * OK, see if the client is sending the document compressed - CUPS
- * only supports "none" and "gzip".
- */
+ if (strncmp(resource, "/jobs/", 6))
+ {
+ /*
+ * Not a valid URI!
+ */
- compression = CUPS_FILE_NONE;
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("Bad job-uri attribute \"%s\"!"),
+ uri->values[0].string.text);
+ return;
+ }
- if ((attr = ippFindAttribute(con->request, "compression", IPP_TAG_KEYWORD)) != NULL)
- {
- if (strcmp(attr->values[0].string.text, "none")
-#ifdef HAVE_LIBZ
- && strcmp(attr->values[0].string.text, "gzip")
-#endif /* HAVE_LIBZ */
- )
+ /*
+ * See if the job exists...
+ */
+
+ jobid = atoi(resource + 6);
+
+ if ((job = cupsdFindJob(jobid)) == NULL)
{
- send_ipp_status(con, IPP_ATTRIBUTES,
- _("Unsupported compression \"%s\"!"),
- attr->values[0].string.text);
- ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_KEYWORD,
- "compression", NULL, attr->values[0].string.text);
+ /*
+ * Nope - return a "not found" error...
+ */
+
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("Job #%d does not exist!"), jobid);
return;
}
+ else
+ {
+ /*
+ * Job found, initialize source pointers...
+ */
-#ifdef HAVE_LIBZ
- if (!strcmp(attr->values[0].string.text, "gzip"))
- compression = CUPS_FILE_GZIP;
-#endif /* HAVE_LIBZ */
+ src = NULL;
+ sprinter = NULL;
+ }
}
/*
- * Do we have a file to print?
+ * Now move the job or jobs...
*/
- if (!con->filename)
+ if (job)
{
- send_ipp_status(con, IPP_BAD_REQUEST, _("No file!?!"));
- return;
- }
+ /*
+ * See if the job has been completed...
+ */
- /*
- * Is it a format we support?
- */
+ if (job->state_value > IPP_JOB_STOPPED)
+ {
+ /*
+ * Return a "not-possible" error...
+ */
+
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("Job #%d is finished and cannot be altered!"),
+ job->id);
+ return;
+ }
- if ((format = ippFindAttribute(con->request, "document-format",
- IPP_TAG_MIMETYPE)) != NULL)
- {
/*
- * Grab format from client...
+ * See if the job is owned by the requesting user...
*/
- if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]", super, type) != 2)
+ if (!validate_user(job, con, job->username, username, sizeof(username)))
{
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("Could not scan type \"%s\"!"),
- format->values[0].string.text);
+ send_http_error(con, HTTP_UNAUTHORIZED, NULL);
return;
}
- }
- else
- {
+
/*
- * No document format attribute? Auto-type it!
+ * Move the job to a different printer or class...
*/
- strcpy(super, "application");
- strcpy(type, "octet-stream");
+ cupsdMoveJob(job, dprinter);
}
-
- if (!strcmp(super, "application") && !strcmp(type, "octet-stream"))
+ else
{
/*
- * Auto-type the file...
+ * Got the source printer, now look through the jobs...
*/
- cupsdLogMessage(CUPSD_LOG_DEBUG, "print_job: auto-typing file...");
-
- filetype = mimeFileType(MimeDatabase, con->filename, &compression);
-
- if (filetype != NULL)
+ for (job = (cupsd_job_t *)cupsArrayFirst(Jobs);
+ job;
+ job = (cupsd_job_t *)cupsArrayNext(Jobs))
{
/*
- * Replace the document-format attribute value with the auto-typed one.
+ * See if the job is pointing at the source printer or has not been
+ * completed...
*/
- snprintf(mimetype, sizeof(mimetype), "%s/%s", filetype->super,
- filetype->type);
+ if (strcasecmp(job->dest, src) ||
+ job->state_value > IPP_JOB_STOPPED)
+ continue;
- if (format != NULL)
- {
- free(format->values[0].string.text);
- format->values[0].string.text = strdup(mimetype);
- }
- else
- ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_MIMETYPE,
- "document-format", NULL, mimetype);
- }
- else
- filetype = mimeType(MimeDatabase, super, type);
- }
- else
- filetype = mimeType(MimeDatabase, super, type);
+ /*
+ * See if the job can be moved by the requesting user...
+ */
- if (filetype == NULL)
- {
- send_ipp_status(con, IPP_DOCUMENT_FORMAT,
- _("Unsupported format \'%s/%s\'!"), super, type);
- cupsdLogMessage(CUPSD_LOG_INFO,
- "Hint: Do you have the raw file printing rules enabled?");
+ if (!validate_user(job, con, job->username, username, sizeof(username)))
+ continue;
- if (format)
- ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_MIMETYPE,
- "document-format", NULL, format->values[0].string.text);
+ /*
+ * Move the job to a different printer or class...
+ */
- return;
+ cupsdMoveJob(job, dprinter);
+ }
}
- cupsdLogMessage(CUPSD_LOG_DEBUG, "print_job: request file type is %s/%s.",
- filetype->super, filetype->type);
-
/*
- * Read any embedded job ticket info from PS files...
+ * Start jobs if possible...
*/
- if (!strcasecmp(filetype->super, "application") &&
- !strcasecmp(filetype->type, "postscript"))
- read_ps_job_ticket(con);
+ cupsdCheckJobs();
/*
- * Is the destination valid?
+ * Return with "everything is OK" status...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ con->response->request.status.status_code = IPP_OK;
+}
- if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
- {
- /*
- * Bad URI...
- */
- send_ipp_status(con, IPP_NOT_FOUND,
- _("The printer or class was not found."));
- return;
- }
+/*
+ * 'ppd_parse_line()' - Parse a PPD default line.
+ */
+static int /* O - 0 on success, -1 on failure */
+ppd_parse_line(const char *line, /* I - Line */
+ char *option, /* O - Option name */
+ int olen, /* I - Size of option name */
+ char *choice, /* O - Choice name */
+ int clen) /* I - Size of choice name */
+{
/*
- * Check remote printing to non-shared printer...
+ * Verify this is a default option line...
*/
- if (!printer->shared &&
- strcasecmp(con->http.hostname, "localhost") &&
- strcasecmp(con->http.hostname, ServerName))
- {
- send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Printer not shared!"));
- return;
- }
+ if (strncmp(line, "*Default", 8))
+ return (-1);
/*
- * Check policy...
+ * Read the option name...
*/
- if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
- {
- send_http_error(con, status);
- return;
- }
- else if ((printer->type & CUPS_PRINTER_AUTHENTICATED) && !con->username[0])
- {
- send_http_error(con, status);
- return;
- }
-
- /*
- * See if the printer is accepting jobs...
- */
+ for (line += 8, olen --; isalnum(*line & 255); line ++)
+ if (olen > 0)
+ {
+ *option++ = *line;
+ olen --;
+ }
- if (!printer->accepting)
- {
- send_ipp_status(con, IPP_NOT_ACCEPTING,
- _("Destination \"%s\" is not accepting jobs."), dest);
- return;
- }
+ *option = '\0';
/*
- * Make sure we aren't over our limit...
+ * Skip everything else up to the colon (:)...
*/
- if (cupsArrayCount(Jobs) >= MaxJobs && MaxJobs)
- cupsdCleanJobs();
+ while (*line && *line != ':')
+ line ++;
- if (cupsArrayCount(Jobs) >= MaxJobs && MaxJobs)
- {
- send_ipp_status(con, IPP_NOT_POSSIBLE,
- _("Too many jobs - %d jobs, max jobs is %d."),
- cupsArrayCount(Jobs), MaxJobs);
- return;
- }
+ if (!*line)
+ return (-1);
- if (!check_quotas(con, printer))
- {
- send_ipp_status(con, IPP_NOT_POSSIBLE, _("Quota limit reached."));
- return;
- }
+ line ++;
/*
- * Create the job and set things up...
+ * Now grab the option choice, skipping leading whitespace...
*/
- if ((attr = ippFindAttribute(con->request, "job-priority", IPP_TAG_INTEGER)) != NULL)
- priority = attr->values[0].integer;
- else
- ippAddInteger(con->request, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-priority",
- priority = 50);
-
- if ((attr = ippFindAttribute(con->request, "job-name", IPP_TAG_NAME)) != NULL)
- title = attr->values[0].string.text;
- else
- ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
- title = "Untitled");
+ while (isspace(*line & 255))
+ line ++;
- if ((job = cupsdAddJob(priority, printer->name)) == NULL)
- {
- send_ipp_status(con, IPP_INTERNAL_ERROR,
- _("Unable to add job for destination \"%s\"!"), dest);
- return;
- }
+ for (clen --; isalnum(*line & 255); line ++)
+ if (clen > 0)
+ {
+ *choice++ = *line;
+ clen --;
+ }
- job->dtype = dtype;
- job->attrs = con->request;
- con->request = NULL;
+ *choice = '\0';
/*
- * Copy the rest of the job info...
+ * Return with no errors...
*/
- attr = ippFindAttribute(job->attrs, "requesting-user-name", IPP_TAG_NAME);
-
- if (con->username[0])
- {
- cupsdSetString(&job->username, con->username);
-
- if (attr)
- cupsdSetString(&attr->values[0].string.text, con->username);
-
- save_auth_info(con, job);
- }
- else if (attr != NULL)
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG, "print_job: requesting-user-name = \"%s\"",
- attr->values[0].string.text);
-
- cupsdSetString(&job->username, attr->values[0].string.text);
- }
- else
- cupsdSetString(&job->username, "anonymous");
-
- if (attr == NULL)
- ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME,
- "job-originating-user-name", NULL, job->username);
- else
- {
- attr->group_tag = IPP_TAG_JOB;
- cupsdSetString(&attr->name, "job-originating-user-name");
- }
-
- /*
- * Add remaining job attributes...
- */
+ return (0);
+}
- if ((attr = ippFindAttribute(job->attrs, "job-originating-host-name",
- IPP_TAG_ZERO)) != NULL)
- {
- /*
- * Request contains a job-originating-host-name attribute; validate it...
- */
- if (attr->value_tag != IPP_TAG_NAME ||
- attr->num_values != 1 ||
- strcmp(con->http.hostname, "localhost") != 0)
- {
- /*
- * Can't override the value if we aren't connected via localhost.
- * Also, we can only have 1 value and it must be a name value.
- */
+/*
+ * 'print_job()' - Print a file to a printer or class.
+ */
- switch (attr->value_tag)
- {
- case IPP_TAG_STRING :
- case IPP_TAG_TEXTLANG :
- case IPP_TAG_NAMELANG :
- case IPP_TAG_TEXT :
- case IPP_TAG_NAME :
- case IPP_TAG_KEYWORD :
- case IPP_TAG_URI :
- case IPP_TAG_URISCHEME :
- case IPP_TAG_CHARSET :
- case IPP_TAG_LANGUAGE :
- case IPP_TAG_MIMETYPE :
- /*
- * Free old strings...
- */
+static void
+print_job(cupsd_client_t *con, /* I - Client connection */
+ ipp_attribute_t *uri) /* I - Printer URI */
+{
+ ipp_attribute_t *attr; /* Current attribute */
+ ipp_attribute_t *format; /* Document-format attribute */
+ const char *default_format; /* document-format-default value */
+ cupsd_job_t *job; /* New job */
+ char filename[1024]; /* Job filename */
+ mime_type_t *filetype; /* Type of file */
+ char super[MIME_MAX_SUPER], /* Supertype of file */
+ type[MIME_MAX_TYPE], /* Subtype of file */
+ mimetype[MIME_MAX_SUPER + MIME_MAX_TYPE + 2];
+ /* Textual name of mime type */
+ cupsd_printer_t *printer; /* Printer data */
+ struct stat fileinfo; /* File information */
+ int kbytes; /* Size of file */
+ int compression; /* Document compression */
- for (i = 0; i < attr->num_values; i ++)
- {
- free(attr->values[i].string.text);
- attr->values[i].string.text = NULL;
- if (attr->values[i].string.charset)
- {
- free(attr->values[i].string.charset);
- attr->values[i].string.charset = NULL;
- }
- }
- default :
- break;
- }
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "print_job(%p[%d], %s)", con, con->http.fd,
+ uri->values[0].string.text);
- /*
- * Use the default connection hostname instead...
- */
+ /*
+ * Validate print file attributes, for now just document-format and
+ * compression (CUPS only supports "none" and "gzip")...
+ */
- attr->value_tag = IPP_TAG_NAME;
- attr->num_values = 1;
- attr->values[0].string.text = strdup(con->http.hostname);
- }
+ compression = CUPS_FILE_NONE;
- attr->group_tag = IPP_TAG_JOB;
- }
- else
+ if ((attr = ippFindAttribute(con->request, "compression",
+ IPP_TAG_KEYWORD)) != NULL)
{
- /*
- * No job-originating-host-name attribute, so use the hostname from
- * the connection...
- */
+ if (strcmp(attr->values[0].string.text, "none")
+#ifdef HAVE_LIBZ
+ && strcmp(attr->values[0].string.text, "gzip")
+#endif /* HAVE_LIBZ */
+ )
+ {
+ send_ipp_status(con, IPP_ATTRIBUTES,
+ _("Unsupported compression \"%s\"!"),
+ attr->values[0].string.text);
+ ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_KEYWORD,
+ "compression", NULL, attr->values[0].string.text);
+ return;
+ }
- ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME,
- "job-originating-host-name", NULL, con->http.hostname);
+#ifdef HAVE_LIBZ
+ if (!strcmp(attr->values[0].string.text, "gzip"))
+ compression = CUPS_FILE_GZIP;
+#endif /* HAVE_LIBZ */
}
- ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-id", job->id);
- job->state = ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_ENUM,
- "job-state", IPP_JOB_PENDING);
- job->sheets = ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER,
- "job-media-sheets-completed", 0);
- ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_URI, "job-printer-uri", NULL,
- printer->uri);
- ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
- title);
-
- if ((attr = ippFindAttribute(job->attrs, "job-k-octets", IPP_TAG_INTEGER)) == NULL)
- attr = ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER,
- "job-k-octets", 0);
-
- if (stat(con->filename, &fileinfo))
- kbytes = 0;
- else
- kbytes = (fileinfo.st_size + 1023) / 1024;
-
- cupsdUpdateQuota(printer, job->username, 0, kbytes);
- attr->values[0].integer += kbytes;
+ /*
+ * Do we have a file to print?
+ */
- ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER, "time-at-creation",
- time(NULL));
- attr = ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER,
- "time-at-processing", 0);
- attr->value_tag = IPP_TAG_NOVALUE;
- attr = ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER,
- "time-at-completed", 0);
- attr->value_tag = IPP_TAG_NOVALUE;
+ if (!con->filename)
+ {
+ send_ipp_status(con, IPP_BAD_REQUEST, _("No file!?!"));
+ return;
+ }
- if ((attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_KEYWORD)) == NULL)
- attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
- if (attr == NULL)
- attr = ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_KEYWORD,
- "job-hold-until", NULL, "no-hold");
+ /*
+ * Is the destination valid?
+ */
- if (attr != NULL && strcmp(attr->values[0].string.text, "no-hold") != 0 &&
- !(printer->type & CUPS_PRINTER_REMOTE))
+ if (!cupsdValidateDest(uri->values[0].string.text, NULL, &printer))
{
/*
- * Hold job until specified time...
+ * Bad URI...
*/
- job->state->values[0].integer = IPP_JOB_HELD;
- cupsdSetJobHoldUntil(job, attr->values[0].string.text);
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("The printer or class was not found."));
+ return;
}
- if (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)) ||
- Classification)
+ /*
+ * Is it a format we support?
+ */
+
+ if ((format = ippFindAttribute(con->request, "document-format",
+ IPP_TAG_MIMETYPE)) != NULL)
{
/*
- * Add job sheets options...
+ * Grab format from client...
*/
- if ((attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_ZERO)) == NULL)
+ if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]", super,
+ type) != 2)
{
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "Adding default job-sheets values \"%s,%s\"...",
- printer->job_sheets[0], printer->job_sheets[1]);
-
- attr = ippAddStrings(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME, "job-sheets",
- 2, NULL, NULL);
- attr->values[0].string.text = strdup(printer->job_sheets[0]);
- attr->values[1].string.text = strdup(printer->job_sheets[1]);
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("Could not scan type \"%s\"!"),
+ format->values[0].string.text);
+ return;
}
-
- job->job_sheets = attr;
-
+ }
+ else if ((default_format = cupsGetOption("document-format",
+ printer->num_options,
+ printer->options)) != NULL)
+ {
/*
- * Enforce classification level if set...
+ * Use default document format...
*/
- if (Classification)
+ if (sscanf(default_format, "%15[^/]/%31[^;]", super, type) != 2)
{
- cupsdLogMessage(CUPSD_LOG_INFO,
- "Classification=\"%s\", ClassifyOverride=%d",
- Classification ? Classification : "(null)",
- ClassifyOverride);
-
- if (ClassifyOverride)
- {
- if (strcmp(attr->values[0].string.text, "none") == 0 &&
- (attr->num_values == 1 ||
- strcmp(attr->values[1].string.text, "none") == 0))
- {
- /*
- * Force the leading banner to have the classification on it...
- */
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("Could not scan type \"%s\"!"),
+ default_format);
+ return;
+ }
+ }
+ else
+ {
+ /*
+ * Auto-type it!
+ */
- cupsdSetString(&attr->values[0].string.text, Classification);
+ strcpy(super, "application");
+ strcpy(type, "octet-stream");
+ }
- cupsdLogMessage(CUPSD_LOG_NOTICE,
- "[Job %d] CLASSIFICATION FORCED "
- "job-sheets=\"%s,none\", "
- "job-originating-user-name=\"%s\"",
- job->id, Classification, job->username);
- }
- else if (attr->num_values == 2 &&
- strcmp(attr->values[0].string.text, attr->values[1].string.text) != 0 &&
- strcmp(attr->values[0].string.text, "none") != 0 &&
- strcmp(attr->values[1].string.text, "none") != 0)
- {
- /*
- * Can't put two different security markings on the same document!
- */
+ if (!strcmp(super, "application") && !strcmp(type, "octet-stream"))
+ {
+ /*
+ * Auto-type the file...
+ */
- cupsdSetString(&attr->values[1].string.text, attr->values[0].string.text);
+ ipp_attribute_t *doc_name; /* document-name attribute */
- cupsdLogMessage(CUPSD_LOG_NOTICE,
- "[Job %d] CLASSIFICATION FORCED "
- "job-sheets=\"%s,%s\", "
- "job-originating-user-name=\"%s\"",
- job->id, attr->values[0].string.text,
- attr->values[1].string.text, job->username);
- }
- else if (strcmp(attr->values[0].string.text, Classification) &&
- strcmp(attr->values[0].string.text, "none") &&
- (attr->num_values == 1 ||
- (strcmp(attr->values[1].string.text, Classification) &&
- strcmp(attr->values[1].string.text, "none"))))
- {
- if (attr->num_values == 1)
- cupsdLogMessage(CUPSD_LOG_NOTICE,
- "[Job %d] CLASSIFICATION OVERRIDDEN "
- "job-sheets=\"%s\", "
- "job-originating-user-name=\"%s\"",
- job->id, attr->values[0].string.text,
- job->username);
- else
- cupsdLogMessage(CUPSD_LOG_NOTICE,
- "[Job %d] CLASSIFICATION OVERRIDDEN "
- "job-sheets=\"%s,%s\", "
- "job-originating-user-name=\"%s\"",
- job->id, attr->values[0].string.text,
- attr->values[1].string.text, job->username);
- }
- }
- else if (strcmp(attr->values[0].string.text, Classification) != 0 &&
- (attr->num_values == 1 ||
- strcmp(attr->values[1].string.text, Classification) != 0))
- {
- /*
- * Force the banner to have the classification on it...
- */
- if (attr->num_values > 1 &&
- !strcmp(attr->values[0].string.text, attr->values[1].string.text))
- {
- cupsdSetString(&(attr->values[0].string.text), Classification);
- cupsdSetString(&(attr->values[1].string.text), Classification);
- }
- else
- {
- if (attr->num_values == 1 ||
- strcmp(attr->values[0].string.text, "none"))
- cupsdSetString(&(attr->values[0].string.text), Classification);
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "print_job: auto-typing file...");
- if (attr->num_values > 1 &&
- strcmp(attr->values[1].string.text, "none"))
- cupsdSetString(&(attr->values[1].string.text), Classification);
- }
+ doc_name = ippFindAttribute(con->request, "document-name", IPP_TAG_NAME);
+ filetype = mimeFileType(MimeDatabase, con->filename,
+ doc_name ? doc_name->values[0].string.text : NULL,
+ &compression);
- if (attr->num_values > 1)
- cupsdLogMessage(CUPSD_LOG_NOTICE,
- "[Job %d] CLASSIFICATION FORCED "
- "job-sheets=\"%s,%s\", "
- "job-originating-user-name=\"%s\"",
- job->id, attr->values[0].string.text,
- attr->values[1].string.text, job->username);
- else
- cupsdLogMessage(CUPSD_LOG_NOTICE,
- "[Job %d] CLASSIFICATION FORCED "
- "job-sheets=\"%s\", "
- "job-originating-user-name=\"%s\"",
- job->id, Classification, job->username);
- }
- }
+ if (!filetype)
+ filetype = mimeType(MimeDatabase, super, type);
+ }
+ else
+ filetype = mimeType(MimeDatabase, super, type);
+ if (filetype &&
+ (!format ||
+ (!strcmp(super, "application") && !strcmp(type, "octet-stream"))))
+ {
/*
- * Add the starting sheet...
+ * Replace the document-format attribute value with the auto-typed or
+ * default one.
*/
- if (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)))
- {
- cupsdLogMessage(CUPSD_LOG_INFO,
- "Adding start banner page \"%s\" to job %d.",
- attr->values[0].string.text, job->id);
+ snprintf(mimetype, sizeof(mimetype), "%s/%s", filetype->super,
+ filetype->type);
- kbytes = copy_banner(con, job, attr->values[0].string.text);
+ if (format)
+ {
+ _cupsStrFree(format->values[0].string.text);
- cupsdUpdateQuota(printer, job->username, 0, kbytes);
+ format->values[0].string.text = _cupsStrAlloc(mimetype);
}
+ else
+ ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_MIMETYPE,
+ "document-format", NULL, mimetype);
}
- else if ((attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_ZERO)) != NULL)
- job->sheets = attr;
-
- /*
- * Add the job file...
- */
-
- if (add_file(con, job, filetype, compression))
- return;
+ else if (!filetype)
+ {
+ send_ipp_status(con, IPP_DOCUMENT_FORMAT,
+ _("Unsupported format \'%s/%s\'!"), super, type);
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Hint: Do you have the raw file printing rules enabled?");
- snprintf(filename, sizeof(filename), "%s/d%05d-%03d", RequestRoot, job->id,
- job->num_files);
- rename(con->filename, filename);
- cupsdClearString(&con->filename);
+ if (format)
+ ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_MIMETYPE,
+ "document-format", NULL, format->values[0].string.text);
+
+ return;
+ }
/*
- * See if we need to add the ending sheet...
+ * Read any embedded job ticket info from PS files...
*/
- if (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)) &&
- attr->num_values > 1)
- {
- /*
- * Yes...
- */
+ if (!strcasecmp(filetype->super, "application") &&
+ !strcasecmp(filetype->type, "postscript"))
+ read_ps_job_ticket(con);
- cupsdLogMessage(CUPSD_LOG_INFO, "Adding end banner page \"%s\" to job %d.",
- attr->values[1].string.text, job->id);
+ /*
+ * Create the job object...
+ */
- kbytes = copy_banner(con, job, attr->values[1].string.text);
+ if ((job = add_job(con, printer, filetype)) == NULL)
+ return;
- cupsdUpdateQuota(printer, job->username, 0, kbytes);
- }
+ cupsdLogMessage(CUPSD_LOG_INFO, "[Job %d] Adding job file of type %s/%s.",
+ job->id, filetype->super, filetype->type);
/*
- * Fill in the response info...
+ * Update quota data...
*/
- snprintf(job_uri, sizeof(job_uri), "http://%s:%d/jobs/%d", ServerName,
- LocalPort, job->id);
-
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI, "job-uri", NULL,
- job_uri);
-
- ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-id", job->id);
+ if (stat(con->filename, &fileinfo))
+ kbytes = 0;
+ else
+ kbytes = (fileinfo.st_size + 1023) / 1024;
- ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_ENUM, "job-state",
- job->state->values[0].integer);
- add_job_state_reasons(con, job);
+ cupsdUpdateQuota(printer, job->username, 0, kbytes);
- con->response->request.status.status_code = IPP_OK;
+ if ((attr = ippFindAttribute(job->attrs, "job-k-octets",
+ IPP_TAG_INTEGER)) != NULL)
+ attr->values[0].integer += kbytes;
/*
- * Add any job subscriptions...
+ * Add the job file...
*/
- add_job_subscriptions(con, job);
+ if (add_file(con, job, filetype, compression))
+ return;
+
+ snprintf(filename, sizeof(filename), "%s/d%05d-%03d", RequestRoot, job->id,
+ job->num_files);
+ rename(con->filename, filename);
+ cupsdClearString(&con->filename);
/*
- * Set all but the first two attributes to the job attributes group...
+ * See if we need to add the ending sheet...
*/
- for (attr = job->attrs->attrs->next->next; attr; attr = attr->next)
- attr->group_tag = IPP_TAG_JOB;
+ cupsdTimeoutJob(job);
/*
* Log and save the job...
*/
- cupsdLogMessage(CUPSD_LOG_INFO, "Job %d queued on \"%s\" by \"%s\".", job->id,
- job->dest, job->username);
- cupsdLogMessage(CUPSD_LOG_DEBUG, "Job %d hold_until = %d", job->id,
+ cupsdLogMessage(CUPSD_LOG_INFO, "[Job %d] Queued on \"%s\" by \"%s\".",
+ job->id, job->dest, job->username);
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "[Job %d] hold_until = %d", job->id,
(int)job->hold_until);
cupsdSaveJob(job);
- cupsdAddEvent(CUPSD_EVENT_JOB_CREATED, printer, job, "Job created.");
-
/*
* Start the job if possible...
*/
return;
}
- if (strncmp(line, "%!PS-Adobe-", 11) != 0)
+ if (strncmp(line, "%!PS-Adobe-", 11))
{
/*
* Not a DSC-compliant file, so no job ticket info will be available...
num_options = 0;
options = NULL;
- while (cupsFileGets(fp, line, sizeof(line)) != NULL)
+ while (cupsFileGets(fp, line, sizeof(line)))
{
/*
* Stop at the first non-ticket line...
*/
- if (strncmp(line, "%cupsJobTicket:", 15) != 0)
+ if (strncmp(line, "%cupsJobTicket:", 15))
break;
/*
* See what the user wants to change.
*/
- for (attr = ticket->attrs; attr != NULL; attr = attr->next)
+ for (attr = ticket->attrs; attr; attr = attr->next)
{
if (attr->group_tag != IPP_TAG_JOB || !attr->name)
continue;
!strncmp(attr->name, "time-at-", 8))
continue; /* Read-only attrs */
- if ((attr2 = ippFindAttribute(con->request, attr->name, IPP_TAG_ZERO)) != NULL)
+ if ((attr2 = ippFindAttribute(con->request, attr->name,
+ IPP_TAG_ZERO)) != NULL)
{
/*
* Some other value; first free the old value...
}
else
{
- for (prev2 = con->request->attrs; prev2 != NULL; prev2 = prev2->next)
+ for (prev2 = con->request->attrs; prev2; prev2 = prev2->next)
if (prev2->next == attr2)
{
prev2->next = attr2->next;
if (con->request->last == attr2)
con->request->last = prev2;
- _ipp_free_attr(attr2);
+ _ippFreeAttr(attr2);
}
/*
ipp_attribute_t *uri) /* I - Printer or class URI */
{
http_status_t status; /* Policy status */
- cups_ptype_t dtype; /* Destination type (printer or class) */
- char method[HTTP_MAX_URI], /* Method portion of URI */
- username[HTTP_MAX_URI], /* Username portion of URI */
- host[HTTP_MAX_URI], /* Host portion of URI */
- resource[HTTP_MAX_URI]; /* Resource portion of URI */
- int port; /* Port portion of URI */
- const char *name; /* Printer name */
+ cups_ptype_t dtype; /* Destination type (printer/class) */
cupsd_printer_t *printer; /* Printer data */
ipp_attribute_t *attr; /* printer-state-message text */
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
-
- if ((name = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
+ if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer))
{
/*
* Bad URI...
if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, printer);
return;
}
cupsdSaveAllClasses();
cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" rejecting jobs (\"%s\").",
- name, con->username);
+ printer->name, get_username(con));
}
else
{
cupsdSaveAllPrinters();
cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" rejecting jobs (\"%s\").",
- name, con->username);
+ printer->name, get_username(con));
}
/*
* Got a printer URI; see if we also have a job-id attribute...
*/
- if ((attr = ippFindAttribute(con->request, "job-id", IPP_TAG_INTEGER)) == NULL)
+ if ((attr = ippFindAttribute(con->request, "job-id",
+ IPP_TAG_INTEGER)) == NULL)
{
send_ipp_status(con, IPP_BAD_REQUEST,
_("Got a printer-uri attribute but no job-id!"));
* Got a job URI; parse it to get the job ID...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if (strncmp(resource, "/jobs/", 6))
{
* See if job is "held"...
*/
- if (job->state->values[0].integer != IPP_JOB_HELD)
+ if (job->state_value != IPP_JOB_HELD)
{
/*
* Nope - return a "not possible" error...
if (!validate_user(job, con, job->username, username, sizeof(username)))
{
- send_ipp_status(con, IPP_FORBIDDEN,
- _("You are not authorized to release job id "
- "%d owned by \"%s\"!"),
- jobid, job->username);
+ send_http_error(con, HTTP_UNAUTHORIZED, NULL);
return;
}
* Reset the job-hold-until value to "no-hold"...
*/
- if ((attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_KEYWORD)) == NULL)
+ if ((attr = ippFindAttribute(job->attrs, "job-hold-until",
+ IPP_TAG_KEYWORD)) == NULL)
attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
- if (attr != NULL)
+ if (attr)
{
- free(attr->values[0].string.text);
+ _cupsStrFree(attr->values[0].string.text);
+
attr->value_tag = IPP_TAG_KEYWORD;
- attr->values[0].string.text = strdup("no-hold");
+ attr->values[0].string.text = _cupsStrAlloc("no-hold");
+
+ cupsdAddEvent(CUPSD_EVENT_JOB_CONFIG_CHANGED, job->printer, job,
+ "Job job-hold-until value changed by user.");
}
/*
cupsdReleaseJob(job);
- cupsdLogMessage(CUPSD_LOG_INFO, "Job %d was released by \"%s\".", jobid,
+ cupsdAddEvent(CUPSD_EVENT_JOB_STATE, job->printer, job,
+ "Job released by user.");
+
+ cupsdLogMessage(CUPSD_LOG_INFO, "[Job %d] Released by \"%s\".", jobid,
username);
con->response->request.status.status_code = IPP_OK;
cupsd_client_t *con, /* I - Client connection */
int sub_id) /* I - Subscription ID */
{
+ http_status_t status; /* Policy status */
+ cupsd_subscription_t *sub; /* Subscription */
+ ipp_attribute_t *lease; /* notify-lease-duration */
+
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG2,
+ "renew_subscription(con=%p[%d], sub_id=%d)",
+ con, con->http.fd, sub_id);
+
+ /*
+ * Is the subscription ID valid?
+ */
+
+ if ((sub = cupsdFindSubscription(sub_id)) == NULL)
+ {
+ /*
+ * Bad subscription ID...
+ */
+
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("notify-subscription-id %d no good!"), sub_id);
+ return;
+ }
+
+ if (sub->job)
+ {
+ /*
+ * Job subscriptions cannot be renewed...
+ */
+
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("Job subscriptions cannot be renewed!"));
+ return;
+ }
+
+ /*
+ * Check policy...
+ */
+
+ if ((status = cupsdCheckPolicy(sub->dest ? sub->dest->op_policy_ptr :
+ DefaultPolicyPtr,
+ con, sub->owner)) != HTTP_OK)
+ {
+ send_http_error(con, status, sub->dest);
+ return;
+ }
+
+ /*
+ * Renew the subscription...
+ */
+
+ lease = ippFindAttribute(con->request, "notify-lease-duration",
+ IPP_TAG_INTEGER);
+
+ sub->lease = lease ? lease->values[0].integer : DefaultLeaseDuration;
+
+ if (MaxLeaseDuration && (sub->lease == 0 || sub->lease > MaxLeaseDuration))
+ {
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "renew_subscription: Limiting notify-lease-duration to "
+ "%d seconds.",
+ MaxLeaseDuration);
+ sub->lease = MaxLeaseDuration;
+ }
+
+ sub->expire = sub->lease ? time(NULL) + sub->lease : 0;
+
+ cupsdSaveAllSubscriptions();
+
+ con->response->request.status.status_code = IPP_OK;
+
+ ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
+ "notify-lease-duration", sub->lease);
}
* Got a printer URI; see if we also have a job-id attribute...
*/
- if ((attr = ippFindAttribute(con->request, "job-id", IPP_TAG_INTEGER)) == NULL)
+ if ((attr = ippFindAttribute(con->request, "job-id",
+ IPP_TAG_INTEGER)) == NULL)
{
send_ipp_status(con, IPP_BAD_REQUEST,
_("Got a printer-uri attribute but no job-id!"));
* Got a job URI; parse it to get the job ID...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
- if (strncmp(resource, "/jobs/", 6) != 0)
+ if (strncmp(resource, "/jobs/", 6))
{
/*
* Not a valid URI!
* See if job is in any of the "completed" states...
*/
- if (job->state->values[0].integer <= IPP_JOB_PROCESSING)
+ if (job->state_value <= IPP_JOB_PROCESSING)
{
/*
* Nope - return a "not possible" error...
* See if we have retained the job files...
*/
- if (!JobFiles && job->state->values[0].integer > IPP_JOB_STOPPED)
+ cupsdLoadJob(job);
+
+ if (!job->attrs || job->num_files == 0)
{
/*
* Nope - return a "not possible" error...
if (!validate_user(job, con, job->username, username, sizeof(username)))
{
- send_ipp_status(con, IPP_FORBIDDEN,
- _("You are not authorized to restart job id "
- "%d owned by \"%s\"!"),
- jobid, job->username);
+ send_http_error(con, HTTP_UNAUTHORIZED, NULL);
return;
}
cupsdRestartJob(job);
- cupsdLogMessage(CUPSD_LOG_INFO, "Job %d was restarted by \"%s\".", jobid,
+ cupsdLogMessage(CUPSD_LOG_INFO, "[Job %d] Restarted by \"%s\".", jobid,
username);
con->response->request.status.status_code = IPP_OK;
*/
static void
-save_auth_info(cupsd_client_t *con, /* I - Client connection */
- cupsd_job_t *job) /* I - Job */
+save_auth_info(
+ cupsd_client_t *con, /* I - Client connection */
+ cupsd_job_t *job, /* I - Job */
+ ipp_attribute_t *auth_info) /* I - auth-info attribute, if any */
{
- int i; /* Looping var */
- char filename[1024]; /* Job authentication filename */
- cups_file_t *fp; /* Job authentication file */
- char line[1024]; /* Line for file */
+ int i; /* Looping var */
+ char filename[1024]; /* Job authentication filename */
+ cups_file_t *fp; /* Job authentication file */
+ char line[2048]; /* Line for file */
+ cupsd_printer_t *dest; /* Destination printer/class */
/*
* This function saves the in-memory authentication information for
* a job so that it can be used to authenticate with a remote host.
* The information is stored in a file that is readable only by the
- * root user. The username and password are Base-64 encoded, each
- * on a separate line, followed by random number (up to 1024) of
- * newlines to limit the amount of information that is exposed.
+ * root user. The fields are Base-64 encoded, each on a separate line,
+ * followed by random number (up to 1024) of newlines to limit the
+ * amount of information that is exposed.
*
* Because of the potential for exposing of authentication information,
* this functionality is only enabled when running cupsd as root.
if (RunUser)
return;
+ if ((dest = cupsdFindDest(job->dest)) == NULL)
+ return;
+
/*
* Create the authentication file and change permissions...
*/
fchown(cupsFileNumber(fp), 0, 0);
fchmod(cupsFileNumber(fp), 0400);
- /*
- * Write the authenticated username...
- */
+ if (auth_info && auth_info->num_values == dest->num_auth_info_required)
+ {
+ /*
+ * Write 1 to 3 auth values...
+ */
- httpEncode64_2(line, sizeof(line), con->username, strlen(con->username));
- cupsFilePrintf(fp, "%s\n", line);
+ cupsdClearString(&job->auth_username);
+ cupsdClearString(&job->auth_domain);
+ cupsdClearString(&job->auth_password);
- /*
- * Write the authenticated password...
- */
+ for (i = 0; i < auth_info->num_values; i ++)
+ {
+ httpEncode64_2(line, sizeof(line), auth_info->values[i].string.text,
+ strlen(auth_info->values[i].string.text));
+ cupsFilePrintf(fp, "%s\n", line);
+
+ if (!strcmp(dest->auth_info_required[i], "username"))
+ cupsdSetStringf(&job->auth_username, "AUTH_USERNAME=%s",
+ auth_info->values[i].string.text);
+ else if (!strcmp(dest->auth_info_required[i], "domain"))
+ cupsdSetStringf(&job->auth_domain, "AUTH_DOMAIN=%s",
+ auth_info->values[i].string.text);
+ else if (!strcmp(dest->auth_info_required[i], "password"))
+ cupsdSetStringf(&job->auth_password, "AUTH_PASSWORD=%s",
+ auth_info->values[i].string.text);
+ }
+ }
+ else if (con->username[0])
+ {
+ /*
+ * Write the authenticated username...
+ */
+
+ httpEncode64_2(line, sizeof(line), con->username, strlen(con->username));
+ cupsFilePrintf(fp, "%s\n", line);
+
+ cupsdSetStringf(&job->auth_username, "AUTH_USERNAME=%s", con->username);
+ cupsdClearString(&job->auth_domain);
- httpEncode64_2(line, sizeof(line), con->password, strlen(con->password));
- cupsFilePrintf(fp, "%s\n", line);
+ /*
+ * Write the authenticated password...
+ */
+
+ httpEncode64_2(line, sizeof(line), con->password, strlen(con->password));
+ cupsFilePrintf(fp, "%s\n", line);
+
+ cupsdSetStringf(&job->auth_password, "AUTH_PASSWORD=%s", con->password);
+ }
/*
* Write a random number of newlines to the end of the file...
*/
cupsFileClose(fp);
+
+#if defined(HAVE_GSSAPI) && defined(HAVE_KRB5_H)
+ if (con->gss_have_creds)
+ save_krb5_creds(con, job);
+ else if (job->ccname)
+ cupsdClearString(&(job->ccname));
+#endif /* HAVE_GSSAPI && HAVE_KRB5_H */
+}
+
+
+#if defined(HAVE_GSSAPI) && defined(HAVE_KRB5_H)
+/*
+ * 'save_krb5_creds()' - Save Kerberos credentials for the job.
+ */
+
+static void
+save_krb5_creds(cupsd_client_t *con, /* I - Client connection */
+ cupsd_job_t *job) /* I - Job */
+{
+# if !defined(HAVE_KRB5_CC_NEW_UNIQUE) && !defined(HAVE_HEIMDAL)
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Sorry, your version of Kerberos does not support delegated "
+ "credentials!");
+ return;
+
+# else
+ krb5_error_code error; /* Kerberos error code */
+ OM_uint32 major_status, /* Major status code */
+ minor_status; /* Minor status code */
+# ifdef HAVE_KRB5_CC_NEW_UNIQUE
+ krb5_principal principal; /* Kerberos principal */
+# endif /* HAVE_KRB5_CC_NEW_UNIQUE */
+
+
+# ifdef __APPLE__
+ /*
+ * If the weak-linked GSSAPI/Kerberos library is not present, don't try
+ * to use it...
+ */
+
+ if (krb5_init_context == NULL)
+ return;
+# endif /* __APPLE__ */
+
+ /*
+ * We MUST create a file-based cache because memory-based caches are
+ * only valid for the current process/address space.
+ *
+ * Due to various bugs/features in different versions of Kerberos, we
+ * need either the krb5_cc_new_unique() function or Heimdal's version
+ * of krb5_cc_gen_new() to create a new FILE: credential cache that
+ * can be passed to the backend. These functions create a temporary
+ * file (typically in /tmp) containing the cached credentials, which
+ * are removed when we have successfully printed a job.
+ */
+
+# ifdef HAVE_KRB5_CC_NEW_UNIQUE
+ if ((error = krb5_cc_new_unique(KerberosContext, "FILE", NULL,
+ &(job->ccache))) != 0)
+# else /* HAVE_HEIMDAL */
+ if ((error = krb5_cc_gen_new(krb_context, &krb5_fcc_ops,
+ &(job->ccache))) != 0)
+# endif /* HAVE_KRB5_CC_NEW_UNIQUE */
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to create new credentials cache (%d/%s)",
+ error, strerror(errno));
+ job->ccache = NULL;
+ return;
+ }
+
+ if ((error = krb5_parse_name(KerberosContext, con->username, &principal)) != 0)
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to parse kerberos username (%d/%s)",
+ error, strerror(errno));
+ krb5_cc_destroy(KerberosContext, job->ccache);
+ job->ccache = NULL;
+ return;
+ }
+
+ if ((error = krb5_cc_initialize(KerberosContext, job->ccache, principal)))
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to initialize credentials cache (%d/%s)", error,
+ strerror(errno));
+ krb5_cc_destroy(KerberosContext, job->ccache);
+ krb5_free_principal(KerberosContext, principal);
+ job->ccache = NULL;
+ return;
+ }
+
+ krb5_free_principal(KerberosContext, principal);
+
+ /*
+ * Copy the user's credentials to the new cache file...
+ */
+
+ major_status = gss_krb5_copy_ccache(&minor_status, con->gss_delegated_cred,
+ job->ccache);
+
+ if (GSS_ERROR(major_status))
+ {
+ cupsdLogGSSMessage(CUPSD_LOG_ERROR, major_status, minor_status,
+ "Unable to import client credentials cache");
+ krb5_cc_destroy(KerberosContext, job->ccache);
+ job->ccache = NULL;
+ return;
+ }
+
+ /*
+ * Add the KRB5CCNAME environment variable to the job so that the
+ * backend can use the credentials when printing.
+ */
+
+ cupsdSetStringf(&(job->ccname), "KRB5CCNAME=FILE:%s",
+ krb5_cc_get_name(KerberosContext, job->ccache));
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "[Job %d] save_krb5_creds: %s", job->id,
+ job->ccname);
+# endif /* HAVE_KRB5_CC_NEW_UNIQUE || HAVE_HEIMDAL */
}
+#endif /* HAVE_GSSAPI && HAVE_KRB5_H */
/*
{
ipp_attribute_t *attr; /* Current attribute */
ipp_attribute_t *format; /* Document-format attribute */
+ const char *default_format;/* document-format-default value */
int jobid; /* Job ID number */
cupsd_job_t *job; /* Current job */
char job_uri[HTTP_MAX_URI],
* Got a printer URI; see if we also have a job-id attribute...
*/
- if ((attr = ippFindAttribute(con->request, "job-id", IPP_TAG_INTEGER)) == NULL)
+ if ((attr = ippFindAttribute(con->request, "job-id",
+ IPP_TAG_INTEGER)) == NULL)
{
send_ipp_status(con, IPP_BAD_REQUEST,
_("Got a printer-uri attribute but no job-id!"));
* Got a job URI; parse it to get the job ID...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if (strncmp(resource, "/jobs/", 6))
{
return;
}
+ printer = cupsdFindDest(job->dest);
+
/*
* See if the job is owned by the requesting user...
*/
if (!validate_user(job, con, job->username, username, sizeof(username)))
{
- send_ipp_status(con, IPP_FORBIDDEN,
- _("You are not authorized to send document "
- "for job #%d owned by \"%s\"!"),
- jobid, job->username);
+ send_http_error(con, HTTP_UNAUTHORIZED, NULL);
return;
}
compression = CUPS_FILE_NONE;
- if ((attr = ippFindAttribute(con->request, "compression", IPP_TAG_KEYWORD)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "compression",
+ IPP_TAG_KEYWORD)) != NULL)
{
if (strcmp(attr->values[0].string.text, "none")
#ifdef HAVE_LIBZ
* Grab format from client...
*/
- if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]", super, type) != 2)
+ if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]",
+ super, type) != 2)
{
send_ipp_status(con, IPP_BAD_REQUEST, _("Bad document-format \"%s\"!"),
format->values[0].string.text);
return;
}
}
+ else if ((default_format = cupsGetOption("document-format",
+ printer->num_options,
+ printer->options)) != NULL)
+ {
+ /*
+ * Use default document format...
+ */
+
+ if (sscanf(default_format, "%15[^/]/%31[^;]", super, type) != 2)
+ {
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("Could not scan type \"%s\"!"),
+ default_format);
+ return;
+ }
+ }
else
{
/*
strcpy(type, "octet-stream");
}
- if (strcmp(super, "application") == 0 &&
- strcmp(type, "octet-stream") == 0)
+ if (!strcmp(super, "application") && !strcmp(type, "octet-stream"))
{
/*
* Auto-type the file...
*/
- cupsdLogMessage(CUPSD_LOG_DEBUG, "send_document: auto-typing file...");
+ ipp_attribute_t *doc_name; /* document-name attribute */
- filetype = mimeFileType(MimeDatabase, con->filename, &compression);
- if (filetype != NULL)
- {
- /*
- * Replace the document-format attribute value with the auto-typed one.
- */
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "send_document: auto-typing file...");
- snprintf(mimetype, sizeof(mimetype), "%s/%s", filetype->super,
- filetype->type);
+ doc_name = ippFindAttribute(con->request, "document-name", IPP_TAG_NAME);
+ filetype = mimeFileType(MimeDatabase, con->filename,
+ doc_name ? doc_name->values[0].string.text : NULL,
+ &compression);
- if (format != NULL)
- {
- free(format->values[0].string.text);
- format->values[0].string.text = strdup(mimetype);
- }
- else
- ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_MIMETYPE,
- "document-format", NULL, mimetype);
- }
- else
+ if (!filetype)
filetype = mimeType(MimeDatabase, super, type);
}
else
filetype = mimeType(MimeDatabase, super, type);
- if (filetype == NULL)
+ if (filetype &&
+ (!format ||
+ (!strcmp(super, "application") && !strcmp(type, "octet-stream"))))
+ {
+ /*
+ * Replace the document-format attribute value with the auto-typed or
+ * default one.
+ */
+
+ snprintf(mimetype, sizeof(mimetype), "%s/%s", filetype->super,
+ filetype->type);
+
+ if (format)
+ {
+ _cupsStrFree(format->values[0].string.text);
+
+ format->values[0].string.text = _cupsStrAlloc(mimetype);
+ }
+ else
+ ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_MIMETYPE,
+ "document-format", NULL, mimetype);
+ }
+ else if (!filetype)
{
send_ipp_status(con, IPP_DOCUMENT_FORMAT,
_("Unsupported format \'%s/%s\'!"), super, type);
return;
}
+ if (printer->filetypes && !cupsArrayFind(printer->filetypes, filetype))
+ {
+ snprintf(mimetype, sizeof(mimetype), "%s/%s", filetype->super,
+ filetype->type);
+
+ send_ipp_status(con, IPP_DOCUMENT_FORMAT,
+ _("Unsupported format \'%s\'!"), mimetype);
+
+ ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_MIMETYPE,
+ "document-format", NULL, mimetype);
+
+ return;
+ }
+
cupsdLogMessage(CUPSD_LOG_DEBUG,
"send_document: request file type is %s/%s.",
filetype->super, filetype->type);
* Add the file to the job...
*/
+ cupsdLoadJob(job);
+
if (add_file(con, job, filetype, compression))
return;
- if (job->dtype & CUPS_PRINTER_CLASS)
- printer = cupsdFindClass(job->dest);
- else
- printer = cupsdFindPrinter(job->dest);
-
if (stat(con->filename, &fileinfo))
kbytes = 0;
else
cupsdUpdateQuota(printer, job->username, 0, kbytes);
- if ((attr = ippFindAttribute(job->attrs, "job-k-octets", IPP_TAG_INTEGER)) != NULL)
+ if ((attr = ippFindAttribute(job->attrs, "job-k-octets",
+ IPP_TAG_INTEGER)) != NULL)
attr->values[0].integer += kbytes;
snprintf(filename, sizeof(filename), "%s/d%05d-%03d", RequestRoot, job->id,
* Start the job if this is the last document...
*/
- if ((attr = ippFindAttribute(con->request, "last-document", IPP_TAG_BOOLEAN)) != NULL &&
- attr->values[0].boolean)
- {
- /*
- * See if we need to add the ending sheet...
- */
-
- if (printer != NULL &&
- !(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)) &&
- (attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_ZERO)) != NULL &&
- attr->num_values > 1)
- {
- /*
- * Yes...
- */
-
- cupsdLogMessage(CUPSD_LOG_INFO,
- "Adding end banner page \"%s\" to job %d.",
- attr->values[1].string.text, job->id);
-
- kbytes = copy_banner(con, job, attr->values[1].string.text);
+ if ((attr = ippFindAttribute(con->request, "last-document",
+ IPP_TAG_BOOLEAN)) != NULL &&
+ attr->values[0].boolean)
+ {
+ /*
+ * See if we need to add the ending sheet...
+ */
- cupsdUpdateQuota(printer, job->username, 0, kbytes);
- }
+ cupsdTimeoutJob(job);
- if (job->state->values[0].integer == IPP_JOB_STOPPED)
+ if (job->state_value == IPP_JOB_STOPPED)
+ {
job->state->values[0].integer = IPP_JOB_PENDING;
- else if (job->state->values[0].integer == IPP_JOB_HELD)
+ job->state_value = IPP_JOB_PENDING;
+ }
+ else if (job->state_value == IPP_JOB_HELD)
{
- if ((attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_KEYWORD)) == NULL)
+ if ((attr = ippFindAttribute(job->attrs, "job-hold-until",
+ IPP_TAG_KEYWORD)) == NULL)
attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
- if (attr == NULL || strcmp(attr->values[0].string.text, "no-hold") == 0)
+ if (!attr || !strcmp(attr->values[0].string.text, "no-hold"))
+ {
job->state->values[0].integer = IPP_JOB_PENDING;
+ job->state_value = IPP_JOB_PENDING;
+ }
}
cupsdSaveJob(job);
}
else
{
- if ((attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_KEYWORD)) == NULL)
+ if ((attr = ippFindAttribute(job->attrs, "job-hold-until",
+ IPP_TAG_KEYWORD)) == NULL)
attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
- if (attr == NULL || strcmp(attr->values[0].string.text, "no-hold") == 0)
+ if (!attr || !strcmp(attr->values[0].string.text, "no-hold"))
{
job->state->values[0].integer = IPP_JOB_HELD;
+ job->state_value = IPP_JOB_HELD;
job->hold_until = time(NULL) + 60;
cupsdSaveJob(job);
}
ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-id", jobid);
ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_ENUM, "job-state",
- job ? job->state->values[0].integer : IPP_JOB_CANCELLED);
+ job ? job->state_value : IPP_JOB_CANCELED);
add_job_state_reasons(con, job);
con->response->request.status.status_code = IPP_OK;
*/
static void
-send_http_error(cupsd_client_t *con, /* I - Client connection */
- http_status_t status) /* I - HTTP status code */
+send_http_error(
+ cupsd_client_t *con, /* I - Client connection */
+ http_status_t status, /* I - HTTP status code */
+ cupsd_printer_t *printer) /* I - Printer, if any */
{
cupsdLogMessage(CUPSD_LOG_ERROR, "%s: %s",
ippOpString(con->request->request.op.operation_id),
httpStatus(status));
- cupsdSendError(con, status);
+ if (status == HTTP_UNAUTHORIZED &&
+ printer && printer->num_auth_info_required > 0 &&
+ !strcmp(printer->auth_info_required[0], "negotiate"))
+ cupsdSendError(con, status, AUTH_NEGOTIATE);
+ else
+ cupsdSendError(con, status, AUTH_NONE);
ippDelete(con->response);
con->response = NULL;
char formatted[1024]; /* Formatted errror message */
- if (message)
- {
- va_start(ap, message);
- vsnprintf(formatted, sizeof(formatted),
- _cupsLangString(con->language, message), ap);
- va_end(ap);
+ va_start(ap, message);
+ vsnprintf(formatted, sizeof(formatted),
+ _cupsLangString(con->language, message), ap);
+ va_end(ap);
- cupsdLogMessage(status >= IPP_BAD_REQUEST ? CUPSD_LOG_ERROR : CUPSD_LOG_INFO,
- "%s %s: %s",
- ippOpString(con->request->request.op.operation_id),
- ippErrorString(status), formatted);
- }
- else
- cupsdLogMessage(status >= IPP_BAD_REQUEST ? CUPSD_LOG_ERROR : CUPSD_LOG_INFO,
- "%s %s",
- ippOpString(con->request->request.op.operation_id),
- ippErrorString(status));
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "%s %s: %s",
+ ippOpString(con->request->request.op.operation_id),
+ ippErrorString(status), formatted);
con->response->request.status.status_code = status;
- if (ippFindAttribute(con->response, "attributes-charset", IPP_TAG_ZERO) == NULL)
+ if (ippFindAttribute(con->response, "attributes-charset",
+ IPP_TAG_ZERO) == NULL)
ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
"attributes-charset", NULL, DefaultCharset);
ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
"attributes-natural-language", NULL, DefaultLanguage);
- if (message)
- ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_TEXT,
- "status-message", NULL, formatted);
+ ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_TEXT,
+ "status-message", NULL, formatted);
}
ipp_attribute_t *uri) /* I - Printer URI */
{
http_status_t status; /* Policy status */
- cups_ptype_t dtype; /* Destination type (printer or class) */
- char method[HTTP_MAX_URI],
- /* Method portion of URI */
- username[HTTP_MAX_URI],
- /* Username portion of URI */
- host[HTTP_MAX_URI],
- /* Host portion of URI */
- resource[HTTP_MAX_URI];
- /* Resource portion of URI */
- int port; /* Port portion of URI */
- const char *name; /* Printer name */
+ cups_ptype_t dtype; /* Destination type (printer/class) */
cupsd_printer_t *printer; /* Printer */
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
-
- if ((name = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
+ if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer))
{
/*
* Bad URI...
if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, NULL);
return;
}
cupsdWritePrintcap();
cupsdLogMessage(CUPSD_LOG_INFO,
- "Default destination set to \"%s\" by \"%s\".", name,
- con->username);
+ "Default destination set to \"%s\" by \"%s\".",
+ printer->name, get_username(con));
/*
* Everything was ok, so return OK status...
resource[HTTP_MAX_URI];
/* Resource portion of URI */
int port; /* Port portion of URI */
+ int event; /* Events? */
cupsdLogMessage(CUPSD_LOG_DEBUG2, "set_job_attrs(%p[%d], %s)", con,
* See if we have a job URI or a printer URI...
*/
- if (strcmp(uri->name, "printer-uri") == 0)
+ if (!strcmp(uri->name, "printer-uri"))
{
/*
* Got a printer URI; see if we also have a job-id attribute...
*/
- if ((attr = ippFindAttribute(con->request, "job-id", IPP_TAG_INTEGER)) == NULL)
+ if ((attr = ippFindAttribute(con->request, "job-id",
+ IPP_TAG_INTEGER)) == NULL)
{
send_ipp_status(con, IPP_BAD_REQUEST,
_("Got a printer-uri attribute but no job-id!"));
* Got a job URI; parse it to get the job ID...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
- if (strncmp(resource, "/jobs/", 6) != 0)
+ if (strncmp(resource, "/jobs/", 6))
{
/*
* Not a valid URI!
* See if the job has been completed...
*/
- if (job->state->values[0].integer > IPP_JOB_STOPPED)
+ if (job->state_value > IPP_JOB_STOPPED)
{
/*
* Return a "not-possible" error...
if (!validate_user(job, con, job->username, username, sizeof(username)))
{
- send_ipp_status(con, IPP_FORBIDDEN,
- _("You are not authorized to alter job id "
- "%d owned by \"%s\"!"),
- jobid, job->username);
+ send_http_error(con, HTTP_UNAUTHORIZED, NULL);
return;
}
* See what the user wants to change.
*/
- for (attr = con->request->attrs; attr != NULL; attr = attr->next)
+ cupsdLoadJob(job);
+
+ event = 0;
+
+ for (attr = con->request->attrs; attr; attr = attr->next)
{
if (attr->group_tag != IPP_TAG_JOB || !attr->name)
continue;
if ((attr2 = copy_attribute(con->response, attr, 0)) != NULL)
attr2->group_tag = IPP_TAG_UNSUPPORTED_GROUP;
}
- else if (job->state->values[0].integer >= IPP_JOB_PROCESSING)
+ else if (job->state_value >= IPP_JOB_PROCESSING)
{
send_ipp_status(con, IPP_NOT_POSSIBLE,
_("Job is completed and cannot be changed."));
return;
}
else if (con->response->request.status.status_code == IPP_OK)
+ {
cupsdSetJobPriority(job, attr->values[0].integer);
+ event |= CUPSD_EVENT_JOB_CONFIG_CHANGED;
+ }
}
else if (!strcmp(attr->name, "job-state"))
{
{
case IPP_JOB_PENDING :
case IPP_JOB_HELD :
- if (job->state->values[0].integer > IPP_JOB_HELD)
+ if (job->state_value > IPP_JOB_HELD)
{
send_ipp_status(con, IPP_NOT_POSSIBLE,
_("Job state cannot be changed."));
return;
}
else if (con->response->request.status.status_code == IPP_OK)
+ {
job->state->values[0].integer = attr->values[0].integer;
+ job->state_value = (ipp_jstate_t)attr->values[0].integer;
+
+ event |= CUPSD_EVENT_JOB_STATE;
+ }
break;
case IPP_JOB_PROCESSING :
case IPP_JOB_STOPPED :
- if (job->state->values[0].integer != attr->values[0].integer)
+ if (job->state_value != attr->values[0].integer)
{
send_ipp_status(con, IPP_NOT_POSSIBLE,
_("Job state cannot be changed."));
}
break;
- case IPP_JOB_CANCELLED :
+ case IPP_JOB_CANCELED :
case IPP_JOB_ABORTED :
case IPP_JOB_COMPLETED :
- if (job->state->values[0].integer > IPP_JOB_PROCESSING)
+ if (job->state_value > IPP_JOB_PROCESSING)
{
send_ipp_status(con, IPP_NOT_POSSIBLE,
_("Job state cannot be changed."));
return;
}
else if (con->response->request.status.status_code == IPP_OK)
- {
- cupsdCancelJob(job, 0);
-
- if (JobHistory)
- {
- job->state->values[0].integer = attr->values[0].integer;
- cupsdSaveJob(job);
- }
- }
+ cupsdCancelJob(job, 0, (ipp_jstate_t)attr->values[0].integer);
break;
}
}
}
else if (con->response->request.status.status_code != IPP_OK)
continue;
- else if ((attr2 = ippFindAttribute(job->attrs, attr->name, IPP_TAG_ZERO)) != NULL)
+ else if ((attr2 = ippFindAttribute(job->attrs, attr->name,
+ IPP_TAG_ZERO)) != NULL)
{
/*
* Some other value; first free the old value...
if (job->attrs->last == attr2)
job->attrs->last = job->attrs->prev;
- _ipp_free_attr(attr2);
+ _ippFreeAttr(attr2);
/*
* Then copy the attribute...
cupsdReleaseJob(job);
else
cupsdHoldJob(job);
+
+ event |= CUPSD_EVENT_JOB_CONFIG_CHANGED | CUPSD_EVENT_JOB_STATE;
}
}
else if (attr->value_tag == IPP_TAG_DELETEATTR)
if (attr2 == job->attrs->last)
job->attrs->last = job->attrs->prev;
- _ipp_free_attr(attr2);
+ _ippFreeAttr(attr2);
+
+ event |= CUPSD_EVENT_JOB_CONFIG_CHANGED;
}
}
else
*/
copy_attribute(job->attrs, attr, 0);
+
+ event |= CUPSD_EVENT_JOB_CONFIG_CHANGED;
}
}
cupsdSaveJob(job);
+ /*
+ * Send events as needed...
+ */
+
+ if (event & CUPSD_EVENT_JOB_STATE)
+ cupsdAddEvent(CUPSD_EVENT_JOB_STATE, job->printer, job,
+ job->state_value == IPP_JOB_HELD ?
+ "Job held by user." : "Job restarted by user.");
+
+ if (event & CUPSD_EVENT_JOB_CONFIG_CHANGED)
+ cupsdAddEvent(CUPSD_EVENT_JOB_CONFIG_CHANGED, job->printer, job,
+ "Job options changed by user.");
+
/*
* Start jobs if possible...
*/
}
+/*
+ * 'set_printer_defaults()' - Set printer default options from a request.
+ */
+
+static void
+set_printer_defaults(
+ cupsd_client_t *con, /* I - Client connection */
+ cupsd_printer_t *printer) /* I - Printer */
+{
+ int i; /* Looping var */
+ ipp_attribute_t *attr; /* Current attribute */
+ int namelen; /* Length of attribute name */
+ char name[256], /* New attribute name */
+ value[256]; /* String version of integer attrs */
+
+
+ for (attr = con->request->attrs; attr; attr = attr->next)
+ {
+ /*
+ * Skip non-printer attributes...
+ */
+
+ if (attr->group_tag != IPP_TAG_PRINTER || !attr->name)
+ continue;
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "set_printer_defaults: %s", attr->name);
+
+ if (!strcmp(attr->name, "job-sheets-default"))
+ {
+ /*
+ * Only allow keywords and names...
+ */
+
+ if (attr->value_tag != IPP_TAG_NAME && attr->value_tag != IPP_TAG_KEYWORD)
+ continue;
+
+ /*
+ * Only allow job-sheets-default to be set when running without a
+ * system high classification level...
+ */
+
+ if (Classification)
+ continue;
+
+ cupsdSetString(&printer->job_sheets[0], attr->values[0].string.text);
+
+ if (attr->num_values > 1)
+ cupsdSetString(&printer->job_sheets[1], attr->values[1].string.text);
+ else
+ cupsdSetString(&printer->job_sheets[1], "none");
+ }
+ else if (!strcmp(attr->name, "requesting-user-name-allowed"))
+ {
+ cupsdFreePrinterUsers(printer);
+
+ printer->deny_users = 0;
+
+ if (attr->value_tag == IPP_TAG_NAME &&
+ (attr->num_values > 1 ||
+ strcmp(attr->values[0].string.text, "all")))
+ {
+ for (i = 0; i < attr->num_values; i ++)
+ cupsdAddPrinterUser(printer, attr->values[i].string.text);
+ }
+ }
+ else if (!strcmp(attr->name, "requesting-user-name-denied"))
+ {
+ cupsdFreePrinterUsers(printer);
+
+ printer->deny_users = 1;
+
+ if (attr->value_tag == IPP_TAG_NAME &&
+ (attr->num_values > 1 ||
+ strcmp(attr->values[0].string.text, "none")))
+ {
+ for (i = 0; i < attr->num_values; i ++)
+ cupsdAddPrinterUser(printer, attr->values[i].string.text);
+ }
+ }
+ else if (!strcmp(attr->name, "job-quota-period"))
+ {
+ if (attr->value_tag != IPP_TAG_INTEGER)
+ continue;
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Setting job-quota-period to %d...",
+ attr->values[0].integer);
+ cupsdFreeQuotas(printer);
+
+ printer->quota_period = attr->values[0].integer;
+ }
+ else if (!strcmp(attr->name, "job-k-limit"))
+ {
+ if (attr->value_tag != IPP_TAG_INTEGER)
+ continue;
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Setting job-k-limit to %d...",
+ attr->values[0].integer);
+ cupsdFreeQuotas(printer);
+
+ printer->k_limit = attr->values[0].integer;
+ }
+ else if (!strcmp(attr->name, "job-page-limit"))
+ {
+ if (attr->value_tag != IPP_TAG_INTEGER)
+ continue;
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Setting job-page-limit to %d...",
+ attr->values[0].integer);
+ cupsdFreeQuotas(printer);
+
+ printer->page_limit = attr->values[0].integer;
+ }
+ else if (!strcmp(attr->name, "printer-op-policy"))
+ {
+ cupsd_policy_t *p; /* Policy */
+
+
+ if (attr->value_tag != IPP_TAG_NAME)
+ continue;
+
+ if ((p = cupsdFindPolicy(attr->values[0].string.text)) != NULL)
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Setting printer-op-policy to \"%s\"...",
+ attr->values[0].string.text);
+ cupsdSetString(&printer->op_policy, attr->values[0].string.text);
+ printer->op_policy_ptr = p;
+ }
+ else
+ {
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("Unknown printer-op-policy \"%s\"."),
+ attr->values[0].string.text);
+ return;
+ }
+ }
+ else if (!strcmp(attr->name, "printer-error-policy"))
+ {
+ if (attr->value_tag != IPP_TAG_NAME && attr->value_tag != IPP_TAG_KEYWORD)
+ continue;
+
+ if (strcmp(attr->values[0].string.text, "abort-job") &&
+ strcmp(attr->values[0].string.text, "retry-job") &&
+ strcmp(attr->values[0].string.text, "stop-printer"))
+ {
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("Unknown printer-error-policy \"%s\"."),
+ attr->values[0].string.text);
+ return;
+ }
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Setting printer-error-policy to \"%s\"...",
+ attr->values[0].string.text);
+ cupsdSetString(&printer->error_policy, attr->values[0].string.text);
+ }
+
+ /*
+ * Skip any other non-default attributes...
+ */
+
+ namelen = strlen(attr->name);
+ if (namelen < 9 || strcmp(attr->name + namelen - 8, "-default") ||
+ namelen > (sizeof(name) - 1) || attr->num_values != 1)
+ continue;
+
+ /*
+ * OK, anything else must be a user-defined default...
+ */
+
+ strlcpy(name, attr->name, sizeof(name));
+ name[namelen - 8] = '\0'; /* Strip "-default" */
+
+ switch (attr->value_tag)
+ {
+ case IPP_TAG_DELETEATTR :
+ printer->num_options = cupsRemoveOption(name,
+ printer->num_options,
+ &(printer->options));
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Deleting %s", attr->name);
+ break;
+
+ case IPP_TAG_NAME :
+ case IPP_TAG_KEYWORD :
+ case IPP_TAG_URI :
+ printer->num_options = cupsAddOption(name,
+ attr->values[0].string.text,
+ printer->num_options,
+ &(printer->options));
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Setting %s to \"%s\"...", attr->name,
+ attr->values[0].string.text);
+ break;
+
+ case IPP_TAG_BOOLEAN :
+ printer->num_options = cupsAddOption(name,
+ attr->values[0].boolean ?
+ "true" : "false",
+ printer->num_options,
+ &(printer->options));
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Setting %s to %s...", attr->name,
+ attr->values[0].boolean ? "true" : "false");
+ break;
+
+ case IPP_TAG_INTEGER :
+ case IPP_TAG_ENUM :
+ sprintf(value, "%d", attr->values[0].integer);
+ printer->num_options = cupsAddOption(name, value,
+ printer->num_options,
+ &(printer->options));
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Setting %s to %s...", attr->name, value);
+ break;
+
+ case IPP_TAG_RANGE :
+ sprintf(value, "%d-%d", attr->values[0].range.lower,
+ attr->values[0].range.upper);
+ printer->num_options = cupsAddOption(name, value,
+ printer->num_options,
+ &(printer->options));
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Setting %s to %s...", attr->name, value);
+ break;
+
+ case IPP_TAG_RESOLUTION :
+ sprintf(value, "%dx%d%s", attr->values[0].resolution.xres,
+ attr->values[0].resolution.yres,
+ attr->values[0].resolution.units == IPP_RES_PER_INCH ?
+ "dpi" : "dpc");
+ printer->num_options = cupsAddOption(name, value,
+ printer->num_options,
+ &(printer->options));
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Setting %s to %s...", attr->name, value);
+ break;
+
+ default :
+ /* Do nothing for other values */
+ break;
+ }
+ }
+}
+
+
/*
* 'start_printer()' - Start a printer.
*/
ipp_attribute_t *uri) /* I - Printer URI */
{
http_status_t status; /* Policy status */
- cups_ptype_t dtype; /* Destination type (printer or class) */
- char method[HTTP_MAX_URI],
- /* Method portion of URI */
- username[HTTP_MAX_URI],
- /* Username portion of URI */
- host[HTTP_MAX_URI],
- /* Host portion of URI */
- resource[HTTP_MAX_URI];
- /* Resource portion of URI */
- int port; /* Port portion of URI */
- const char *name; /* Printer name */
+ cups_ptype_t dtype; /* Destination type (printer/class) */
cupsd_printer_t *printer; /* Printer data */
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
-
- if ((name = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
+ if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer))
{
/*
* Bad URI...
if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, printer);
return;
}
cupsdStartPrinter(printer, 1);
if (dtype & CUPS_PRINTER_CLASS)
- cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" started by \"%s\".", name,
- con->username);
- cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" started by \"%s\".", name,
- con->username);
+ cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" started by \"%s\".",
+ printer->name, get_username(con));
+ else
+ cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" started by \"%s\".",
+ printer->name, get_username(con));
cupsdCheckJobs();
ipp_attribute_t *uri) /* I - Printer URI */
{
http_status_t status; /* Policy status */
- cups_ptype_t dtype; /* Destination type (printer or class) */
- char method[HTTP_MAX_URI],
- /* Method portion of URI */
- username[HTTP_MAX_URI],
- /* Username portion of URI */
- host[HTTP_MAX_URI],
- /* Host portion of URI */
- resource[HTTP_MAX_URI];
- /* Resource portion of URI */
- int port; /* Port portion of URI */
- const char *name; /* Printer name */
+ cups_ptype_t dtype; /* Destination type (printer/class) */
cupsd_printer_t *printer; /* Printer data */
ipp_attribute_t *attr; /* printer-state-message attribute */
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
-
- if ((name = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
+ if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer))
{
/*
* Bad URI...
if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, printer);
return;
}
cupsdStopPrinter(printer, 1);
if (dtype & CUPS_PRINTER_CLASS)
- cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" stopped by \"%s\".", name,
- con->username);
+ cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" stopped by \"%s\".",
+ printer->name, get_username(con));
else
- cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" stopped by \"%s\".", name,
- con->username);
+ cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" stopped by \"%s\".",
+ printer->name, get_username(con));
/*
* Everything was ok, so return OK status...
}
+/*
+ * 'url_encode_attr()' - URL-encode a string attribute.
+ */
+
+static void
+url_encode_attr(ipp_attribute_t *attr, /* I - Attribute */
+ char *buffer,/* I - String buffer */
+ int bufsize)/* I - Size of buffer */
+{
+ int i; /* Looping var */
+ char *bufptr, /* Pointer into buffer */
+ *bufend; /* End of buffer */
+
+
+ strlcpy(buffer, attr->name, bufsize);
+ bufptr = buffer + strlen(buffer);
+ bufend = buffer + bufsize - 1;
+
+ for (i = 0; i < attr->num_values; i ++)
+ {
+ if (bufptr >= bufend)
+ break;
+
+ if (i)
+ *bufptr++ = ',';
+ else
+ *bufptr++ = '=';
+
+ if (bufptr >= bufend)
+ break;
+
+ *bufptr++ = '\'';
+
+ bufptr = url_encode_string(attr->values[i].string.text,
+ bufptr, bufend - bufptr + 1);
+
+ if (bufptr >= bufend)
+ break;
+
+ *bufptr++ = '\'';
+ }
+
+ *bufptr = '\0';
+}
+
+
+/*
+ * 'url_encode_string()' - URL-encode a string.
+ */
+
+static char * /* O - End of string */
+url_encode_string(const char *s, /* I - String */
+ char *buffer, /* I - String buffer */
+ int bufsize) /* I - Size of buffer */
+{
+ char *bufptr, /* Pointer into buffer */
+ *bufend; /* End of buffer */
+ static const char *hex = "0123456789ABCDEF";
+ /* Hex digits */
+
+
+ bufptr = buffer;
+ bufend = buffer + bufsize - 1;
+
+ while (*s && bufptr < bufend)
+ {
+ if (*s == ' ' || *s == '%')
+ {
+ if (bufptr >= (bufend - 2))
+ break;
+
+ *bufptr++ = '%';
+ *bufptr++ = hex[(*s >> 4) & 15];
+ *bufptr++ = hex[*s & 15];
+
+ s ++;
+ }
+ else if (*s == '\'' || *s == '\\')
+ {
+ if (bufptr >= (bufend - 1))
+ break;
+
+ *bufptr++ = '\\';
+ *bufptr++ = *s++;
+ }
+ else
+ *bufptr++ = *s++;
+ }
+
+ *bufptr = '\0';
+
+ return (bufptr);
+}
+
+
/*
* 'user_allowed()' - See if a user is allowed to print to a queue.
*/
http_status_t status; /* Policy status */
ipp_attribute_t *attr; /* Current attribute */
ipp_attribute_t *format; /* Document-format attribute */
- cups_ptype_t dtype; /* Destination type (printer or class) */
- char method[HTTP_MAX_URI],
- /* Method portion of URI */
- username[HTTP_MAX_URI],
- /* Username portion of URI */
- host[HTTP_MAX_URI],
- /* Host portion of URI */
- resource[HTTP_MAX_URI];
- /* Resource portion of URI */
- int port; /* Port portion of URI */
+ cups_ptype_t dtype; /* Destination type (printer/class) */
char super[MIME_MAX_SUPER],
/* Supertype of file */
type[MIME_MAX_TYPE];
* doesn't support compression yet...
*/
- if ((attr = ippFindAttribute(con->request, "compression", IPP_TAG_KEYWORD)) != NULL &&
- strcmp(attr->values[0].string.text, "none") == 0)
+ if ((attr = ippFindAttribute(con->request, "compression",
+ IPP_TAG_KEYWORD)) != NULL &&
+ !strcmp(attr->values[0].string.text, "none"))
{
send_ipp_status(con, IPP_ATTRIBUTES,
_("Unsupported compression attribute %s!"),
if ((format = ippFindAttribute(con->request, "document-format",
IPP_TAG_MIMETYPE)) != NULL)
{
- if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]", super, type) != 2)
+ if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]",
+ super, type) != 2)
{
send_ipp_status(con, IPP_BAD_REQUEST, _("Bad document-format \"%s\"!"),
format->values[0].string.text);
return;
}
- if ((strcmp(super, "application") != 0 ||
- strcmp(type, "octet-stream") != 0) &&
- mimeType(MimeDatabase, super, type) == NULL)
+ if ((strcmp(super, "application") || strcmp(type, "octet-stream")) &&
+ !mimeType(MimeDatabase, super, type))
{
cupsdLogMessage(CUPSD_LOG_INFO,
"Hint: Do you have the raw file printing rules enabled?");
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
-
- if (cupsdValidateDest(host, resource, &dtype, &printer) == NULL)
+ if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer))
{
/*
* Bad URI...
if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
{
- send_http_error(con, status);
+ send_http_error(con, status, printer);
return;
}
* 'validate_name()' - Make sure the printer name only contains valid chars.
*/
-static int /* O - 0 if name is no good, 1 if name is good */
+static int /* O - 0 if name is no good, 1 if good */
validate_name(const char *name) /* I - Name to check */
{
const char *ptr; /* Pointer into name */
*/
for (ptr = name; *ptr; ptr ++)
- if ((*ptr >= 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/' || *ptr == '#')
+ if ((*ptr > 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/' || *ptr == '#')
return (0);
/*
char *username, /* O - Authenticated username */
int userlen) /* I - Length of username */
{
- ipp_attribute_t *attr; /* requesting-user-name attribute */
cupsd_printer_t *printer; /* Printer for job */
* Get the best authenticated username that is available.
*/
- if (con->username[0])
- strlcpy(username, con->username, userlen);
- else if ((attr = ippFindAttribute(con->request, "requesting-user-name",
- IPP_TAG_NAME)) != NULL)
- strlcpy(username, attr->values[0].string.text, userlen);
- else
- strlcpy(username, "anonymous", userlen);
+ strlcpy(username, get_username(con), userlen);
/*
* Check the username against the owner...
*/
- if (job->dtype & CUPS_PRINTER_CLASS)
- printer = cupsdFindClass(job->dest);
- else
- printer = cupsdFindPrinter(job->dest);
+ printer = cupsdFindDest(job->dest);
return (cupsdCheckPolicy(printer ? printer->op_policy_ptr : DefaultPolicyPtr,
con, owner) == HTTP_OK);
/*
- * End of "$Id: ipp.c 4906 2006-01-10 20:53:28Z mike $".
+ * End of "$Id: ipp.c 6949 2007-09-12 21:33:23Z mike $".
*/
projects / thirdparty / cups.git / blobdiff