/*
- * "$Id: ipp.c 5051 2006-02-02 16:13:16Z mike $"
+ * "$Id: ipp.c 5284 2006-03-13 13:34:24Z mike $"
*
* IPP routines for the Common UNIX Printing System (CUPS) scheduler.
*
* 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.
* 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.
* user_allowed() - See if a user is allowed to print to a queue.
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, ipp_attribute_t *uri,
+ cupsd_printer_t **dprinter);
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);
int quickcopy);
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 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_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 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 int user_allowed(cupsd_printer_t *p, const char *username);
* Remote unauthenticated user masquerading as local root...
*/
- _cups_sp_free(username->values[0].string.text);
- username->values[0].string.text = _cups_sp_alloc(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)
{
break;
case IPP_GET_NOTIFICATIONS :
- get_notifications(con, sub_id);
+ get_notifications(con);
break;
default :
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? */
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);
* 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...
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")))
- 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")))
- 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)
{
}
}
+ set_printer_defaults(con, pclass);
+
/*
* Update the printer class attributes and return...
*/
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)
/*
- * '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 */
+ ipp_attribute_t *uri, /* I - printer-uri */
+ cupsd_printer_t **dprinter) /* I - Destination printer */
{
- cupsd_printer_t *dest; /* Destination printer */
+ 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) */
+ 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 */
+ 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, "add_job_state_reasons(%p[%d], %d)",
- con, con->http.fd, job ? job->id : 0);
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %s)", con,
+ con->http.fd, uri->values[0].string.text);
+
+ /*
+ * Is the destination valid?
+ */
+
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
- switch (job ? job->state->values[0].integer : IPP_JOB_CANCELLED)
+ if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
{
- case IPP_JOB_PENDING :
- if (job->dtype & CUPS_PRINTER_CLASS)
- dest = cupsdFindClass(job->dest);
- else
- dest = cupsdFindPrinter(job->dest);
+ /*
+ * Bad URI...
+ */
- 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;
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("The printer or class was not found."));
+ 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;
+ if (dprinter)
+ *dprinter = printer;
- case IPP_JOB_PROCESSING :
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
- "job-state-reasons", NULL, "job-printing");
- break;
+ /*
+ * Check remote printing to non-shared printer...
+ */
- case IPP_JOB_STOPPED :
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
- "job-state-reasons", NULL, "job-stopped");
- 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_CANCELLED :
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
- "job-state-reasons", NULL, "job-canceled-by-user");
- break;
+ /*
+ * Check policy...
+ */
- case IPP_JOB_ABORTED :
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
- "job-state-reasons", NULL, "aborted-by-system");
- break;
+ if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
+ {
+ send_http_error(con, status);
+ return (NULL);
+ }
+ else if ((printer->type & CUPS_PRINTER_AUTHENTICATED) && !con->username[0])
+ {
+ send_http_error(con, HTTP_UNAUTHORIZED);
+ return (NULL);
+ }
- case IPP_JOB_COMPLETED :
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
- "job-state-reasons", NULL, "job-completed-successfully");
- break;
+ /*
+ * See if the printer is accepting jobs...
+ */
+
+ if (!printer->accepting)
+ {
+ send_ipp_status(con, IPP_NOT_ACCEPTING,
+ _("Destination \"%s\" is not accepting jobs."),
+ dest);
+ return (NULL);
}
-}
+ /*
+ * Validate job template attributes; for now just copies and page-ranges...
+ */
-/*
- * 'add_job_subscriptions()' - Add any subcriptions for a job.
- */
+ 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 (NULL);
+ }
+ }
-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 ((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 (NULL);
+ }
+ lowerpagerange = attr->values[i].range.upper + 1;
+ }
+ }
/*
- * Find the first subscription group attribute; return if we have
- * none...
+ * Make sure we aren't over our limit...
*/
- for (attr = job->attrs->attrs, prev = NULL;
- attr;
- prev = attr, attr = attr->next)
- if (attr->group_tag == IPP_TAG_SUBSCRIPTION)
- break;
+ if (MaxJobs && cupsArrayCount(Jobs) >= MaxJobs)
+ cupsdCleanJobs();
- if (!attr)
- return;
+ if (cupsArrayCount(Jobs) >= MaxJobs && MaxJobs)
+ {
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("Too many active jobs."));
+ return (NULL);
+ }
+
+ if (!check_quotas(con, printer))
+ {
+ send_ipp_status(con, IPP_NOT_POSSIBLE, _("Quota limit reached."));
+ return (NULL);
+ }
/*
- * Process the subscription attributes in the request...
+ * Create the job and set things up...
*/
- while (attr)
+ if ((attr = ippFindAttribute(con->request, "job-priority",
+ IPP_TAG_INTEGER)) != NULL)
+ priority = attr->values[0].integer;
+ else
{
- 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") &&
- 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 ((val = cupsGetOption("job-priority", printer->num_options,
+ printer->options)) != NULL)
+ priority = atoi(val);
+ else
+ priority = 50;
- if (!recipient && !pullmethod)
- break;
+ ippAddInteger(con->request, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-priority",
+ priority);
+ }
- if (mask == CUPSD_EVENT_NONE)
- mask = CUPSD_EVENT_JOB_COMPLETED;
+ 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");
- sub = cupsdAddSubscription(mask, cupsdFindDest(job->dest), job, recipient,
- 0);
+ if ((job = cupsdAddJob(priority, printer->name)) == NULL)
+ {
+ send_ipp_status(con, IPP_INTERNAL_ERROR,
+ _("Unable to add job for destination \"%s\"!"), dest);
+ return (NULL);
+ }
- sub->interval = interval;
+ job->dtype = dtype;
+ job->attrs = con->request;
+ con->request = NULL;
- cupsdSetString(&sub->owner, job->username);
+ add_job_uuid(con, job);
+ apply_printer_defaults(printer, job);
- 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);
- }
+ attr = ippFindAttribute(job->attrs, "requesting-user-name", IPP_TAG_NAME);
- ippAddSeparator(con->response);
- ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
- "notify-subscription-id", sub->id);
+ if (con->username[0])
+ {
+ cupsdSetString(&job->username, con->username);
if (attr)
- attr = attr->next;
+ cupsdSetString(&attr->values[0].string.text, con->username);
+
+ save_auth_info(con, job);
}
+ else if (attr)
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "add_job: requesting-user-name=\"%s\"",
+ attr->values[0].string.text);
- cupsdSaveAllSubscriptions();
+ cupsdSetString(&job->username, attr->values[0].string.text);
+ }
+ else
+ cupsdSetString(&job->username, "anonymous");
- /*
- * Remove all of the subscription attributes from the job request...
- */
+ 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");
+ }
- for (attr = job->attrs->attrs, prev = NULL; attr; attr = next)
+ if ((attr = ippFindAttribute(job->attrs, "job-originating-host-name",
+ IPP_TAG_ZERO)) != NULL)
{
- next = attr->next;
+ /*
+ * Request contains a job-originating-host-name attribute; validate it...
+ */
- if (attr->group_tag == IPP_TAG_SUBSCRIPTION ||
- attr->group_tag == IPP_TAG_ZERO)
+ if (attr->value_tag != IPP_TAG_NAME ||
+ attr->num_values != 1 ||
+ strcmp(con->http.hostname, "localhost"))
{
/*
- * Free and remove this attribute...
+ * 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.
*/
- _ipp_free_attr(attr);
-
- if (prev)
- prev->next = next;
- else
- job->attrs->attrs = next;
- }
- else
- prev = attr;
- }
-
- job->attrs->last = prev;
- job->attrs->current = prev;
-}
-
-
-/*
- * '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 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 */
- int need_restart_job; /* Need to restart job? */
+ 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;
+ }
+ }
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_printer(%p[%d], %s)", con,
- con->http.fd, uri->values[0].string.text);
+ default :
+ break;
+ }
- /*
- * Do we have a valid URI?
- */
+ /*
+ * Use the default connection hostname instead...
+ */
- httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
- sizeof(method), username, sizeof(username), host,
- sizeof(host), &port, resource, sizeof(resource));
+ attr->value_tag = IPP_TAG_NAME;
+ attr->num_values = 1;
+ attr->values[0].string.text = _cupsStrAlloc(con->http.hostname);
+ }
- if (strncmp(resource, "/printers/", 10) || strlen(resource) == 10)
+ attr->group_tag = IPP_TAG_JOB;
+ }
+ else
{
/*
- * No, return an error...
+ * No job-originating-host-name attribute, so use the hostname from
+ * the connection...
*/
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("The printer-uri must be of the form "
- "\"ipp://HOSTNAME/printers/PRINTERNAME\"."));
- return;
+ 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;
+
/*
- * Do we have a valid printer name?
+ * Add remaining job attributes...
*/
- 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;
- }
-
- /*
- * Check policy...
- */
+ 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 = 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 ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+ 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)
{
- send_http_error(con, status);
- return;
+ 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...
+ */
- /*
- * See if the printer already exists; if not, create a new printer...
- */
+ cupsdSetJobHoldUntil(job, attr->values[0].string.text);
+ }
+ 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 = cupsdFindPrinter(resource + 10)) == NULL)
+ if (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)) ||
+ Classification)
{
/*
- * Printer doesn't exist; see if we have a class of the same name...
+ * Add job sheets options...
*/
- if ((printer = cupsdFindClass(resource + 10)) != NULL &&
- !(printer->type & CUPS_PRINTER_REMOTE))
+ if ((attr = ippFindAttribute(job->attrs, "job-sheets",
+ IPP_TAG_ZERO)) == NULL)
{
- /*
- * Yes, return an error...
- */
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Adding default job-sheets values \"%s,%s\"...",
+ printer->job_sheets[0], printer->job_sheets[1]);
- send_ipp_status(con, IPP_NOT_POSSIBLE,
- _("A class named \"%s\" already exists!"),
- resource + 10);
- return;
+ 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]);
}
- /*
- * No, add the printer...
- */
+ job->job_sheets = attr;
- printer = cupsdAddPrinter(resource + 10);
- modify = 0;
- }
- else if (printer->type & CUPS_PRINTER_IMPLICIT)
- {
/*
- * Rename the implicit printer to "AnyPrinter" or delete it...
+ * Enforce classification level if set...
*/
- if (ImplicitAnyClasses)
+ if (Classification)
{
- cupsArrayRemove(Printers, printer);
- cupsdSetStringf(&printer->name, "Any%s", resource + 10);
- cupsArrayAdd(Printers, printer);
- }
- else
- cupsdDeletePrinter(printer, 1);
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Classification=\"%s\", ClassifyOverride=%d",
+ Classification ? Classification : "(null)",
+ ClassifyOverride);
- /*
- * Add the printer as a new local printer...
- */
+ 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...
+ */
- printer = cupsdAddPrinter(resource + 10);
- modify = 0;
- }
- else if (printer->type & CUPS_PRINTER_REMOTE)
- {
- /*
- * Rename the remote printer to "Printer@server"...
- */
+ 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...
+ */
- cupsdDeletePrinterFilters(printer);
- cupsArrayRemove(Printers, printer);
- cupsdSetStringf(&printer->name, "%s@%s", resource + 10, printer->hostname);
- cupsdSetPrinterAttrs(printer);
- cupsArrayAdd(Printers, printer);
+ 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);
+ }
+ }
/*
- * Add the printer as a new local printer...
+ * See if we need to add the starting sheet...
*/
- printer = cupsdAddPrinter(resource + 10);
- modify = 0;
+ 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);
+
+ kbytes = copy_banner(con, job, attr->values[0].string.text);
+
+ cupsdUpdateQuota(printer, job->username, 0, kbytes);
+ }
}
- else
- modify = 1;
+ else if ((attr = ippFindAttribute(job->attrs, "job-sheets",
+ IPP_TAG_ZERO)) != NULL)
+ job->sheets = attr;
/*
- * Look for attributes and copy them over as needed...
+ * Fill in the response info...
*/
- need_restart_job = 0;
+ snprintf(job_uri, sizeof(job_uri), "http://%s:%d/jobs/%d", ServerName,
+ LocalPort, job->id);
- if ((attr = ippFindAttribute(con->request, "printer-location",
- IPP_TAG_TEXT)) != NULL)
- cupsdSetString(&printer->location, attr->values[0].string.text);
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI, "job-uri", NULL,
+ job_uri);
- if ((attr = ippFindAttribute(con->request, "printer-info",
- IPP_TAG_TEXT)) != NULL)
- cupsdSetString(&printer->info, attr->values[0].string.text);
+ ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-id", job->id);
- if ((attr = ippFindAttribute(con->request, "device-uri",
- IPP_TAG_URI)) != NULL)
- {
- /*
- * Do we have a valid device URI?
- */
+ ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_ENUM, "job-state",
+ job->state_value);
+ add_job_state_reasons(con, job);
- need_restart_job = 1;
+ con->response->request.status.status_code = IPP_OK;
- httpSeparateURI(HTTP_URI_CODING_ALL, attr->values[0].string.text, method,
- sizeof(method), username, sizeof(username), host,
- sizeof(host), &port, resource, sizeof(resource));
+ /*
+ * Add any job subscriptions...
+ */
- if (!strcmp(method, "file"))
- {
- /*
- * See if the administrator has enabled file devices...
- */
+ add_job_subscriptions(con, job);
- if (!FileDevice && strcmp(resource, "/dev/null"))
- {
- /*
- * File devices are disabled and the URL is not file:/dev/null...
- */
+ /*
+ * Set all but the first two attributes to the job attributes group...
+ */
- send_ipp_status(con, IPP_NOT_POSSIBLE,
- _("File device URIs have been disabled! "
- "To enable, see the FileDevice directive in "
- "\"%s/cupsd.conf\"."),
- ServerRoot);
- return;
- }
- }
- else
- {
- /*
- * See if the backend exists and is executable...
- */
-
- snprintf(srcfile, sizeof(srcfile), "%s/backend/%s", ServerBin, method);
- if (access(srcfile, X_OK))
- {
- /*
- * Could not find device in list!
- */
-
- send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad device-uri \"%s\"!"),
- attr->values[0].string.text);
- return;
- }
- }
+ for (attr = job->attrs->attrs->next->next; attr; attr = attr->next)
+ attr->group_tag = IPP_TAG_JOB;
- cupsdLogMessage(CUPSD_LOG_INFO,
- "Setting %s device-uri to \"%s\" (was \"%s\".)",
- printer->name,
- cupsdSanitizeURI(attr->values[0].string.text, line,
- sizeof(line)),
- cupsdSanitizeURI(printer->device_uri, resource,
- sizeof(resource)));
+ /*
+ * Fire the "job created" event...
+ */
- cupsdSetString(&printer->device_uri, attr->values[0].string.text);
- }
+ cupsdAddEvent(CUPSD_EVENT_JOB_CREATED, printer, job, "Job created.");
- if ((attr = ippFindAttribute(con->request, "port-monitor",
- IPP_TAG_KEYWORD)) != NULL)
- {
- ipp_attribute_t *supported; /* port-monitor-supported attribute */
+ /*
+ * Return the new job...
+ */
+ return (job);
+}
- need_restart_job = 1;
- supported = ippFindAttribute(printer->attrs, "port-monitor-supported",
- IPP_TAG_KEYWORD);
- for (i = 0; i < supported->num_values; i ++)
- if (!strcmp(supported->values[i].string.text,
- attr->values[0].string.text))
- break;
+/*
+ * 'add_job_state_reasons()' - Add the "job-state-reasons" attribute based
+ * upon the job and printer state...
+ */
- if (i >= supported->num_values)
- {
- send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad port-monitor \"%s\"!"),
- attr->values[0].string.text);
- return;
- }
+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_INFO,
- "Setting %s port-monitor to \"%s\" (was \"%s\".)",
- printer->name, attr->values[0].string.text,
- printer->port_monitor);
- if (strcmp(attr->values[0].string.text, "none"))
- cupsdSetString(&printer->port_monitor, attr->values[0].string.text);
- else
- cupsdClearString(&printer->port_monitor);
- }
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job_state_reasons(%p[%d], %d)",
+ con, con->http.fd, job ? job->id : 0);
- if ((attr = ippFindAttribute(con->request, "printer-is-accepting-jobs",
- IPP_TAG_BOOLEAN)) != NULL)
+ switch (job ? job->state_value : IPP_JOB_CANCELLED)
{
- cupsdLogMessage(CUPSD_LOG_INFO,
- "Setting %s printer-is-accepting-jobs to %d (was %d.)",
- printer->name, attr->values[0].boolean, printer->accepting);
-
- printer->accepting = attr->values[0].boolean;
- cupsdAddPrinterHistory(printer);
- }
+ case IPP_JOB_PENDING :
+ if (job->dtype & CUPS_PRINTER_CLASS)
+ dest = cupsdFindClass(job->dest);
+ else
+ dest = cupsdFindPrinter(job->dest);
- if ((attr = ippFindAttribute(con->request, "printer-is-shared",
- IPP_TAG_BOOLEAN)) != NULL)
- {
- if (printer->shared && !attr->values[0].boolean)
- cupsdSendBrowseDelete(printer);
+ 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;
- cupsdLogMessage(CUPSD_LOG_INFO,
- "Setting %s printer-is-shared to %d (was %d.)",
- printer->name, attr->values[0].boolean, printer->shared);
+ 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;
- printer->shared = attr->values[0].boolean;
- }
+ case IPP_JOB_PROCESSING :
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
+ "job-state-reasons", NULL, "job-printing");
+ break;
- 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)
- {
- send_ipp_status(con, IPP_BAD_REQUEST, _("Bad printer-state value %d!"),
- attr->values[0].integer);
- return;
- }
+ case IPP_JOB_STOPPED :
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
+ "job-state-reasons", NULL, "job-stopped");
+ break;
- cupsdLogMessage(CUPSD_LOG_INFO, "Setting %s printer-state to %d (was %d.)", printer->name,
- attr->values[0].integer, printer->state);
+ case IPP_JOB_CANCELLED :
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
+ "job-state-reasons", NULL, "job-canceled-by-user");
+ break;
- 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)
- {
- 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);
+ case IPP_JOB_ABORTED :
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
+ "job-state-reasons", NULL, "aborted-by-system");
+ break;
- 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);
+ case IPP_JOB_COMPLETED :
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
+ "job-state-reasons", NULL, "job-completed-successfully");
+ break;
}
- 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")))
- 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 */
+/*
+ * 'add_job_subscriptions()' - Add any subcriptions for a job.
+ */
- 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;
- }
+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 */
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "Setting printer-error-policy to \"%s\"...",
- attr->values[0].string.text);
- cupsdSetString(&printer->error_policy, attr->values[0].string.text);
- }
/*
- * See if we have all required attributes...
+ * Find the first subscription group attribute; return if we have
+ * none...
*/
- if (!printer->device_uri)
- cupsdSetString(&printer->device_uri, "file:///dev/null");
+ for (attr = job->attrs->attrs, prev = NULL;
+ attr;
+ prev = attr, attr = attr->next)
+ if (attr->group_tag == IPP_TAG_SUBSCRIPTION)
+ break;
+
+ if (!attr)
+ return;
/*
- * See if we have an interface script or PPD file attached to the request...
+ * Process the subscription attributes in the request...
*/
- if (con->filename)
+ while (attr)
{
- need_restart_job = 1;
-
- strlcpy(srcfile, con->filename, sizeof(srcfile));
+ recipient = NULL;
+ pullmethod = NULL;
+ user_data = NULL;
+ interval = 0;
+ mask = CUPSD_EVENT_NONE;
- if ((fp = cupsFileOpen(srcfile, "rb")))
+ while (attr && attr->group_tag != IPP_TAG_ZERO)
{
- /*
- * Yes; get the first line from it...
- */
-
- line[0] = '\0';
- cupsFileGets(fp, line, sizeof(line));
- cupsFileClose(fp);
-
- /*
- * Then see what kind of file it is...
- */
-
- snprintf(dstfile, sizeof(dstfile), "%s/interfaces/%s", ServerRoot,
- printer->name);
-
- if (!strncmp(line, "*PPD-Adobe", 10))
+ 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"))
{
- /*
- * The new file is a PPD file, so remove any old interface script
- * that might be lying around...
- */
-
- unlink(dstfile);
+ send_ipp_status(con, IPP_CHARSET,
+ _("Character set \"%s\" not supported!"),
+ attr->values[0].string.text);
+ return;
}
- else
+ else if (!strcmp(attr->name, "notify-natural-language") &&
+ (attr->value_tag != IPP_TAG_LANGUAGE ||
+ strcmp(attr->values[0].string.text, DefaultLanguage)))
{
- /*
- * This must be an interface script, so move the file over to the
- * interfaces directory and make it executable...
- */
-
- if (copy_file(srcfile, dstfile))
- {
- send_ipp_status(con, IPP_INTERNAL_ERROR,
- _("Unable to copy interface script - %s!"),
- strerror(errno));
- return;
- }
- else
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "Copied interface script successfully!");
- chmod(dstfile, 0755);
- }
+ send_ipp_status(con, IPP_CHARSET,
+ _("Language \"%s\" not supported!"),
+ attr->values[0].string.text);
+ return;
}
-
- snprintf(dstfile, sizeof(dstfile), "%s/ppd/%s.ppd", ServerRoot,
- printer->name);
-
- if (!strncmp(line, "*PPD-Adobe", 10))
+ else if (!strcmp(attr->name, "notify-user-data") &&
+ attr->value_tag == IPP_TAG_STRING)
{
- /*
- * The new file is a PPD file, so move the file over to the
- * ppd directory and make it readable by all...
- */
-
- if (copy_file(srcfile, dstfile))
+ if (attr->num_values > 1 || attr->values[0].unknown.length > 63)
{
- send_ipp_status(con, IPP_INTERNAL_ERROR,
- _("Unable to copy PPD file - %s!"),
- strerror(errno));
+ send_ipp_status(con, IPP_REQUEST_VALUE,
+ _("The notify-user-data value is too large "
+ "(%d > 63 octets)!"),
+ attr->values[0].unknown.length);
return;
}
- else
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "Copied PPD file successfully!");
- chmod(dstfile, 0644);
- }
+
+ user_data = attr;
}
- else
+ else if (!strcmp(attr->name, "notify-events") &&
+ attr->value_tag == IPP_TAG_KEYWORD)
{
- /*
- * This must be an interface script, so remove any old PPD file that
- * may be lying around...
- */
-
- unlink(dstfile);
+ 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;
}
- }
- else if ((attr = ippFindAttribute(con->request, "ppd-name",
- IPP_TAG_NAME)) != NULL)
- {
- need_restart_job = 1;
- if (!strcmp(attr->values[0].string.text, "raw"))
- {
- /*
- * Raw driver, remove any existing PPD or interface script files.
- */
+ if (!recipient && !pullmethod)
+ break;
- snprintf(dstfile, sizeof(dstfile), "%s/interfaces/%s", ServerRoot,
- printer->name);
- unlink(dstfile);
+ if (mask == CUPSD_EVENT_NONE)
+ mask = CUPSD_EVENT_JOB_COMPLETED;
- snprintf(dstfile, sizeof(dstfile), "%s/ppd/%s.ppd", ServerRoot,
- printer->name);
- unlink(dstfile);
+ 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);
}
- else
+
+ 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)
{
/*
- * PPD model file...
+ * Free and remove this attribute...
*/
- snprintf(dstfile, sizeof(dstfile), "%s/interfaces/%s", ServerRoot,
- printer->name);
- unlink(dstfile);
-
- snprintf(dstfile, sizeof(dstfile), "%s/ppd/%s.ppd", ServerRoot,
- printer->name);
+ _ippFreeAttr(attr);
- if (copy_model(con, attr->values[0].string.text, dstfile))
- {
- send_ipp_status(con, IPP_INTERNAL_ERROR, _("Unable to copy PPD file!"));
- return;
- }
+ if (prev)
+ prev->next = next;
else
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "Copied PPD file successfully!");
- chmod(dstfile, 0644);
- }
+ job->attrs->attrs = next;
}
+ else
+ prev = attr;
}
- /*
- * Update the printer attributes and return...
- */
+ job->attrs->last = prev;
+ job->attrs->current = prev;
+}
- cupsdSetPrinterAttrs(printer);
- cupsdSaveAllPrinters();
- if (need_restart_job && printer->job)
- {
- cupsd_job_t *job;
+/*
+ * 'add_job_uuid()' - Add job-uuid attribute to a job.
+ *
+ * See RFC 4122 for the definition of UUIDs and the format.
+ */
- /*
- * Stop the current job and then restart it below...
- */
+static void
+add_job_uuid(cupsd_client_t *con, /* I - Client connection */
+ cupsd_job_t *job) /* I - Job */
+{
+ char uuid[1024]; /* job-uuid string */
+ ipp_attribute_t *attr; /* job-uuid attribute */
+ _cups_md5_state_t md5state; /* MD5 state */
+ unsigned char md5sum[16]; /* MD5 digest/sum */
- job = (cupsd_job_t *)printer->job;
- cupsdStopJob(job, 1);
- job->state->values[0].integer = IPP_JOB_PENDING;
- }
+ /*
+ * First see if the job already has a job-uuid attribute; if so, return...
+ */
- if (need_restart_job)
- cupsdCheckJobs();
+ if ((attr = ippFindAttribute(job->attrs, "job-uuid", IPP_TAG_URI)) != NULL)
+ return;
- cupsdWritePrintcap();
+ /*
+ * 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...
+ */
- if (modify)
- {
- cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED, printer, NULL,
- "Printer \"%s\" modified by \"%s\".", printer->name,
- get_username(con));
+ snprintf(uuid, sizeof(uuid), "%s:%s:%d:%d", ServerName, con->servername,
+ con->serverport, job->id);
- cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" modified by \"%s\".",
- printer->name, get_username(con));
- }
- else
- {
- cupsdAddPrinterHistory(printer);
+ _cupsMD5Init(&md5state);
+ _cupsMD5Append(&md5state, (unsigned char *)uuid, strlen(uuid));
+ _cupsMD5Finish(&md5state, md5sum);
- cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED, printer, NULL,
- "New printer \"%s\" added by \"%s\".", printer->name,
- get_username(con));
+ /*
+ * Format the UUID URI using the MD5 sum and job ID.
+ */
- cupsdLogMessage(CUPSD_LOG_INFO, "New printer \"%s\" added by \"%s\".",
- printer->name, get_username(con));
- }
+ 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]);
- con->response->request.status.status_code = IPP_OK;
+ ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_URI, "job-uuid", NULL, uuid);
}
/*
- * 'add_printer_state_reasons()' - Add the "printer-state-reasons" attribute
- * based upon the printer state...
+ * 'add_printer()' - Add a printer to the system.
*/
static void
-add_printer_state_reasons(
- cupsd_client_t *con, /* I - Client connection */
- cupsd_printer_t *p) /* I - Printer info */
+add_printer(cupsd_client_t *con, /* I - Client connection */
+ ipp_attribute_t *uri) /* I - URI of printer */
{
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "add_printer_state_reasons(%p[%d], %p[%s])",
- con, con->http.fd, p, p->name);
-
- if (p->num_reasons == 0)
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
- "printer-state-reasons", NULL,
- p->state == IPP_PRINTER_STOPPED ? "paused" : "none");
- else
- ippAddStrings(con->response, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
- "printer-state-reasons", p->num_reasons, NULL,
- (const char * const *)p->reasons);
-}
-
-
-/*
- * 'add_queued_job_count()' - Add the "queued-job-count" attribute for
- * the specified printer or class.
- */
-
-static void
-add_queued_job_count(
- cupsd_client_t *con, /* I - Client connection */
- cupsd_printer_t *p) /* I - Printer or class */
-{
- int count; /* Number of jobs on destination */
+ 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 */
+ char newname[IPP_MAX_NAME]; /* New printer name */
+ int need_restart_job; /* Need to restart job? */
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_queued_job_count(%p[%d], %p[%s])",
- con, con->http.fd, p, p->name);
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_printer(%p[%d], %s)", con,
+ con->http.fd, uri->values[0].string.text);
- count = cupsdGetPrinterJobCount(p->name);
+ /*
+ * Do we have a valid URI?
+ */
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
- "queued-job-count", count);
-}
+ 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, "/printers/", 10) || strlen(resource) == 10)
+ {
+ /*
+ * No, return an error...
+ */
-/*
- * 'authenticate_job()' - Set job authentication info.
- */
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("The printer-uri must be of the form "
+ "\"ipp://HOSTNAME/printers/PRINTERNAME\"."));
+ return;
+ }
-static void
-authenticate_job(cupsd_client_t *con, /* I - Client connection */
- ipp_attribute_t *uri) /* I - Job URI */
-{
- ipp_attribute_t *attr; /* Job-id 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 */
+ /*
+ * Do we have a valid printer name?
+ */
+ if (!validate_name(resource + 10))
+ {
+ /*
+ * No, return an error...
+ */
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "authenticate_job(%p[%d], %s)",
- con, con->http.fd, uri->values[0].string.text);
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("The printer-uri \"%s\" contains invalid characters."),
+ uri->values[0].string.text);
+ return;
+ }
/*
- * Start with "everything is OK" status...
+ * Check policy...
*/
- con->response->request.status.status_code = IPP_OK;
+ if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+ {
+ send_http_error(con, status);
+ return;
+ }
/*
- * See if we have a job URI or a printer URI...
+ * See if the printer already exists; if not, create a new printer...
*/
- if (!strcmp(uri->name, "printer-uri"))
+ if ((printer = cupsdFindPrinter(resource + 10)) == NULL)
{
/*
- * Got a printer URI; see if we also have a job-id attribute...
+ * Printer doesn't exist; see if we have a class of the same name...
*/
- if ((attr = ippFindAttribute(con->request, "job-id",
- IPP_TAG_INTEGER)) == NULL)
+ if ((printer = cupsdFindClass(resource + 10)) != NULL &&
+ !(printer->type & CUPS_PRINTER_REMOTE))
{
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("Got a printer-uri attribute but no job-id!"));
+ /*
+ * Yes, return an error...
+ */
+
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("A class named \"%s\" already exists!"),
+ resource + 10);
return;
}
- jobid = attr->values[0].integer;
+ /*
+ * No, add the printer...
+ */
+
+ printer = cupsdAddPrinter(resource + 10);
+ modify = 0;
}
- else
+ else if (printer->type & CUPS_PRINTER_IMPLICIT)
{
/*
- * Got a job URI; parse it to get the job ID...
+ * Rename the implicit printer to "AnyPrinter" or delete it...
*/
- 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 (ImplicitAnyClasses)
{
- /*
- * Not a valid URI!
- */
-
- send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-uri attribute \"%s\"!"),
- uri->values[0].string.text);
- return;
+ snprintf(newname, sizeof(newname), "Any%s", resource + 10);
+ cupsdRenamePrinter(printer, newname);
}
+ else
+ cupsdDeletePrinter(printer, 1);
- jobid = atoi(resource + 6);
- }
-
- /*
- * See if the job exists...
- */
-
- if ((job = cupsdFindJob(jobid)) == NULL)
- {
/*
- * Nope - return a "not found" error...
+ * Add the printer as a new local printer...
*/
- send_ipp_status(con, IPP_NOT_FOUND,
- _("Job #%d does not exist!"), jobid);
- return;
+ printer = cupsdAddPrinter(resource + 10);
+ modify = 0;
}
-
- /*
- * See if the job has been completed...
- */
-
- if (job->state->values[0].integer != IPP_JOB_HELD)
+ else if (printer->type & CUPS_PRINTER_REMOTE)
{
/*
- * Return a "not-possible" error...
+ * Rename the remote printer to "Printer@server"...
*/
- send_ipp_status(con, IPP_NOT_POSSIBLE,
- _("Job #%d is not held for authentication!"),
- jobid);
- return;
- }
-
- /*
- * See if we have already authenticated...
- */
-
- if (!con->username[0])
- {
- send_ipp_status(con, IPP_NOT_AUTHORIZED,
- _("No authentication information provided!"));
- return;
- }
+ snprintf(newname, sizeof(newname), "%s@%s", resource + 10,
+ printer->hostname);
+ cupsdRenamePrinter(printer, newname);
- /*
- * See if the job is owned by the requesting user...
- */
+ /*
+ * Add the printer as a new local printer...
+ */
- 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);
- return;
+ printer = cupsdAddPrinter(resource + 10);
+ modify = 0;
}
+ else
+ modify = 1;
/*
- * Save the authentication information for this job...
+ * Look for attributes and copy them over as needed...
*/
- save_auth_info(con, job);
+ need_restart_job = 0;
- /*
- * Reset the job-hold-until value to "no-hold"...
- */
+ if ((attr = ippFindAttribute(con->request, "printer-location",
+ IPP_TAG_TEXT)) != NULL)
+ cupsdSetString(&printer->location, attr->values[0].string.text);
- if ((attr = ippFindAttribute(job->attrs, "job-hold-until",
- IPP_TAG_KEYWORD)) == NULL)
- attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
+ if ((attr = ippFindAttribute(con->request, "printer-info",
+ IPP_TAG_TEXT)) != NULL)
+ cupsdSetString(&printer->info, attr->values[0].string.text);
- if (attr)
+ if ((attr = ippFindAttribute(con->request, "device-uri",
+ IPP_TAG_URI)) != NULL)
{
- attr->value_tag = IPP_TAG_KEYWORD;
- cupsdSetString(&(attr->values[0].string.text), "no-hold");
- }
-
- /*
- * Release the job and return...
- */
+ /*
+ * Do we have a valid device URI?
+ */
- cupsdReleaseJob(job);
+ need_restart_job = 1;
- cupsdLogMessage(CUPSD_LOG_INFO, "Job %d was authenticated by \"%s\".", jobid,
- con->username);
-}
+ httpSeparateURI(HTTP_URI_CODING_ALL, attr->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
+ if (!strcmp(method, "file"))
+ {
+ /*
+ * See if the administrator has enabled file devices...
+ */
-/*
- * 'cancel_all_jobs()' - Cancel all print jobs.
- */
+ if (!FileDevice && strcmp(resource, "/dev/null"))
+ {
+ /*
+ * File devices are disabled and the URL is not file:/dev/null...
+ */
-static void
-cancel_all_jobs(cupsd_client_t *con, /* I - Client connection */
- 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 */
- userpass[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 */
- ipp_attribute_t *attr; /* Attribute in request */
- const char *username; /* Username */
- int purge; /* Purge? */
- cupsd_printer_t *printer; /* Printer */
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("File device URIs have been disabled! "
+ "To enable, see the FileDevice directive in "
+ "\"%s/cupsd.conf\"."),
+ ServerRoot);
+ return;
+ }
+ }
+ else
+ {
+ /*
+ * See if the backend exists and is executable...
+ */
+ snprintf(srcfile, sizeof(srcfile), "%s/backend/%s", ServerBin, method);
+ if (access(srcfile, X_OK))
+ {
+ /*
+ * Could not find device in list!
+ */
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "cancel_all_jobs(%p[%d], %s)", con,
- con->http.fd, uri->values[0].string.text);
+ send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad device-uri \"%s\"!"),
+ attr->values[0].string.text);
+ return;
+ }
+ }
- /*
- * See if we have a printer URI...
- */
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Setting %s device-uri to \"%s\" (was \"%s\".)",
+ printer->name,
+ cupsdSanitizeURI(attr->values[0].string.text, line,
+ sizeof(line)),
+ cupsdSanitizeURI(printer->device_uri, resource,
+ sizeof(resource)));
- if (strcmp(uri->name, "printer-uri"))
- {
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("The printer-uri attribute is required!"));
- return;
+ cupsdSetString(&printer->device_uri, attr->values[0].string.text);
}
- /*
- * Get the username (if any) for the jobs we want to cancel (only if
- * "my-jobs" is specified...
- */
-
- if ((attr = ippFindAttribute(con->request, "my-jobs",
- IPP_TAG_BOOLEAN)) != NULL &&
- attr->values[0].boolean)
+ if ((attr = ippFindAttribute(con->request, "port-monitor",
+ IPP_TAG_KEYWORD)) != NULL)
{
- if ((attr = ippFindAttribute(con->request, "requesting-user-name",
- IPP_TAG_NAME)) != NULL)
- username = attr->values[0].string.text;
- else
+ 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 ++)
+ if (!strcmp(supported->values[i].string.text,
+ attr->values[0].string.text))
+ break;
+
+ if (i >= supported->num_values)
{
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("Missing requesting-user-name attribute!"));
+ send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad port-monitor \"%s\"!"),
+ attr->values[0].string.text);
return;
}
+
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Setting %s port-monitor to \"%s\" (was \"%s\".)",
+ printer->name, attr->values[0].string.text,
+ printer->port_monitor);
+
+ if (strcmp(attr->values[0].string.text, "none"))
+ cupsdSetString(&printer->port_monitor, attr->values[0].string.text);
+ else
+ cupsdClearString(&printer->port_monitor);
}
- else
- username = NULL;
- /*
- * Look for the "purge-jobs" attribute...
- */
+ 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.)",
+ printer->name, attr->values[0].boolean, printer->accepting);
- if ((attr = ippFindAttribute(con->request, "purge-jobs",
+ printer->accepting = attr->values[0].boolean;
+ cupsdAddPrinterHistory(printer);
+ }
+
+ if ((attr = ippFindAttribute(con->request, "printer-is-shared",
IPP_TAG_BOOLEAN)) != NULL)
- purge = attr->values[0].boolean;
- else
- purge = 1;
+ {
+ if (printer->shared && !attr->values[0].boolean)
+ cupsdSendBrowseDelete(printer);
- /*
- * And if the destination is valid...
- */
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Setting %s printer-is-shared to %d (was %d.)",
+ printer->name, attr->values[0].boolean, printer->shared);
- httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
- sizeof(method), userpass, sizeof(userpass), host,
- sizeof(host), &port, resource, sizeof(resource));
+ printer->shared = attr->values[0].boolean;
+ }
- if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-state",
+ IPP_TAG_ENUM)) != NULL)
{
- /*
- * Bad URI?
- */
-
- if (!strncmp(resource, "/printers/", 10) ||
- !strncmp(resource, "/classes/", 9))
- {
- send_ipp_status(con, IPP_NOT_FOUND,
- _("The printer or class was not found."));
- return;
- }
- else if (strcmp(resource, "/printers/"))
+ if (attr->values[0].integer != IPP_PRINTER_IDLE &&
+ attr->values[0].integer != IPP_PRINTER_STOPPED)
{
- send_ipp_status(con, IPP_NOT_FOUND,
- _("The printer-uri \"%s\" is not valid."),
- uri->values[0].string.text);
+ send_ipp_status(con, IPP_BAD_REQUEST, _("Bad printer-state value %d!"),
+ attr->values[0].integer);
return;
}
- /*
- * Check policy...
- */
+ cupsdLogMessage(CUPSD_LOG_INFO, "Setting %s printer-state to %d (was %d.)", printer->name,
+ attr->values[0].integer, printer->state);
- if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+ if (attr->values[0].integer == IPP_PRINTER_STOPPED)
+ cupsdStopPrinter(printer, 0);
+ else
{
- send_http_error(con, status);
- return;
+ need_restart_job = 1;
+ cupsdSetPrinterState(printer, (ipp_pstate_t)(attr->values[0].integer), 0);
}
-
- /*
- * Cancel all jobs on all printers...
- */
-
- cupsdCancelJobs(NULL, username, purge);
-
- cupsdLogMessage(CUPSD_LOG_INFO, "All jobs were %s by \"%s\".",
- purge ? "purged" : "cancelled", get_username(con));
}
- else
+ if ((attr = ippFindAttribute(con->request, "printer-state-message",
+ IPP_TAG_TEXT)) != NULL)
{
- /*
- * Check policy...
- */
-
- if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
- {
- send_http_error(con, status);
- return;
- }
-
- /*
- * Cancel all of the jobs on the named printer...
- */
-
- cupsdCancelJobs(dest, username, purge);
-
- cupsdLogMessage(CUPSD_LOG_INFO, "All jobs on \"%s\" were %s by \"%s\".",
- dest, purge ? "purged" : "cancelled", get_username(con));
+ strlcpy(printer->state_message, attr->values[0].string.text,
+ sizeof(printer->state_message));
+ cupsdAddPrinterHistory(printer);
}
- con->response->request.status.status_code = IPP_OK;
-}
-
-
-/*
- * 'cancel_job()' - Cancel a print job.
- */
-
-static void
-cancel_job(cupsd_client_t *con, /* I - Client connection */
- ipp_attribute_t *uri) /* I - Job or Printer URI */
-{
- ipp_attribute_t *attr; /* Current attribute */
- 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 */
- const char *dest; /* Destination */
- cups_ptype_t dtype; /* Destination type (printer or class) */
- cupsd_printer_t *printer; /* Printer data */
+ set_printer_defaults(con, printer);
+ /*
+ * See if we have all required attributes...
+ */
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "cancel_job(%p[%d], %s)", con,
- con->http.fd, uri->values[0].string.text);
+ if (!printer->device_uri)
+ cupsdSetString(&printer->device_uri, "file:///dev/null");
/*
- * See if we have a job URI or a printer URI...
+ * See if we have an interface script or PPD file attached to the request...
*/
- if (!strcmp(uri->name, "printer-uri"))
+ if (con->filename)
{
- /*
- * Got a printer URI; see if we also have a job-id attribute...
- */
+ need_restart_job = 1;
- 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;
- }
+ strlcpy(srcfile, con->filename, sizeof(srcfile));
- if ((jobid = attr->values[0].integer) == 0)
+ if ((fp = cupsFileOpen(srcfile, "rb")))
{
/*
- * Find the current job on the specified printer...
+ * Yes; get the first line from it...
*/
- httpSeparateURI(HTTP_URI_CODING_ALL, 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;
- }
+ line[0] = '\0';
+ cupsFileGets(fp, line, sizeof(line));
+ cupsFileClose(fp);
/*
- * See if the printer is currently printing a job...
+ * Then see what kind of file it is...
*/
- if (printer->job)
- jobid = ((cupsd_job_t *)printer->job)->id;
+ snprintf(dstfile, sizeof(dstfile), "%s/interfaces/%s", ServerRoot,
+ printer->name);
+
+ if (!strncmp(line, "*PPD-Adobe", 10))
+ {
+ /*
+ * The new file is a PPD file, so remove any old interface script
+ * that might be lying around...
+ */
+
+ unlink(dstfile);
+ }
else
{
/*
- * No, see if there are any pending jobs...
+ * This must be an interface script, so move the file over to the
+ * interfaces directory and make it executable...
*/
-
- 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))
- break;
- if (job)
- jobid = job->id;
+ if (copy_file(srcfile, dstfile))
+ {
+ send_ipp_status(con, IPP_INTERNAL_ERROR,
+ _("Unable to copy interface script - %s!"),
+ strerror(errno));
+ return;
+ }
else
{
- send_ipp_status(con, IPP_NOT_POSSIBLE, _("No active jobs on %s!"),
- dest);
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Copied interface script successfully!");
+ chmod(dstfile, 0755);
+ }
+ }
+
+ snprintf(dstfile, sizeof(dstfile), "%s/ppd/%s.ppd", ServerRoot,
+ printer->name);
+
+ if (!strncmp(line, "*PPD-Adobe", 10))
+ {
+ /*
+ * The new file is a PPD file, so move the file over to the
+ * ppd directory and make it readable by all...
+ */
+
+ if (copy_file(srcfile, dstfile))
+ {
+ send_ipp_status(con, IPP_INTERNAL_ERROR,
+ _("Unable to copy PPD file - %s!"),
+ strerror(errno));
return;
}
+ else
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Copied PPD file successfully!");
+ chmod(dstfile, 0644);
+ }
+ }
+ else
+ {
+ /*
+ * This must be an interface script, so remove any old PPD file that
+ * may be lying around...
+ */
+
+ unlink(dstfile);
}
}
}
- else
+ else if ((attr = ippFindAttribute(con->request, "ppd-name",
+ IPP_TAG_NAME)) != NULL)
{
- /*
- * Got a job URI; parse it to get the job ID...
- */
+ need_restart_job = 1;
- 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 (!strcmp(attr->values[0].string.text, "raw"))
{
/*
- * Not a valid URI!
+ * Raw driver, remove any existing PPD or interface script files.
*/
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("Bad job-uri attribute \"%s\"!"),
- uri->values[0].string.text);
- return;
+ snprintf(dstfile, sizeof(dstfile), "%s/interfaces/%s", ServerRoot,
+ printer->name);
+ unlink(dstfile);
+
+ snprintf(dstfile, sizeof(dstfile), "%s/ppd/%s.ppd", ServerRoot,
+ printer->name);
+ unlink(dstfile);
}
+ else
+ {
+ /*
+ * PPD model file...
+ */
- jobid = atoi(resource + 6);
+ snprintf(dstfile, sizeof(dstfile), "%s/interfaces/%s", ServerRoot,
+ printer->name);
+ unlink(dstfile);
+
+ snprintf(dstfile, sizeof(dstfile), "%s/ppd/%s.ppd", ServerRoot,
+ printer->name);
+
+ if (copy_model(con, attr->values[0].string.text, dstfile))
+ {
+ send_ipp_status(con, IPP_INTERNAL_ERROR, _("Unable to copy PPD file!"));
+ return;
+ }
+ else
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Copied PPD file successfully!");
+ chmod(dstfile, 0644);
+ }
+ }
}
/*
- * See if the job exists...
+ * Update the printer attributes and return...
*/
- if ((job = cupsdFindJob(jobid)) == NULL)
+ cupsdSetPrinterAttrs(printer);
+ cupsdSaveAllPrinters();
+
+ if (need_restart_job && printer->job)
{
+ cupsd_job_t *job;
+
/*
- * Nope - return a "not found" error...
+ * Stop the current job and then restart it below...
*/
- send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid);
- return;
- }
+ job = (cupsd_job_t *)printer->job;
- /*
- * See if the job is owned by the requesting user...
- */
+ cupsdStopJob(job, 1);
- 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);
- return;
+ job->state->values[0].integer = IPP_JOB_PENDING;
+ job->state_value = IPP_JOB_PENDING;
}
- /*
- * See if the job is already completed, cancelled, or aborted; if so,
- * we can't cancel...
- */
+ if (need_restart_job)
+ cupsdCheckJobs();
- if (job->state->values[0].integer >= IPP_JOB_CANCELLED)
- {
- 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");
- return;
- }
+ cupsdWritePrintcap();
- /*
- * Cancel the job and return...
- */
+ if (modify)
+ {
+ cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED, printer, NULL,
+ "Printer \"%s\" modified by \"%s\".", printer->name,
+ get_username(con));
- cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, job->printer, job,
- "Job cancelled by \"%s\".", username);
+ cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" modified by \"%s\".",
+ printer->name, get_username(con));
+ }
+ else
+ {
+ cupsdAddPrinterHistory(printer);
- cupsdCancelJob(job, 0);
- cupsdCheckJobs();
+ cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED, printer, NULL,
+ "New printer \"%s\" added by \"%s\".", printer->name,
+ get_username(con));
- cupsdLogMessage(CUPSD_LOG_INFO, "Job %d was cancelled by \"%s\".", jobid,
- username);
+ cupsdLogMessage(CUPSD_LOG_INFO, "New printer \"%s\" added by \"%s\".",
+ printer->name, get_username(con));
+ }
con->response->request.status.status_code = IPP_OK;
}
/*
- * 'cancel_subscription()' - Cancel a subscription.
+ * 'add_printer_state_reasons()' - Add the "printer-state-reasons" attribute
+ * based upon the printer state...
*/
static void
-cancel_subscription(
- cupsd_client_t *con, /* I - Client connection */
- int sub_id) /* I - Subscription ID */
+add_printer_state_reasons(
+ cupsd_client_t *con, /* I - Client connection */
+ cupsd_printer_t *p) /* I - Printer info */
{
+ cupsdLogMessage(CUPSD_LOG_DEBUG2,
+ "add_printer_state_reasons(%p[%d], %p[%s])",
+ con, con->http.fd, p, p->name);
+
+ if (p->num_reasons == 0)
+ ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
+ "printer-state-reasons", NULL,
+ p->state == IPP_PRINTER_STOPPED ? "paused" : "none");
+ else
+ ippAddStrings(con->response, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
+ "printer-state-reasons", p->num_reasons, NULL,
+ (const char * const *)p->reasons);
}
/*
- * 'check_quotas()' - Check quotas for a printer and user.
+ * 'add_queued_job_count()' - Add the "queued-job-count" attribute for
+ * the specified printer or class.
*/
-static int /* O - 1 if OK, 0 if not */
-check_quotas(cupsd_client_t *con, /* I - Client connection */
- cupsd_printer_t *p) /* I - Printer or class */
+static void
+add_queued_job_count(
+ cupsd_client_t *con, /* I - Client connection */
+ cupsd_printer_t *p) /* I - Printer or class */
{
- int i; /* Looping var */
- char username[33]; /* Username */
- cupsd_quota_t *q; /* Quota data */
- struct passwd *pw; /* User password data */
+ int count; /* Number of jobs on destination */
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "check_quotas(%p[%d], %p[%s])",
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_queued_job_count(%p[%d], %p[%s])",
con, con->http.fd, p, p->name);
- /*
- * Check input...
- */
+ count = cupsdGetPrinterJobCount(p->name);
+
+ ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
+ "queued-job-count", count);
+}
+
+
+/*
+ * '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 */
- if (!con || !p)
- return (0);
/*
- * Figure out who is printing...
+ * Collect all of the default options and add the missing ones to the
+ * job object...
*/
- strlcpy(username, get_username(con), sizeof(username));
+ 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);
+ }
/*
- * Check global active job limits for printers and users...
+ * Encode these options as attributes in the job object...
*/
- if (MaxJobsPerPrinter)
- {
- /*
- * Check if there are too many pending jobs on this printer...
- */
+ cupsEncodeOptions2(job->attrs, num_options, options, IPP_TAG_JOB);
+ cupsFreeOptions(num_options, options);
+}
- if (cupsdGetPrinterJobCount(p->name) >= MaxJobsPerPrinter)
+
+/*
+ * 'authenticate_job()' - Set job authentication info.
+ */
+
+static void
+authenticate_job(cupsd_client_t *con, /* I - Client connection */
+ ipp_attribute_t *uri) /* I - Job URI */
+{
+ ipp_attribute_t *attr; /* Job-id 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 */
+
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "authenticate_job(%p[%d], %s)",
+ con, con->http.fd, uri->values[0].string.text);
+
+ /*
+ * Start with "everything is OK" status...
+ */
+
+ con->response->request.status.status_code = IPP_OK;
+
+ /*
+ * 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)
{
- cupsdLogMessage(CUPSD_LOG_INFO, "Too many jobs for printer \"%s\"...",
- p->name);
- return (0);
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("Got a printer-uri attribute but no job-id!"));
+ return;
}
- }
- if (MaxJobsPerUser)
+ jobid = attr->values[0].integer;
+ }
+ else
{
/*
- * Check if there are too many pending jobs for this user...
+ * Got a job URI; parse it to get the job ID...
*/
- if (cupsdGetUserJobCount(username) >= MaxJobsPerUser)
+ 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))
{
- cupsdLogMessage(CUPSD_LOG_INFO, "Too many jobs for user \"%s\"...",
- username);
- return (0);
+ /*
+ * 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);
}
/*
- * Check against users...
+ * See if the job exists...
*/
- if (p->num_users == 0 && p->k_limit == 0 && p->page_limit == 0)
- return (1);
+ if ((job = cupsdFindJob(jobid)) == NULL)
+ {
+ /*
+ * Nope - return a "not found" error...
+ */
- if (p->num_users)
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("Job #%d does not exist!"), jobid);
+ return;
+ }
+
+ /*
+ * See if the job has been completed...
+ */
+
+ if (job->state_value != IPP_JOB_HELD)
{
- pw = getpwnam(username);
- endpwent();
+ /*
+ * Return a "not-possible" error...
+ */
- for (i = 0; i < p->num_users; i ++)
- if (p->users[i][0] == '@')
- {
- /*
- * Check group membership...
- */
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("Job #%d is not held for authentication!"),
+ jobid);
+ return;
+ }
- if (cupsdCheckGroup(username, pw, p->users[i] + 1))
- break;
- }
- else if (!strcasecmp(username, p->users[i]))
- break;
+ /*
+ * See if we have already authenticated...
+ */
- if ((i < p->num_users) == p->deny_users)
- {
- cupsdLogMessage(CUPSD_LOG_INFO,
- "Denying user \"%s\" access to printer \"%s\"...",
- username, p->name);
- return (0);
- }
+ if (!con->username[0])
+ {
+ send_ipp_status(con, IPP_NOT_AUTHORIZED,
+ _("No authentication information provided!"));
+ return;
}
/*
- * Check quotas...
+ * See if the job is owned by the requesting user...
*/
- if (p->k_limit || p->page_limit)
+ if (!validate_user(job, con, job->username, username, sizeof(username)))
{
- if ((q = cupsdUpdateQuota(p, username, 0, 0)) == NULL)
- {
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "Unable to allocate quota data for user \"%s\"!",
- username);
- return (0);
- }
+ send_http_error(con, HTTP_UNAUTHORIZED);
+ return;
+ }
- if ((q->k_count >= p->k_limit && p->k_limit) ||
- (q->page_count >= p->page_limit && p->page_limit))
- {
- cupsdLogMessage(CUPSD_LOG_INFO, "User \"%s\" is over the quota limit...",
- username);
- return (0);
- }
+ /*
+ * Save the authentication information for this job...
+ */
+
+ save_auth_info(con, job);
+
+ /*
+ * Reset the job-hold-until value to "no-hold"...
+ */
+
+ if ((attr = ippFindAttribute(job->attrs, "job-hold-until",
+ IPP_TAG_KEYWORD)) == NULL)
+ attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
+
+ if (attr)
+ {
+ attr->value_tag = IPP_TAG_KEYWORD;
+ cupsdSetString(&(attr->values[0].string.text), "no-hold");
}
/*
- * If we have gotten this far, we're done!
+ * Release the job and return...
*/
- return (1);
+ cupsdReleaseJob(job);
+
+ cupsdLogMessage(CUPSD_LOG_INFO, "Job %d was authenticated by \"%s\".", jobid,
+ con->username);
}
/*
- * 'copy_attribute()' - Copy a single attribute.
+ * 'cancel_all_jobs()' - Cancel all print jobs.
*/
-static ipp_attribute_t * /* O - New attribute */
-copy_attribute(
- ipp_t *to, /* O - Destination request/response */
- ipp_attribute_t *attr, /* I - Attribute to copy */
- int quickcopy) /* I - Do a quick copy? */
+static void
+cancel_all_jobs(cupsd_client_t *con, /* I - Client connection */
+ ipp_attribute_t *uri) /* I - Job or Printer URI */
{
- int i; /* Looping var */
- ipp_attribute_t *toattr; /* Destination attribute */
+ 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 */
+ userpass[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 */
+ ipp_attribute_t *attr; /* Attribute in request */
+ const char *username; /* Username */
+ int purge; /* Purge? */
+ cupsd_printer_t *printer; /* Printer */
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "copy_attribute(%p, %p[%s,%x,%x])", to, attr,
- attr->name ? attr->name : "(null)", attr->group_tag,
- attr->value_tag);
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cancel_all_jobs(%p[%d], %s)", con,
+ con->http.fd, uri->values[0].string.text);
- switch (attr->value_tag & ~IPP_TAG_COPY)
- {
- case IPP_TAG_ZERO :
- toattr = ippAddSeparator(to);
- break;
+ /*
+ * See if we have a printer URI...
+ */
- case IPP_TAG_INTEGER :
- case IPP_TAG_ENUM :
- toattr = ippAddIntegers(to, attr->group_tag, attr->value_tag,
- attr->name, attr->num_values, NULL);
+ if (strcmp(uri->name, "printer-uri"))
+ {
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("The printer-uri attribute is required!"));
+ return;
+ }
- for (i = 0; i < attr->num_values; i ++)
- toattr->values[i].integer = attr->values[i].integer;
- break;
+ /*
+ * Get the username (if any) for the jobs we want to cancel (only if
+ * "my-jobs" is specified...
+ */
- case IPP_TAG_BOOLEAN :
- toattr = ippAddBooleans(to, attr->group_tag, attr->name,
- attr->num_values, 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)
+ username = attr->values[0].string.text;
+ else
+ {
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("Missing requesting-user-name attribute!"));
+ return;
+ }
+ }
+ else
+ username = NULL;
- for (i = 0; i < attr->num_values; i ++)
- toattr->values[i].boolean = attr->values[i].boolean;
- break;
+ /*
+ * Look for the "purge-jobs" attribute...
+ */
- case IPP_TAG_STRING :
- 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 :
- toattr = ippAddStrings(to, attr->group_tag,
- (ipp_tag_t)(attr->value_tag | quickcopy),
- attr->name, attr->num_values, NULL, NULL);
-
- if (quickcopy)
- {
- for (i = 0; i < attr->num_values; i ++)
- toattr->values[i].string.text = attr->values[i].string.text;
- }
- else
- {
- for (i = 0; i < attr->num_values; i ++)
- toattr->values[i].string.text = _cups_sp_alloc(attr->values[i].string.text);
- }
- break;
+ if ((attr = ippFindAttribute(con->request, "purge-jobs",
+ IPP_TAG_BOOLEAN)) != NULL)
+ purge = attr->values[0].boolean;
+ else
+ purge = 1;
- case IPP_TAG_DATE :
- toattr = ippAddDate(to, attr->group_tag, attr->name,
- attr->values[0].date);
- break;
+ /*
+ * And if the destination is valid...
+ */
- case IPP_TAG_RESOLUTION :
- toattr = ippAddResolutions(to, attr->group_tag, attr->name,
- attr->num_values, IPP_RES_PER_INCH,
- NULL, NULL);
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), userpass, sizeof(userpass), host,
+ sizeof(host), &port, resource, sizeof(resource));
- for (i = 0; i < attr->num_values; i ++)
- {
- toattr->values[i].resolution.xres = attr->values[i].resolution.xres;
- toattr->values[i].resolution.yres = attr->values[i].resolution.yres;
- toattr->values[i].resolution.units = attr->values[i].resolution.units;
- }
- break;
+ if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
+ {
+ /*
+ * Bad URI?
+ */
- case IPP_TAG_RANGE :
- toattr = ippAddRanges(to, attr->group_tag, attr->name,
- attr->num_values, NULL, NULL);
+ 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;
+ }
- for (i = 0; i < attr->num_values; i ++)
- {
- toattr->values[i].range.lower = attr->values[i].range.lower;
- toattr->values[i].range.upper = attr->values[i].range.upper;
- }
- break;
+ /*
+ * Check policy...
+ */
- case IPP_TAG_TEXTLANG :
- case IPP_TAG_NAMELANG :
- toattr = ippAddStrings(to, attr->group_tag,
- (ipp_tag_t)(attr->value_tag | quickcopy),
- attr->name, attr->num_values, NULL, NULL);
+ if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+ {
+ send_http_error(con, status);
+ return;
+ }
- if (quickcopy)
- {
- for (i = 0; i < attr->num_values; i ++)
- {
- toattr->values[i].string.charset = attr->values[i].string.charset;
- toattr->values[i].string.text = attr->values[i].string.text;
- }
- }
- else
- {
- for (i = 0; i < attr->num_values; i ++)
- {
- if (!i)
- toattr->values[i].string.charset =
- _cups_sp_alloc(attr->values[i].string.charset);
- else
- toattr->values[i].string.charset =
- toattr->values[0].string.charset;
+ /*
+ * Cancel all jobs on all printers...
+ */
- toattr->values[i].string.text = _cups_sp_alloc(attr->values[i].string.text);
- }
- }
- break;
+ cupsdCancelJobs(NULL, username, purge);
- case IPP_TAG_BEGIN_COLLECTION :
- toattr = ippAddCollections(to, attr->group_tag, attr->name,
- attr->num_values, NULL);
+ cupsdLogMessage(CUPSD_LOG_INFO, "All jobs were %s by \"%s\".",
+ purge ? "purged" : "cancelled", get_username(con));
+ }
+ else
+ {
+ /*
+ * Check policy...
+ */
- for (i = 0; i < attr->num_values; i ++)
- {
- toattr->values[i].collection = ippNew();
- copy_attrs(toattr->values[i].collection, attr->values[i].collection,
- NULL, IPP_TAG_ZERO, 0);
- }
- break;
+ if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
+ {
+ send_http_error(con, status);
+ return;
+ }
- default :
- toattr = ippAddIntegers(to, attr->group_tag, attr->value_tag,
- attr->name, attr->num_values, NULL);
+ /*
+ * Cancel all of the jobs on the named printer...
+ */
- for (i = 0; i < attr->num_values; i ++)
- {
- toattr->values[i].unknown.length = attr->values[i].unknown.length;
+ cupsdCancelJobs(dest, username, purge);
- if (toattr->values[i].unknown.length > 0)
- {
- 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,
- attr->values[i].unknown.data,
- toattr->values[i].unknown.length);
- }
- }
- break; /* anti-compiler-warning-code */
+ cupsdLogMessage(CUPSD_LOG_INFO, "All jobs on \"%s\" were %s by \"%s\".",
+ dest, purge ? "purged" : "cancelled", get_username(con));
}
- return (toattr);
+ con->response->request.status.status_code = IPP_OK;
}
/*
- * 'copy_attrs()' - Copy attributes from one request to another.
+ * 'cancel_job()' - Cancel a print job.
*/
static void
-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? */
+cancel_job(cupsd_client_t *con, /* I - Client connection */
+ ipp_attribute_t *uri) /* I - Job or Printer URI */
{
- ipp_attribute_t *fromattr; /* Source attribute */
+ ipp_attribute_t *attr; /* Current attribute */
+ 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 */
+ const char *dest; /* Destination */
+ cups_ptype_t dtype; /* Destination type (printer or class) */
+ cupsd_printer_t *printer; /* Printer data */
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "copy_attrs(to=%p, from=%p, ra=%p, group=%x, quickcopy=%d)",
- to, from, ra, group, quickcopy);
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cancel_job(%p[%d], %s)", con,
+ con->http.fd, uri->values[0].string.text);
- if (!to || !from)
- return;
+ /*
+ * See if we have a job URI or a printer URI...
+ */
- for (fromattr = from->attrs; fromattr; fromattr = fromattr->next)
+ if (!strcmp(uri->name, "printer-uri"))
{
/*
- * Filter attributes as needed...
+ * Got a printer URI; see if we also have a job-id attribute...
*/
- if (group != IPP_TAG_ZERO && fromattr->group_tag != group &&
- fromattr->group_tag != IPP_TAG_ZERO && !fromattr->name)
- continue;
-
- if (!ra || cupsArrayFind(ra, fromattr->name))
- copy_attribute(to, fromattr, quickcopy);
- }
-}
-
+ 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;
+ }
-/*
- * 'copy_banner()' - Copy a banner file to the requests directory for the
- * specified job.
- */
+ if ((jobid = attr->values[0].integer) == 0)
+ {
+ /*
+ * Find the current job on the specified printer...
+ */
-static int /* O - Size of banner file in kbytes */
-copy_banner(cupsd_client_t *con, /* I - Client connection */
- cupsd_job_t *job, /* I - Job information */
- const char *name) /* I - Name of banner */
-{
- int i; /* Looping var */
- int kbytes; /* Size of banner file in kbytes */
- char filename[1024]; /* Job filename */
- cupsd_banner_t *banner; /* Pointer to banner */
- cups_file_t *in; /* Input file */
- cups_file_t *out; /* Output file */
- int ch; /* Character from file */
- char attrname[255], /* Name of attribute */
- *s; /* Pointer into name */
- ipp_attribute_t *attr; /* Attribute */
+ httpSeparateURI(HTTP_URI_CODING_ALL, 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...
+ */
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_banner(%p[%d], %p[%d], %s)",
- con, con->http.fd, job, job->id, name ? name : "(null)");
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("The printer or class was not found."));
+ return;
+ }
- /*
- * Find the banner; return if not found or "none"...
- */
+ /*
+ * See if the printer is currently printing a job...
+ */
- if (!name || !strcmp(name, "none") ||
- (banner = cupsdFindBanner(name)) == NULL)
- return (0);
+ if (printer->job)
+ jobid = ((cupsd_job_t *)printer->job)->id;
+ else
+ {
+ /*
+ * 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_value <= IPP_JOB_PROCESSING &&
+ !strcasecmp(job->dest, dest))
+ break;
- /*
- * Open the banner and job files...
- */
+ if (job)
+ jobid = job->id;
+ else
+ {
+ send_ipp_status(con, IPP_NOT_POSSIBLE, _("No active jobs on %s!"),
+ dest);
+ return;
+ }
+ }
+ }
+ }
+ else
+ {
+ /*
+ * Got a job URI; parse it to get the job ID...
+ */
- if (add_file(con, job, banner->filetype, 0))
- return (0);
+ 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!
+ */
- snprintf(filename, sizeof(filename), "%s/d%05d-%03d", RequestRoot, job->id,
- job->num_files);
- if ((out = cupsFileOpen(filename, "w")) == NULL)
- {
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "copy_banner: Unable to create banner job file %s - %s",
- filename, strerror(errno));
- job->num_files --;
- return (0);
- }
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("Bad job-uri attribute \"%s\"!"),
+ uri->values[0].string.text);
+ return;
+ }
- fchmod(cupsFileNumber(out), 0640);
- fchown(cupsFileNumber(out), RunUser, Group);
+ jobid = atoi(resource + 6);
+ }
/*
- * Try the localized banner file under the subdirectory...
+ * See if the job exists...
*/
- strlcpy(attrname, con->request->attrs->next->values[0].string.text,
- sizeof(attrname));
- if (strlen(attrname) > 2 && attrname[2] == '-')
+ if ((job = cupsdFindJob(jobid)) == NULL)
{
/*
- * Convert ll-cc to ll_CC...
+ * Nope - return a "not found" error...
*/
- attrname[2] = '_';
- attrname[3] = toupper(attrname[3] & 255);
- attrname[4] = toupper(attrname[4] & 255);
+ send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid);
+ return;
}
- snprintf(filename, sizeof(filename), "%s/banners/%s/%s", DataDir,
- attrname, name);
+ /*
+ * See if the job is owned by the requesting user...
+ */
- if (access(filename, 0) && strlen(attrname) > 2)
+ if (!validate_user(job, con, job->username, username, sizeof(username)))
{
- /*
- * Wasn't able to find "ll_CC" locale file; try the non-national
- * localization banner directory.
- */
-
- attrname[2] = '\0';
-
- snprintf(filename, sizeof(filename), "%s/banners/%s/%s", DataDir,
- attrname, name);
+ send_http_error(con, HTTP_UNAUTHORIZED);
+ return;
}
- if (access(filename, 0))
+ /*
+ * See if the job is already completed, cancelled, or aborted; if so,
+ * we can't cancel...
+ */
+
+ if (job->state_value >= IPP_JOB_CANCELLED)
{
- /*
- * Use the non-localized banner file.
- */
+ switch (job->state_value)
+ {
+ case IPP_JOB_CANCELLED :
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("Job #%d is already cancelled - can\'t cancel."),
+ jobid);
+ break;
- snprintf(filename, sizeof(filename), "%s/banners/%s", DataDir, name);
- }
+ case IPP_JOB_ABORTED :
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("Job #%d is already aborted - can\'t cancel."),
+ jobid);
+ break;
- if ((in = cupsFileOpen(filename, "r")) == NULL)
- {
- cupsFileClose(out);
- unlink(filename);
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "copy_banner: Unable to open banner template file %s - %s",
- filename, strerror(errno));
- job->num_files --;
- return (0);
+ default :
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("Job #%d is already completed - can\'t cancel."),
+ jobid);
+ break;
+ }
+
+ return;
}
/*
- * Parse the file to the end...
+ * Cancel the job and return...
*/
- while ((ch = cupsFileGetChar(in)) != EOF)
- if (ch == '{')
- {
- /*
- * Get an attribute name...
- */
+ cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, job->printer, job,
+ "Job cancelled by \"%s\".", username);
- for (s = attrname; (ch = cupsFileGetChar(in)) != EOF;)
- if (!isalpha(ch & 255) && ch != '-' && ch != '?')
- break;
- else if (s < (attrname + sizeof(attrname) - 1))
- *s++ = ch;
- else
- break;
+ cupsdCancelJob(job, 0);
+ cupsdCheckJobs();
- *s = '\0';
+ cupsdLogMessage(CUPSD_LOG_INFO, "Job %d was cancelled by \"%s\".", jobid,
+ username);
- if (ch != '}')
- {
- /*
- * Ignore { followed by stuff that is not an attribute name...
- */
+ con->response->request.status.status_code = IPP_OK;
+}
- cupsFilePrintf(out, "{%s%c", attrname, ch);
- continue;
- }
- /*
- * See if it is defined...
- */
+/*
+ * 'cancel_subscription()' - Cancel a subscription.
+ */
- if (attrname[0] == '?')
- s = attrname + 1;
- else
- s = attrname;
+static void
+cancel_subscription(
+ cupsd_client_t *con, /* I - Client connection */
+ int sub_id) /* I - Subscription ID */
+{
+ http_status_t status; /* Policy status */
+ cupsd_subscription_t *sub; /* Subscription */
- if (!strcmp(s, "printer-name"))
- {
- cupsFilePuts(out, job->dest);
- continue;
- }
- else if ((attr = ippFindAttribute(job->attrs, s, IPP_TAG_ZERO)) == NULL)
- {
- /*
- * See if we have a leading question mark...
- */
- if (attrname[0] != '?')
- {
- /*
- * Nope, write to file as-is; probably a PostScript procedure...
- */
+ cupsdLogMessage(CUPSD_LOG_DEBUG2,
+ "cancel_subscription(con=%p[%d], sub_id=%d)",
+ con, con->http.fd, sub_id);
- cupsFilePrintf(out, "{%s}", attrname);
- }
+ /*
+ * Is the subscription ID valid?
+ */
- continue;
- }
+ if ((sub = cupsdFindSubscription(sub_id)) == NULL)
+ {
+ /*
+ * Bad subscription ID...
+ */
- /*
- * Output value(s)...
- */
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("notify-subscription-id %d no good!"), sub_id);
+ return;
+ }
- for (i = 0; i < attr->num_values; i ++)
- {
- if (i)
- cupsFilePutChar(out, ',');
+ /*
+ * Check policy...
+ */
- switch (attr->value_tag)
- {
- case IPP_TAG_INTEGER :
- case IPP_TAG_ENUM :
- if (!strncmp(s, "time-at-", 8))
- cupsFilePuts(out, cupsdGetDateTime(attr->values[i].integer));
- else
- cupsFilePrintf(out, "%d", attr->values[i].integer);
- break;
+ if ((status = cupsdCheckPolicy(sub->dest ? sub->dest->op_policy_ptr :
+ DefaultPolicyPtr,
+ con, sub->owner)) != HTTP_OK)
+ {
+ send_http_error(con, status);
+ return;
+ }
- case IPP_TAG_BOOLEAN :
- cupsFilePrintf(out, "%d", attr->values[i].boolean);
- break;
+ /*
+ * Cancel the subscription...
+ */
- case IPP_TAG_NOVALUE :
- cupsFilePuts(out, "novalue");
- break;
+ cupsdDeleteSubscription(sub, 1);
- case IPP_TAG_RANGE :
- cupsFilePrintf(out, "%d-%d", attr->values[i].range.lower,
- attr->values[i].range.upper);
- break;
+ con->response->request.status.status_code = IPP_OK;
+}
- case IPP_TAG_RESOLUTION :
- cupsFilePrintf(out, "%dx%d%s", attr->values[i].resolution.xres,
- attr->values[i].resolution.yres,
- attr->values[i].resolution.units == IPP_RES_PER_INCH ?
- "dpi" : "dpc");
- break;
- case IPP_TAG_URI :
- case IPP_TAG_STRING :
- case IPP_TAG_TEXT :
- case IPP_TAG_NAME :
- case IPP_TAG_KEYWORD :
- case IPP_TAG_CHARSET :
- case IPP_TAG_LANGUAGE :
- if (!strcasecmp(banner->filetype->type, "postscript"))
- {
- /*
- * Need to quote strings for PS banners...
- */
-
- const char *p;
-
- for (p = attr->values[i].string.text; *p; p ++)
- {
- if (*p == '(' || *p == ')' || *p == '\\')
- {
- cupsFilePutChar(out, '\\');
- cupsFilePutChar(out, *p);
- }
- else if (*p < 32 || *p > 126)
- cupsFilePrintf(out, "\\%03o", *p & 255);
- else
- cupsFilePutChar(out, *p);
- }
- }
- else
- cupsFilePuts(out, attr->values[i].string.text);
- break;
-
- default :
- break; /* anti-compiler-warning-code */
- }
- }
- }
- else if (ch == '\\') /* Quoted char */
- {
- ch = cupsFileGetChar(in);
+/*
+ * 'check_quotas()' - Check quotas for a printer and user.
+ */
- if (ch != '{') /* Only do special handling for \{ */
- cupsFilePutChar(out, '\\');
+static int /* O - 1 if OK, 0 if not */
+check_quotas(cupsd_client_t *con, /* I - Client connection */
+ cupsd_printer_t *p) /* I - Printer or class */
+{
+ int i; /* Looping var */
+ char username[33]; /* Username */
+ cupsd_quota_t *q; /* Quota data */
+ struct passwd *pw; /* User password data */
- cupsFilePutChar(out, ch);
- }
- else
- cupsFilePutChar(out, ch);
- cupsFileClose(in);
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "check_quotas(%p[%d], %p[%s])",
+ con, con->http.fd, p, p->name);
- kbytes = (cupsFileTell(out) + 1023) / 1024;
+ /*
+ * Check input...
+ */
- if ((attr = ippFindAttribute(job->attrs, "job-k-octets",
- IPP_TAG_INTEGER)) != NULL)
- attr->values[0].integer += kbytes;
+ if (!con || !p)
+ return (0);
- cupsFileClose(out);
+ /*
+ * Figure out who is printing...
+ */
- return (kbytes);
-}
+ strlcpy(username, get_username(con), sizeof(username));
+ /*
+ * Check global active job limits for printers and users...
+ */
-/*
- * 'copy_file()' - Copy a PPD file or interface script...
- */
+ if (MaxJobsPerPrinter)
+ {
+ /*
+ * Check if there are too many pending jobs on this printer...
+ */
-static int /* O - 0 = success, -1 = error */
-copy_file(const char *from, /* I - Source file */
- const char *to) /* I - Destination file */
-{
- cups_file_t *src, /* Source file */
- *dst; /* Destination file */
- int bytes; /* Bytes to read/write */
- char buffer[2048]; /* Copy buffer */
+ if (cupsdGetPrinterJobCount(p->name) >= MaxJobsPerPrinter)
+ {
+ cupsdLogMessage(CUPSD_LOG_INFO, "Too many jobs for printer \"%s\"...",
+ p->name);
+ return (0);
+ }
+ }
+ if (MaxJobsPerUser)
+ {
+ /*
+ * Check if there are too many pending jobs for this user...
+ */
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_file(\"%s\", \"%s\")", from, to);
+ if (cupsdGetUserJobCount(username) >= MaxJobsPerUser)
+ {
+ cupsdLogMessage(CUPSD_LOG_INFO, "Too many jobs for user \"%s\"...",
+ username);
+ return (0);
+ }
+ }
/*
- * Open the source and destination file for a copy...
+ * Check against users...
*/
- if ((src = cupsFileOpen(from, "rb")) == NULL)
- return (-1);
+ if (p->num_users == 0 && p->k_limit == 0 && p->page_limit == 0)
+ return (1);
- if ((dst = cupsFileOpen(to, "wb")) == NULL)
+ if (p->num_users)
{
- cupsFileClose(src);
- return (-1);
+ pw = getpwnam(username);
+ endpwent();
+
+ 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;
+ }
+ else if (!strcasecmp(username, p->users[i]))
+ break;
+
+ if ((i < p->num_users) == p->deny_users)
+ {
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Denying user \"%s\" access to printer \"%s\"...",
+ username, p->name);
+ return (0);
+ }
}
/*
- * Copy the source file to the destination...
+ * Check quotas...
*/
- while ((bytes = cupsFileRead(src, buffer, sizeof(buffer))) > 0)
- if (cupsFileWrite(dst, buffer, bytes) < bytes)
+ if (p->k_limit || p->page_limit)
+ {
+ if ((q = cupsdUpdateQuota(p, username, 0, 0)) == NULL)
{
- cupsFileClose(src);
- cupsFileClose(dst);
- return (-1);
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to allocate quota data for user \"%s\"!",
+ username);
+ return (0);
+ }
+
+ if ((q->k_count >= p->k_limit && p->k_limit) ||
+ (q->page_count >= p->page_limit && p->page_limit))
+ {
+ cupsdLogMessage(CUPSD_LOG_INFO, "User \"%s\" is over the quota limit...",
+ username);
+ return (0);
}
+ }
/*
- * Close both files and return...
+ * If we have gotten this far, we're done!
*/
- cupsFileClose(src);
-
- return (cupsFileClose(dst));
+ return (1);
}
/*
- * 'copy_model()' - Copy a PPD model file, substituting default values
- * as needed...
+ * 'copy_attribute()' - Copy a single attribute.
*/
-static int /* O - 0 = success, -1 = error */
-copy_model(cupsd_client_t *con, /* I - Client connection */
- const char *from, /* I - Source file */
- const char *to) /* I - Destination file */
+static ipp_attribute_t * /* O - New attribute */
+copy_attribute(
+ ipp_t *to, /* O - Destination request/response */
+ ipp_attribute_t *attr, /* I - Attribute to copy */
+ int quickcopy) /* I - Do a quick copy? */
{
- fd_set *input; /* select() input set */
- struct timeval timeout; /* select() timeout */
- int maxfd; /* Maximum 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[MAX_ENV]; /* Environment */
- cups_file_t *src, /* Source file */
- *dst; /* Destination file */
- int bytes, /* Bytes from pipe */
- total; /* Total bytes from pipe */
- char buffer[2048], /* Copy buffer */
- *ptr; /* Pointer into 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 */
- char cups_protocol[PPD_MAX_LINE];
- /* cupsProtocol attribute */
- int have_letter, /* Have Letter size */
- have_a4; /* Have A4 size */
-#ifdef HAVE_LIBPAPER
- char *paper_result; /* Paper size name from libpaper */
- char system_paper[64]; /* Paper size name buffer */
-#endif /* HAVE_LIBPAPER */
+ int i; /* Looping var */
+ ipp_attribute_t *toattr; /* Destination attribute */
cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "copy_model(con=%p, from=\"%s\", to=\"%s\")",
- con, from, to);
-
- /*
- * Run cups-driverd to get the PPD file...
- */
+ "copy_attribute(%p, %p[%s,%x,%x])", to, attr,
+ attr->name ? attr->name : "(null)", attr->group_tag,
+ attr->value_tag);
- argv[0] = "cups-driverd";
- argv[1] = "cat";
- argv[2] = (char *)from;
- argv[3] = NULL;
+ switch (attr->value_tag & ~IPP_TAG_COPY)
+ {
+ case IPP_TAG_ZERO :
+ toattr = ippAddSeparator(to);
+ break;
- cupsdLoadEnv(envp, (int)(sizeof(envp) / sizeof(envp[0])));
+ case IPP_TAG_INTEGER :
+ case IPP_TAG_ENUM :
+ toattr = ippAddIntegers(to, attr->group_tag, attr->value_tag,
+ attr->name, attr->num_values, NULL);
- snprintf(buffer, sizeof(buffer), "%s/daemon/cups-driverd", ServerBin);
- snprintf(tempfile, sizeof(tempfile), "%s/%d.ppd", TempDir, con->http.fd);
- tempfd = open(tempfile, O_WRONLY | O_CREAT | O_TRUNC, 0600);
- if (tempfd < 0)
- return (-1);
+ for (i = 0; i < attr->num_values; i ++)
+ toattr->values[i].integer = attr->values[i].integer;
+ break;
- cupsdOpenPipe(temppipe);
+ case IPP_TAG_BOOLEAN :
+ toattr = ippAddBooleans(to, attr->group_tag, attr->name,
+ attr->num_values, NULL);
- if ((input = calloc(1, SetSize)) == NULL)
- {
- close(tempfd);
- unlink(tempfile);
+ for (i = 0; i < attr->num_values; i ++)
+ toattr->values[i].boolean = attr->values[i].boolean;
+ break;
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "copy_model: Unable to allocate %d bytes for select()...",
- SetSize);
- return (-1);
- }
+ case IPP_TAG_STRING :
+ 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 :
+ toattr = ippAddStrings(to, attr->group_tag,
+ (ipp_tag_t)(attr->value_tag | quickcopy),
+ attr->name, attr->num_values, NULL, NULL);
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "copy_model: Running \"cups-driverd cat %s\"...", from);
+ if (quickcopy)
+ {
+ for (i = 0; i < attr->num_values; i ++)
+ toattr->values[i].string.text = attr->values[i].string.text;
+ }
+ else
+ {
+ for (i = 0; i < attr->num_values; i ++)
+ toattr->values[i].string.text = _cupsStrAlloc(attr->values[i].string.text);
+ }
+ break;
- if (!cupsdStartProcess(buffer, argv, envp, -1, temppipe[1], CGIPipes[1],
- -1, 0, &temppid))
- {
- free(input);
- close(tempfd);
- unlink(tempfile);
- return (-1);
- }
+ case IPP_TAG_DATE :
+ toattr = ippAddDate(to, attr->group_tag, attr->name,
+ attr->values[0].date);
+ break;
- close(temppipe[1]);
+ case IPP_TAG_RESOLUTION :
+ toattr = ippAddResolutions(to, attr->group_tag, attr->name,
+ attr->num_values, IPP_RES_PER_INCH,
+ NULL, NULL);
- /*
- * Wait up to 30 seconds for the PPD file to be copied...
- */
+ for (i = 0; i < attr->num_values; i ++)
+ {
+ toattr->values[i].resolution.xres = attr->values[i].resolution.xres;
+ toattr->values[i].resolution.yres = attr->values[i].resolution.yres;
+ toattr->values[i].resolution.units = attr->values[i].resolution.units;
+ }
+ break;
- total = 0;
+ case IPP_TAG_RANGE :
+ toattr = ippAddRanges(to, attr->group_tag, attr->name,
+ attr->num_values, NULL, NULL);
- if (temppipe[0] > CGIPipes[0])
- maxfd = temppipe[0] + 1;
- else
- maxfd = CGIPipes[0] + 1;
+ for (i = 0; i < attr->num_values; i ++)
+ {
+ toattr->values[i].range.lower = attr->values[i].range.lower;
+ toattr->values[i].range.upper = attr->values[i].range.upper;
+ }
+ break;
- for (;;)
- {
- /*
- * See if we have data ready...
- */
+ case IPP_TAG_TEXTLANG :
+ case IPP_TAG_NAMELANG :
+ toattr = ippAddStrings(to, attr->group_tag,
+ (ipp_tag_t)(attr->value_tag | quickcopy),
+ attr->name, attr->num_values, NULL, NULL);
- bytes = 0;
+ if (quickcopy)
+ {
+ for (i = 0; i < attr->num_values; i ++)
+ {
+ toattr->values[i].string.charset = attr->values[i].string.charset;
+ toattr->values[i].string.text = attr->values[i].string.text;
+ }
+ }
+ else
+ {
+ for (i = 0; i < attr->num_values; i ++)
+ {
+ if (!i)
+ toattr->values[i].string.charset =
+ _cupsStrAlloc(attr->values[i].string.charset);
+ else
+ toattr->values[i].string.charset =
+ toattr->values[0].string.charset;
- FD_SET(temppipe[0], input);
- FD_SET(CGIPipes[0], input);
+ toattr->values[i].string.text = _cupsStrAlloc(attr->values[i].string.text);
+ }
+ }
+ break;
- timeout.tv_sec = 30;
- timeout.tv_usec = 0;
+ case IPP_TAG_BEGIN_COLLECTION :
+ toattr = ippAddCollections(to, attr->group_tag, attr->name,
+ attr->num_values, NULL);
- if ((i = select(maxfd, input, NULL, NULL, &timeout)) < 0)
- {
- if (errno == EINTR)
- continue;
- else
+ for (i = 0; i < attr->num_values; i ++)
+ {
+ toattr->values[i].collection = ippNew();
+ copy_attrs(toattr->values[i].collection, attr->values[i].collection,
+ NULL, IPP_TAG_ZERO, 0);
+ }
break;
- }
- else if (i == 0)
- {
- /*
- * We have timed out...
- */
- break;
- }
+ default :
+ toattr = ippAddIntegers(to, attr->group_tag, attr->value_tag,
+ attr->name, attr->num_values, NULL);
- if (FD_ISSET(temppipe[0], input))
- {
- /*
- * Read the PPD file from the pipe, and write it to the PPD file.
- */
+ for (i = 0; i < attr->num_values; i ++)
+ {
+ toattr->values[i].unknown.length = attr->values[i].unknown.length;
- if ((bytes = read(temppipe[0], buffer, sizeof(buffer))) > 0)
- {
- if (write(tempfd, buffer, bytes) < bytes)
- break;
+ if (toattr->values[i].unknown.length > 0)
+ {
+ 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,
+ attr->values[i].unknown.data,
+ toattr->values[i].unknown.length);
+ }
+ }
+ break; /* anti-compiler-warning-code */
+ }
- total += bytes;
- }
- else
- break;
- }
+ return (toattr);
+}
- if (FD_ISSET(CGIPipes[0], input))
- cupsdUpdateCGI();
- }
- close(temppipe[0]);
- close(tempfd);
+/*
+ * 'copy_attrs()' - Copy attributes from one request to another.
+ */
- free(input);
+static void
+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? */
+{
+ ipp_attribute_t *fromattr; /* Source attribute */
- if (!total)
- {
- /*
- * No data from cups-deviced...
- */
- cupsdLogMessage(CUPSD_LOG_ERROR, "copy_model: empty PPD file!");
- unlink(tempfile);
- return (-1);
- }
+ cupsdLogMessage(CUPSD_LOG_DEBUG2,
+ "copy_attrs(to=%p, from=%p, ra=%p, group=%x, quickcopy=%d)",
+ to, from, ra, group, quickcopy);
- /*
- * Read the source file and see what page sizes are supported...
- */
+ if (!to || !from)
+ return;
- if ((src = cupsFileOpen(tempfile, "rb")) == NULL)
+ for (fromattr = from->attrs; fromattr; fromattr = fromattr->next)
{
- unlink(tempfile);
- return (-1);
- }
-
- have_letter = 0;
- have_a4 = 0;
+ /*
+ * Filter attributes as needed...
+ */
- while (cupsFileGets(src, buffer, sizeof(buffer)))
- if (!strncmp(buffer, "*PageSize ", 10))
- {
- /*
- * Strip UI text and command data from the end of the line...
- */
+ if (group != IPP_TAG_ZERO && fromattr->group_tag != group &&
+ fromattr->group_tag != IPP_TAG_ZERO && !fromattr->name)
+ continue;
- if ((ptr = strchr(buffer + 10, '/')) != NULL)
- *ptr = '\0';
- if ((ptr = strchr(buffer + 10, ':')) != NULL)
- *ptr = '\0';
+ if (!ra || cupsArrayFind(ra, fromattr->name))
+ copy_attribute(to, fromattr, quickcopy);
+ }
+}
- for (ptr = buffer + 10; isspace(*ptr); ptr ++);
- /*
- * Look for Letter and A4 page sizes...
- */
+/*
+ * 'copy_banner()' - Copy a banner file to the requests directory for the
+ * specified job.
+ */
- if (!strcmp(ptr, "Letter"))
- have_letter = 1;
+static int /* O - Size of banner file in kbytes */
+copy_banner(cupsd_client_t *con, /* I - Client connection */
+ cupsd_job_t *job, /* I - Job information */
+ const char *name) /* I - Name of banner */
+{
+ int i; /* Looping var */
+ int kbytes; /* Size of banner file in kbytes */
+ char filename[1024]; /* Job filename */
+ cupsd_banner_t *banner; /* Pointer to banner */
+ cups_file_t *in; /* Input file */
+ cups_file_t *out; /* Output file */
+ int ch; /* Character from file */
+ char attrname[255], /* Name of attribute */
+ *s; /* Pointer into name */
+ ipp_attribute_t *attr; /* Attribute */
- if (!strcmp(ptr, "A4"))
- have_a4 = 1;
- }
- cupsFileRewind(src);
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_banner(%p[%d], %p[%d], %s)",
+ con, con->http.fd, job, job->id, name ? name : "(null)");
/*
- * Open the destination (if possible) and set the default options...
+ * Find the banner; return if not found or "none"...
*/
- num_defaults = 0;
- defaults = NULL;
- cups_protocol[0] = '\0';
+ if (!name || !strcmp(name, "none") ||
+ (banner = cupsdFindBanner(name)) == NULL)
+ return (0);
- if ((dst = cupsFileOpen(to, "rb")) != NULL)
+ /*
+ * Open the banner and job files...
+ */
+
+ if (add_file(con, job, banner->filetype, 0))
+ return (0);
+
+ snprintf(filename, sizeof(filename), "%s/d%05d-%03d", RequestRoot, job->id,
+ job->num_files);
+ if ((out = cupsFileOpen(filename, "w")) == NULL)
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "copy_banner: Unable to create banner job file %s - %s",
+ filename, strerror(errno));
+ job->num_files --;
+ return (0);
+ }
+
+ fchmod(cupsFileNumber(out), 0640);
+ fchown(cupsFileNumber(out), RunUser, Group);
+
+ /*
+ * Try the localized banner file under the subdirectory...
+ */
+
+ strlcpy(attrname, con->request->attrs->next->values[0].string.text,
+ sizeof(attrname));
+ if (strlen(attrname) > 2 && attrname[2] == '-')
{
/*
- * Read all of the default lines from the old PPD...
+ * Convert ll-cc to ll_CC...
*/
- while (cupsFileGets(dst, buffer, sizeof(buffer)))
- if (!strncmp(buffer, "*Default", 8))
- {
- /*
- * Add the default option...
- */
+ attrname[2] = '_';
+ attrname[3] = toupper(attrname[3] & 255);
+ attrname[4] = toupper(attrname[4] & 255);
+ }
- if (!ppd_parse_line(buffer, option, sizeof(option),
- choice, sizeof(choice)))
- num_defaults = ppd_add_default(option, choice, num_defaults,
- &defaults);
- }
- else if (!strncmp(buffer, "*cupsProtocol:", 14))
- strlcpy(cups_protocol, buffer, sizeof(cups_protocol));
+ snprintf(filename, sizeof(filename), "%s/banners/%s/%s", DataDir,
+ attrname, name);
- cupsFileClose(dst);
- }
-#ifdef HAVE_LIBPAPER
- else if ((paper_result = systempapername()) != NULL)
+ if (access(filename, 0) && strlen(attrname) > 2)
{
/*
- * Set the default media sizes from the systemwide default...
+ * Wasn't able to find "ll_CC" locale file; try the non-national
+ * localization banner directory.
*/
- strlcpy(system_paper, paper_result, sizeof(system_paper));
- system_paper[0] = toupper(system_paper[0] & 255);
+ attrname[2] = '\0';
- 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);
- }
+ snprintf(filename, sizeof(filename), "%s/banners/%s/%s", DataDir,
+ attrname, name);
}
-#endif /* HAVE_LIBPAPER */
- else
+
+ if (access(filename, 0))
{
/*
- * Add the default media sizes...
- *
- * Note: These values are generally not valid for large-format devices
- * like plotters, however it is probably safe to say that those
- * users will configure the media size after initially adding
- * the device anyways...
+ * Use the non-localized banner file.
*/
- if (!DefaultLanguage ||
- !strcasecmp(DefaultLanguage, "C") ||
- !strcasecmp(DefaultLanguage, "POSIX") ||
- !strcasecmp(DefaultLanguage, "en") ||
- !strncasecmp(DefaultLanguage, "en_US", 5) ||
- !strncasecmp(DefaultLanguage, "en_CA", 5) ||
- !strncasecmp(DefaultLanguage, "fr_CA", 5))
- {
- /*
- * These are the only locales that will default to "letter" size...
- */
-
- 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);
- }
- }
- 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);
- }
+ snprintf(filename, sizeof(filename), "%s/banners/%s", DataDir, name);
}
- /*
- * Open the destination file for a copy...
- */
-
- if ((dst = cupsFileOpen(to, "wb")) == NULL)
+ if ((in = cupsFileOpen(filename, "r")) == NULL)
{
- if (num_defaults > 0)
- free(defaults);
-
- cupsFileClose(src);
- unlink(tempfile);
- return (-1);
+ cupsFileClose(out);
+ unlink(filename);
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "copy_banner: Unable to open banner template file %s - %s",
+ filename, strerror(errno));
+ job->num_files --;
+ return (0);
}
/*
- * Copy the source file to the destination...
+ * Parse the file to the end...
*/
- while (cupsFileGets(src, buffer, sizeof(buffer)))
- {
- if (!strncmp(buffer, "*Default", 8))
+ while ((ch = cupsFileGetChar(in)) != EOF)
+ if (ch == '{')
{
/*
- * Check for an previous default option choice...
+ * Get an attribute name...
*/
- 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...
- */
+ for (s = attrname; (ch = cupsFileGetChar(in)) != EOF;)
+ if (!isalpha(ch & 255) && ch != '-' && ch != '?')
+ break;
+ else if (s < (attrname + sizeof(attrname) - 1))
+ *s++ = ch;
+ else
+ break;
- snprintf(buffer, sizeof(buffer), "*Default%s: %s", option,
- defaults[i].choice);
- break;
- }
- }
- }
+ *s = '\0';
- cupsFilePrintf(dst, "%s\n", buffer);
- }
+ if (ch != '}')
+ {
+ /*
+ * Ignore { followed by stuff that is not an attribute name...
+ */
- if (cups_protocol[0])
- cupsFilePrintf(dst, "%s\n", cups_protocol);
+ cupsFilePrintf(out, "{%s%c", attrname, ch);
+ continue;
+ }
- if (num_defaults > 0)
- free(defaults);
+ /*
+ * See if it is defined...
+ */
- /*
- * Close both files and return...
- */
+ if (attrname[0] == '?')
+ s = attrname + 1;
+ else
+ s = attrname;
- cupsFileClose(src);
+ if (!strcmp(s, "printer-name"))
+ {
+ cupsFilePuts(out, job->dest);
+ continue;
+ }
+ else if ((attr = ippFindAttribute(job->attrs, s, IPP_TAG_ZERO)) == NULL)
+ {
+ /*
+ * See if we have a leading question mark...
+ */
- unlink(tempfile);
+ if (attrname[0] != '?')
+ {
+ /*
+ * Nope, write to file as-is; probably a PostScript procedure...
+ */
- return (cupsFileClose(dst));
-}
+ cupsFilePrintf(out, "{%s}", attrname);
+ }
+ continue;
+ }
-/*
- * 'copy_job_attrs()' - Copy job attributes.
- */
+ /*
+ * Output value(s)...
+ */
-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 */
+ for (i = 0; i < attr->num_values; i ++)
+ {
+ if (i)
+ cupsFilePutChar(out, ',');
+ switch (attr->value_tag)
+ {
+ case IPP_TAG_INTEGER :
+ case IPP_TAG_ENUM :
+ if (!strncmp(s, "time-at-", 8))
+ cupsFilePuts(out, cupsdGetDateTime(attr->values[i].integer));
+ else
+ cupsFilePrintf(out, "%d", attr->values[i].integer);
+ break;
- /*
- * Send the requested attributes for each job...
- */
+ case IPP_TAG_BOOLEAN :
+ cupsFilePrintf(out, "%d", attr->values[i].boolean);
+ break;
- httpAssembleURIf(HTTP_URI_CODING_ALL, job_uri, sizeof(job_uri), "ipp", NULL,
- con->servername, con->serverport, "/jobs/%d",
- job->id);
+ case IPP_TAG_NOVALUE :
+ cupsFilePuts(out, "novalue");
+ break;
- if (!ra || cupsArrayFind(ra, "job-more-info"))
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI,
- "job-more-info", NULL, job_uri);
+ case IPP_TAG_RANGE :
+ cupsFilePrintf(out, "%d-%d", attr->values[i].range.lower,
+ attr->values[i].range.upper);
+ break;
- if (job->state->values[0].integer > IPP_JOB_PROCESSING &&
- (!ra || cupsArrayFind(ra, "job-preserved")))
- {
- char filename[1024]; /* Job data file */
+ case IPP_TAG_RESOLUTION :
+ cupsFilePrintf(out, "%dx%d%s", attr->values[i].resolution.xres,
+ attr->values[i].resolution.yres,
+ attr->values[i].resolution.units == IPP_RES_PER_INCH ?
+ "dpi" : "dpc");
+ break;
+ case IPP_TAG_URI :
+ case IPP_TAG_STRING :
+ case IPP_TAG_TEXT :
+ case IPP_TAG_NAME :
+ case IPP_TAG_KEYWORD :
+ case IPP_TAG_CHARSET :
+ case IPP_TAG_LANGUAGE :
+ if (!strcasecmp(banner->filetype->type, "postscript"))
+ {
+ /*
+ * Need to quote strings for PS banners...
+ */
- snprintf(filename, sizeof(filename), "%s/d%05d-001", RequestRoot,
- job->id);
- ippAddBoolean(con->response, IPP_TAG_JOB, "job-preserved",
- !access(filename, 0));
- }
+ const char *p;
- if (!ra || cupsArrayFind(ra, "job-printer-up-time"))
- ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER,
- "job-printer-up-time", time(NULL));
+ for (p = attr->values[i].string.text; *p; p ++)
+ {
+ if (*p == '(' || *p == ')' || *p == '\\')
+ {
+ cupsFilePutChar(out, '\\');
+ cupsFilePutChar(out, *p);
+ }
+ else if (*p < 32 || *p > 126)
+ cupsFilePrintf(out, "\\%03o", *p & 255);
+ else
+ cupsFilePutChar(out, *p);
+ }
+ }
+ else
+ cupsFilePuts(out, attr->values[i].string.text);
+ break;
- if (!ra || cupsArrayFind(ra, "job-state-reasons"))
- add_job_state_reasons(con, job);
+ default :
+ break; /* anti-compiler-warning-code */
+ }
+ }
+ }
+ else if (ch == '\\') /* Quoted char */
+ {
+ ch = cupsFileGetChar(in);
- if (!ra || cupsArrayFind(ra, "job-uri"))
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI,
- "job-uri", NULL, job_uri);
+ if (ch != '{') /* Only do special handling for \{ */
+ cupsFilePutChar(out, '\\');
- copy_attrs(con->response, job->attrs, ra, IPP_TAG_JOB, 0);
+ cupsFilePutChar(out, ch);
+ }
+ else
+ cupsFilePutChar(out, ch);
+
+ cupsFileClose(in);
+
+ kbytes = (cupsFileTell(out) + 1023) / 1024;
+
+ if ((attr = ippFindAttribute(job->attrs, "job-k-octets",
+ IPP_TAG_INTEGER)) != NULL)
+ attr->values[0].integer += kbytes;
+
+ cupsFileClose(out);
+
+ return (kbytes);
}
/*
- * 'copy_printer_attrs()' - Copy printer attributes.
+ * 'copy_file()' - Copy a PPD file or interface script...
*/
-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 */
+static int /* O - 0 = success, -1 = error */
+copy_file(const char *from, /* I - Source file */
+ const char *to) /* I - Destination file */
{
- char printer_uri[HTTP_MAX_URI];
- /* Printer URI */
- time_t curtime; /* Current time */
- int i; /* Looping var */
- ipp_attribute_t *history; /* History collection */
+ cups_file_t *src, /* Source file */
+ *dst; /* Destination file */
+ int bytes; /* Bytes to read/write */
+ char buffer[2048]; /* Copy buffer */
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_file(\"%s\", \"%s\")", from, to);
+
/*
- * Copy the printer attributes to the response using requested-attributes
- * and document-format attributes that may be provided by the client.
+ * Open the source and destination file for a copy...
*/
- curtime = time(NULL);
+ if ((src = cupsFileOpen(from, "rb")) == NULL)
+ return (-1);
-#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 ((dst = cupsFileOpen(to, "wb")) == NULL)
+ {
+ cupsFileClose(src);
+ return (-1);
+ }
- if (!ra || cupsArrayFind(ra, "printer-current-time"))
- ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
- ippTimeToDate(curtime));
+ /*
+ * Copy the source file to the destination...
+ */
- if (!ra || cupsArrayFind(ra, "printer-error-policy"))
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
- "printer-error-policy", NULL, printer->error_policy);
+ while ((bytes = cupsFileRead(src, buffer, sizeof(buffer))) > 0)
+ if (cupsFileWrite(dst, buffer, bytes) < bytes)
+ {
+ cupsFileClose(src);
+ cupsFileClose(dst);
+ return (-1);
+ }
- if (!ra || cupsArrayFind(ra, "printer-is-accepting-jobs"))
- ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-accepting-jobs",
- printer->accepting);
+ /*
+ * Close both files and return...
+ */
- if (!ra || cupsArrayFind(ra, "printer-is-shared"))
- ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-shared",
- printer->shared);
+ cupsFileClose(src);
- if (!ra || cupsArrayFind(ra, "printer-op-policy"))
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
- "printer-op-policy", NULL, printer->op_policy);
+ return (cupsFileClose(dst));
+}
- if (!ra || cupsArrayFind(ra, "printer-state"))
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-state",
- printer->state);
- 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"))
- {
- /*
- * Printer history is only sent if specifically requested, so that
- * older CUPS/IPP clients won't barf on the collection attributes.
- */
+/*
+ * 'copy_model()' - Copy a PPD model file, substituting default values
+ * as needed...
+ */
- history = ippAddCollections(con->response, IPP_TAG_PRINTER,
- "printer-state-history",
- printer->num_history, NULL);
+static int /* O - 0 = success, -1 = error */
+copy_model(cupsd_client_t *con, /* I - Client connection */
+ const char *from, /* I - Source file */
+ const char *to) /* I - Destination file */
+{
+ fd_set *input; /* select() input set */
+ struct timeval timeout; /* select() timeout */
+ int maxfd; /* Maximum 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[MAX_ENV]; /* Environment */
+ cups_file_t *src, /* Source file */
+ *dst; /* Destination file */
+ int bytes, /* Bytes from pipe */
+ total; /* Total bytes from pipe */
+ char buffer[2048], /* Copy buffer */
+ *ptr; /* Pointer into 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 */
+ char cups_protocol[PPD_MAX_LINE];
+ /* cupsProtocol attribute */
+ int have_letter, /* Have Letter size */
+ have_a4; /* Have A4 size */
+#ifdef HAVE_LIBPAPER
+ char *paper_result; /* Paper size name from libpaper */
+ char system_paper[64]; /* Paper size name buffer */
+#endif /* HAVE_LIBPAPER */
- for (i = 0; i < printer->num_history; i ++)
- copy_attrs(history->values[i].collection = ippNew(), printer->history[i],
- NULL, IPP_TAG_ZERO, 0);
- }
- if (!ra || cupsArrayFind(ra, "printer-state-message"))
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_TEXT,
- "printer-state-message", NULL, printer->state_message);
+ cupsdLogMessage(CUPSD_LOG_DEBUG2,
+ "copy_model(con=%p, from=\"%s\", to=\"%s\")",
+ con, from, to);
- if (!ra || cupsArrayFind(ra, "printer-state-reasons"))
- add_printer_state_reasons(con, printer);
+ /*
+ * Run cups-driverd to get the PPD file...
+ */
- if (!ra || cupsArrayFind(ra, "printer-type"))
- {
- int type; /* printer-type value */
+ argv[0] = "cups-driverd";
+ argv[1] = "cat";
+ argv[2] = (char *)from;
+ argv[3] = NULL;
+ cupsdLoadEnv(envp, (int)(sizeof(envp) / sizeof(envp[0])));
- /*
- * Add the CUPS-specific printer-type attribute...
- */
+ snprintf(buffer, sizeof(buffer), "%s/daemon/cups-driverd", ServerBin);
+ snprintf(tempfile, sizeof(tempfile), "%s/%d.ppd", TempDir, con->http.fd);
+ tempfd = open(tempfile, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+ if (tempfd < 0)
+ return (-1);
- type = printer->type;
+ cupsdOpenPipe(temppipe);
- if (printer == DefaultPrinter)
- type |= CUPS_PRINTER_DEFAULT;
+ if ((input = calloc(1, SetSize)) == NULL)
+ {
+ close(tempfd);
+ unlink(tempfile);
- if (!printer->accepting)
- type |= CUPS_PRINTER_REJECTING;
-
- if (!printer->shared)
- type |= CUPS_PRINTER_NOT_SHARED;
-
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-type",
- type);
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "copy_model: Unable to allocate %d bytes for select()...",
+ SetSize);
+ return (-1);
}
- if (!ra || cupsArrayFind(ra, "printer-up-time"))
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
- "printer-up-time", curtime);
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "copy_model: Running \"cups-driverd cat %s\"...", from);
- if ((!ra || cupsArrayFind(ra, "printer-uri-supported")) &&
- !ippFindAttribute(printer->attrs, "printer-uri-supported",
- IPP_TAG_URI))
+ if (!cupsdStartProcess(buffer, argv, envp, -1, temppipe[1], CGIPipes[1],
+ -1, 0, &temppid))
{
- httpAssembleURIf(HTTP_URI_CODING_ALL, 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);
+ free(input);
+ close(tempfd);
+ unlink(tempfile);
+ return (-1);
}
- if (!ra || cupsArrayFind(ra, "queued-job-count"))
- add_queued_job_count(con, printer);
+ close(temppipe[1]);
- copy_attrs(con->response, printer->attrs, ra, IPP_TAG_ZERO, 0);
- copy_attrs(con->response, CommonData, ra, IPP_TAG_ZERO, IPP_TAG_COPY);
-}
+ /*
+ * Wait up to 30 seconds for the PPD file to be copied...
+ */
+ total = 0;
-/*
- * 'copy_subscription_attrs()' - Copy subscription attributes.
- */
+ if (temppipe[0] > CGIPipes[0])
+ maxfd = temppipe[0] + 1;
+ else
+ maxfd = CGIPipes[0] + 1;
-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 */
+ for (;;)
+ {
+ /*
+ * See if we have data ready...
+ */
+ bytes = 0;
- /*
- * Copy the subscription attributes to the response using the
- * requested-attributes attribute that may be provided by the client.
- */
+ FD_SET(temppipe[0], input);
+ FD_SET(CGIPipes[0], input);
- if (!ra || cupsArrayFind(ra, "notify-events"))
- {
- if ((name = cupsdEventName((cupsd_eventmask_t)sub->mask)) != NULL)
+ timeout.tv_sec = 30;
+ timeout.tv_usec = 0;
+
+ if ((i = select(maxfd, input, NULL, NULL, &timeout)) < 0)
+ {
+ if (errno == EINTR)
+ continue;
+ else
+ break;
+ }
+ else if (i == 0)
{
/*
- * Simple event list...
+ * We have timed out...
*/
- ippAddString(con->response, IPP_TAG_SUBSCRIPTION,
- IPP_TAG_KEYWORD | IPP_TAG_COPY,
- "notify-events", NULL, name);
+ break;
}
- else
+
+ if (FD_ISSET(temppipe[0], input))
{
/*
- * Complex event list...
+ * Read the PPD file from the pipe, and write it to the PPD file.
*/
- 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);
+ if ((bytes = read(temppipe[0], buffer, sizeof(buffer))) > 0)
+ {
+ if (write(tempfd, buffer, bytes) < bytes)
+ break;
- count ++;
- }
+ total += bytes;
+ }
+ else
+ break;
}
+
+ if (FD_ISSET(CGIPipes[0], input))
+ cupsdUpdateCGI();
}
- if (sub->job && (!ra || cupsArrayFind(ra, "notify-job-id")))
- ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
- "notify-job-id", sub->job->id);
+ close(temppipe[0]);
+ close(tempfd);
- if (!sub->job && (!ra || cupsArrayFind(ra, "notify-lease-duration")))
- ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
- "notify-lease-duration", sub->lease);
+ free(input);
- if (sub->dest && (!ra || cupsArrayFind(ra, "notify-printer-uri")))
+ if (!total)
{
- 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);
+ /*
+ * No data from cups-deviced...
+ */
+
+ cupsdLogMessage(CUPSD_LOG_ERROR, "copy_model: empty PPD file!");
+ unlink(tempfile);
+ return (-1);
}
- 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");
+ /*
+ * Read the source file and see what page sizes are supported...
+ */
- 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 ((src = cupsFileOpen(tempfile, "rb")) == NULL)
+ {
+ unlink(tempfile);
+ return (-1);
+ }
- if (!ra || cupsArrayFind(ra, "notify-subscription-id"))
- ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
- "notify-subscription-id", sub->id);
+ have_letter = 0;
+ have_a4 = 0;
- if (!ra || cupsArrayFind(ra, "notify-time-interval"))
- ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
- "notify-time-interval", sub->interval);
+ while (cupsFileGets(src, buffer, sizeof(buffer)))
+ if (!strncmp(buffer, "*PageSize ", 10))
+ {
+ /*
+ * Strip UI text and command data from the end of the line...
+ */
- 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 ((ptr = strchr(buffer + 10, '/')) != NULL)
+ *ptr = '\0';
+ if ((ptr = strchr(buffer + 10, ':')) != NULL)
+ *ptr = '\0';
+ for (ptr = buffer + 10; isspace(*ptr); ptr ++);
-/*
- * 'create_job()' - Print a file to a printer or class.
- */
+ /*
+ * Look for Letter and A4 page sizes...
+ */
-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 */
+ if (!strcmp(ptr, "Letter"))
+ have_letter = 1;
+ if (!strcmp(ptr, "A4"))
+ have_a4 = 1;
+ }
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "create_job(%p[%d], %s)", con,
- con->http.fd, uri->values[0].string.text);
+ cupsFileRewind(src);
/*
- * Is the destination valid?
+ * Open the destination (if possible) and set the default options...
*/
- httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
- sizeof(method), username, sizeof(username), host,
- sizeof(host), &port, resource, sizeof(resource));
+ num_defaults = 0;
+ defaults = NULL;
+ cups_protocol[0] = '\0';
- if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
+ if ((dst = cupsFileOpen(to, "rb")) != NULL)
{
/*
- * Bad URI...
+ * Read all of the default lines from the old PPD...
*/
- send_ipp_status(con, IPP_NOT_FOUND,
- _("The printer or class was not found."));
- return;
- }
+ while (cupsFileGets(dst, buffer, sizeof(buffer)))
+ if (!strncmp(buffer, "*Default", 8))
+ {
+ /*
+ * Add the default option...
+ */
- /*
- * Check remote printing to non-shared printer...
- */
+ if (!ppd_parse_line(buffer, option, sizeof(option),
+ choice, sizeof(choice)))
+ num_defaults = ppd_add_default(option, choice, num_defaults,
+ &defaults);
+ }
+ else if (!strncmp(buffer, "*cupsProtocol:", 14))
+ strlcpy(cups_protocol, buffer, sizeof(cups_protocol));
- 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;
+ cupsFileClose(dst);
}
+#ifdef HAVE_LIBPAPER
+ else if ((paper_result = systempapername()) != NULL)
+ {
+ /*
+ * Set the default media sizes from the systemwide default...
+ */
- /*
- * Check policy...
- */
+ strlcpy(system_paper, paper_result, sizeof(system_paper));
+ system_paper[0] = toupper(system_paper[0] & 255);
- if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
- {
- send_http_error(con, status);
- return;
+ 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);
+ }
}
- else if ((printer->type & CUPS_PRINTER_AUTHENTICATED) && !con->username[0])
+#endif /* HAVE_LIBPAPER */
+ else
{
- send_http_error(con, HTTP_UNAUTHORIZED);
- return;
+ /*
+ * Add the default media sizes...
+ *
+ * Note: These values are generally not valid for large-format devices
+ * like plotters, however it is probably safe to say that those
+ * users will configure the media size after initially adding
+ * the device anyways...
+ */
+
+ if (!DefaultLanguage ||
+ !strcasecmp(DefaultLanguage, "C") ||
+ !strcasecmp(DefaultLanguage, "POSIX") ||
+ !strcasecmp(DefaultLanguage, "en") ||
+ !strncasecmp(DefaultLanguage, "en_US", 5) ||
+ !strncasecmp(DefaultLanguage, "en_CA", 5) ||
+ !strncasecmp(DefaultLanguage, "fr_CA", 5))
+ {
+ /*
+ * These are the only locales that will default to "letter" size...
+ */
+
+ 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);
+ }
+ }
+ 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);
+ }
}
/*
- * See if the printer is accepting jobs...
+ * Open the destination file for a copy...
*/
- if (!printer->accepting)
+ if ((dst = cupsFileOpen(to, "wb")) == NULL)
{
- send_ipp_status(con, IPP_NOT_ACCEPTING,
- _("Destination \"%s\" is not accepting jobs."),
- dest);
- return;
+ if (num_defaults > 0)
+ free(defaults);
+
+ cupsFileClose(src);
+ unlink(tempfile);
+ return (-1);
}
/*
- * Validate job template attributes; for now just copies and page-ranges...
+ * Copy the source file to the destination...
*/
- if ((attr = ippFindAttribute(con->request, "copies",
- IPP_TAG_INTEGER)) != NULL)
+ while (cupsFileGets(src, buffer, sizeof(buffer)))
{
- if (attr->values[0].integer < 1 || attr->values[0].integer > MaxCopies)
+ if (!strncmp(buffer, "*Default", 8))
{
- 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;
- }
- }
+ /*
+ * Check for an previous default option choice...
+ */
- 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)
+ if (!ppd_parse_line(buffer, option, sizeof(option),
+ choice, sizeof(choice)))
{
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("Bad page-ranges values %d-%d."),
- attr->values[i].range.lower,
- attr->values[i].range.upper);
- return;
- }
+ for (i = 0; i < num_defaults; i ++)
+ if (!strcmp(option, defaults[i].option))
+ {
+ /*
+ * Substitute the previous choice...
+ */
- lowerpagerange = attr->values[i].range.upper + 1;
+ snprintf(buffer, sizeof(buffer), "*Default%s: %s", option,
+ defaults[i].choice);
+ break;
+ }
+ }
}
+
+ cupsFilePrintf(dst, "%s\n", buffer);
}
+ if (cups_protocol[0])
+ cupsFilePrintf(dst, "%s\n", cups_protocol);
+
+ if (num_defaults > 0)
+ free(defaults);
+
/*
- * Make sure we aren't over our limit...
+ * Close both files and return...
*/
- if (cupsArrayCount(Jobs) >= MaxJobs && MaxJobs)
- cupsdCleanJobs();
+ cupsFileClose(src);
- if (cupsArrayCount(Jobs) >= MaxJobs && MaxJobs)
- {
- send_ipp_status(con, IPP_NOT_POSSIBLE,
- _("Too many active jobs."));
- return;
- }
+ unlink(tempfile);
- if (!check_quotas(con, printer))
- {
- send_ipp_status(con, IPP_NOT_POSSIBLE, _("Quota limit reached."));
- return;
- }
+ return (cupsFileClose(dst));
+}
- /*
- * Create the job and set things up...
- */
- 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);
+/*
+ * 'copy_job_attrs()' - Copy job attributes.
+ */
- 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");
+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 ((job = cupsdAddJob(priority, printer->name)) == NULL)
- {
- send_ipp_status(con, IPP_INTERNAL_ERROR,
- _("Unable to add job for destination \"%s\"!"), dest);
- return;
- }
- job->dtype = dtype;
- job->attrs = con->request;
- con->request = NULL;
+ /*
+ * Send the requested attributes for each job...
+ */
- attr = ippFindAttribute(job->attrs, "requesting-user-name", IPP_TAG_NAME);
+ httpAssembleURIf(HTTP_URI_CODING_ALL, job_uri, sizeof(job_uri), "ipp", NULL,
+ con->servername, con->serverport, "/jobs/%d",
+ job->id);
- if (con->username[0])
- {
- cupsdSetString(&job->username, con->username);
+ if (!ra || cupsArrayFind(ra, "job-more-info"))
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI,
+ "job-more-info", NULL, job_uri);
- if (attr)
- cupsdSetString(&attr->values[0].string.text, con->username);
+ if (job->state_value > IPP_JOB_PROCESSING &&
+ (!ra || cupsArrayFind(ra, "job-preserved")))
+ ippAddBoolean(con->response, IPP_TAG_JOB, "job-preserved",
+ job->num_files > 0);
- save_auth_info(con, job);
- }
- else if (attr)
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "create_job: requesting-user-name = \"%s\"",
- attr->values[0].string.text);
+ if (!ra || cupsArrayFind(ra, "job-printer-up-time"))
+ ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER,
+ "job-printer-up-time", time(NULL));
- cupsdSetString(&job->username, attr->values[0].string.text);
- }
- else
- cupsdSetString(&job->username, "anonymous");
+ if (!ra || cupsArrayFind(ra, "job-state-reasons"))
+ add_job_state_reasons(con, job);
- 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;
- cupsdSetString(&attr->name, "job-originating-user-name");
- }
+ if (!ra || cupsArrayFind(ra, "job-uri"))
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI,
+ "job-uri", NULL, job_uri);
- if ((attr = ippFindAttribute(job->attrs, "job-originating-host-name",
- IPP_TAG_ZERO)) != NULL)
- {
- /*
- * Request contains a job-originating-host-name attribute; validate it...
- */
+ copy_attrs(con->response, job->attrs, ra, IPP_TAG_JOB, 0);
+}
- 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...
- */
+/*
+ * 'copy_printer_attrs()' - Copy printer attributes.
+ */
- for (i = 0; i < attr->num_values; i ++)
- {
- _cups_sp_free(attr->values[i].string.text);
- attr->values[i].string.text = NULL;
- if (attr->values[i].string.charset)
- {
- _cups_sp_free(attr->values[i].string.charset);
- attr->values[i].string.charset = NULL;
- }
- }
+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 */
- default :
- break;
- }
- /*
- * Use the default connection hostname instead...
- */
+ /*
+ * Copy the printer attributes to the response using requested-attributes
+ * and document-format attributes that may be provided by the client.
+ */
- attr->value_tag = IPP_TAG_NAME;
- attr->num_values = 1;
- attr->values[0].string.text = _cups_sp_alloc(con->http.hostname);
- }
+ curtime = time(NULL);
- attr->group_tag = IPP_TAG_JOB;
- }
- else
- {
- /*
- * No job-originating-host-name attribute, so use the hostname from
- * the connection...
- */
+#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__ */
- ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME,
- "job-originating-host-name", NULL, con->http.hostname);
- }
+ if (!ra || cupsArrayFind(ra, "printer-current-time"))
+ ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
+ ippTimeToDate(curtime));
- 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 (!ra || cupsArrayFind(ra, "printer-error-policy"))
+ ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
+ "printer-error-policy", NULL, printer->error_policy);
- /*
- * Add remaining job attributes...
- */
+ if (!ra || cupsArrayFind(ra, "printer-is-accepting-jobs"))
+ ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-accepting-jobs",
+ printer->accepting);
- 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 (!ra || cupsArrayFind(ra, "printer-is-shared"))
+ ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-shared",
+ printer->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);
+ 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 = ippFindAttribute(job->attrs, "job-hold-until",
- IPP_TAG_KEYWORD)) == NULL)
- attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
- if (!attr)
- attr = ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_KEYWORD,
- "job-hold-until", NULL, "no-hold");
- if (attr && strcmp(attr->values[0].string.text, "no-hold") &&
- !(printer->type & CUPS_PRINTER_REMOTE))
+ if (!ra || cupsArrayFind(ra, "printer-state"))
+ ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-state",
+ printer->state);
+
+ 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"))
{
/*
- * Hold job until specified time...
+ * Printer history is only sent if specifically requested, so that
+ * older CUPS/IPP clients won't barf on the collection attributes.
*/
- cupsdSetJobHoldUntil(job, attr->values[0].string.text);
+ 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);
}
- else
- job->hold_until = time(NULL) + 60;
- job->state->values[0].integer = IPP_JOB_HELD;
+ if (!ra || cupsArrayFind(ra, "printer-state-message"))
+ ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_TEXT,
+ "printer-state-message", NULL, printer->state_message);
- if (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)) ||
- Classification)
+ if (!ra || cupsArrayFind(ra, "printer-state-reasons"))
+ add_printer_state_reasons(con, printer);
+
+ if (!ra || cupsArrayFind(ra, "printer-type"))
{
+ int type; /* printer-type value */
+
+
/*
- * Add job sheets options...
+ * Add the CUPS-specific printer-type attribute...
*/
- 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]);
+ type = printer->type;
- attr = ippAddStrings(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME, "job-sheets",
- 2, NULL, NULL);
- attr->values[0].string.text = _cups_sp_alloc(printer->job_sheets[0]);
- attr->values[1].string.text = _cups_sp_alloc(printer->job_sheets[1]);
- }
+ if (printer == DefaultPrinter)
+ type |= CUPS_PRINTER_DEFAULT;
- job->job_sheets = attr;
+ if (!printer->accepting)
+ type |= CUPS_PRINTER_REJECTING;
- /*
- * Enforce classification level if set...
- */
+ if (!printer->shared)
+ type |= CUPS_PRINTER_NOT_SHARED;
- if (Classification)
- {
- cupsdLogMessage(CUPSD_LOG_INFO,
- "Classification=\"%s\", ClassifyOverride=%d",
- Classification ? Classification : "(null)",
- ClassifyOverride);
+ ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-type",
+ type);
+ }
- 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...
- */
+ if (!ra || cupsArrayFind(ra, "printer-up-time"))
+ ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
+ "printer-up-time", curtime);
- cupsdSetString(&attr->values[0].string.text, Classification);
+ 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,
+ "/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);
+ }
- 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!
- */
+ if (!ra || cupsArrayFind(ra, "queued-job-count"))
+ add_queued_job_count(con, printer);
- cupsdSetString(&attr->values[1].string.text, attr->values[0].string.text);
+ copy_attrs(con->response, printer->attrs, ra, IPP_TAG_ZERO, 0);
+ copy_attrs(con->response, CommonData, ra, IPP_TAG_ZERO, IPP_TAG_COPY);
+}
- 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);
+/*
+ * 'copy_subscription_attrs()' - Copy subscription attributes.
+ */
- if (attr->num_values > 1 &&
- strcmp(attr->values[1].string.text, "none"))
- cupsdSetString(&(attr->values[1].string.text), Classification);
- }
+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 */
- 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...
- */
+ /*
+ * Copy the subscription attributes to the response using the
+ * requested-attributes attribute that may be provided by the client.
+ */
- if (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)))
+ if (!ra || cupsArrayFind(ra, "notify-events"))
+ {
+ if ((name = cupsdEventName((cupsd_eventmask_t)sub->mask)) != NULL)
{
- cupsdLogMessage(CUPSD_LOG_INFO,
- "Adding start banner page \"%s\" to job %d.",
- attr->values[0].string.text, job->id);
+ /*
+ * 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 (sub->job && (!ra || cupsArrayFind(ra, "notify-job-id")))
+ ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
+ "notify-job-id", sub->job->id);
- kbytes = copy_banner(con, job, attr->values[0].string.text);
+ if (!sub->job && (!ra || cupsArrayFind(ra, "notify-lease-duration")))
+ ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
+ "notify-lease-duration", sub->lease);
- cupsdUpdateQuota(printer, job->username, 0, kbytes);
- }
+ 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);
}
- else if ((attr = ippFindAttribute(job->attrs, "job-sheets",
- IPP_TAG_ZERO)) != NULL)
- job->sheets = attr;
- /*
- * Fill in the response info...
- */
+ 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");
- snprintf(job_uri, sizeof(job_uri), "http://%s:%d/jobs/%d", ServerName,
- LocalPort, 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);
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI, "job-uri", NULL, job_uri);
+ if (!ra || cupsArrayFind(ra, "notify-subscription-id"))
+ ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
+ "notify-subscription-id", sub->id);
- ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-id", job->id);
+ if (!ra || cupsArrayFind(ra, "notify-time-interval"))
+ ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
+ "notify-time-interval", sub->interval);
- ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_ENUM, "job-state",
- job->state->values[0].integer);
+ 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);
+}
- con->response->request.status.status_code = IPP_OK;
- /*
- * Add any job subscriptions...
- */
+/*
+ * 'create_job()' - Print a file to a printer or class.
+ */
- add_job_subscriptions(con, job);
+static void
+create_job(cupsd_client_t *con, /* I - Client connection */
+ ipp_attribute_t *uri) /* I - Printer URI */
+{
+ cupsd_job_t *job; /* New job */
+
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "create_job(%p[%d], %s)", con,
+ con->http.fd, uri->values[0].string.text);
/*
- * 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, uri, NULL)) == NULL)
+ return;
/*
* Save and log the job...
cupsdLogMessage(CUPSD_LOG_INFO, "Job %d created on \"%s\" by \"%s\".",
job->id, job->dest, job->username);
-
- cupsdAddEvent(CUPSD_EVENT_JOB_CREATED, printer, job, "Job created.");
}
unsigned mask; /* notify-events */
+#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?
*/
attr = attr->next;
}
- cupsdLogMessage(CUPSD_LOG_DEBUG, "recipient=\"%s\"", recipient);
- cupsdLogMessage(CUPSD_LOG_DEBUG, "pullmethod=\"%s\"", pullmethod);
+ 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->interval = interval;
sub->lease = lease;
- sub->expire = time(NULL) + lease;
+ sub->expire = lease ? time(NULL) + lease : 0;
cupsdSetString(&sub->owner, username);
snprintf(command, sizeof(command), "%s/daemon/cups-deviced", ServerBin);
snprintf(options, sizeof(options),
- "cups-deviced %d+%d+%d+requested-attributes=%s",
+ "%d+%d+%d+requested-attributes=%s",
con->request->request.op.request_id,
- limit ? limit->values[0].integer : 0, User,
+ limit ? limit->values[0].integer : 0, (int)User,
attrs);
if (cupsdSendCommand(con, command, options, 1))
* Copy attributes...
*/
+ cupsdLoadJob(job);
+
ra = create_requested_array(con->request);
copy_job_attrs(con, job, ra);
cupsArrayDelete(ra);
if (username[0] && strcasecmp(username, job->username))
continue;
- if (completed && job->state->values[0].integer <= IPP_JOB_STOPPED)
+ if (completed && job->state_value <= IPP_JOB_STOPPED)
continue;
if (job->id < first_job_id)
continue;
+ cupsdLoadJob(job);
+
+ if (!job->attrs)
+ continue;
+
if (count > 0)
ippAddSeparator(con->response);
*/
static void
-get_notifications(cupsd_client_t *con, /* I - Client connection */
- int id) /* I - Subscription ID */
-{
-}
-
-
-/*
- * 'get_ppds()' - Get the list of PPD files on the local system.
- */
-
-static void
-get_ppds(cupsd_client_t *con) /* I - Client connection */
+get_notifications(cupsd_client_t *con) /* I - Client connection */
{
+ int i, j; /* Looping vars */
http_status_t status; /* Policy status */
- int i; /* Looping var */
- ipp_attribute_t *limit, /* Limit attribute */
- *make, /* ppd-make 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 */
+ 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_ppds(%p[%d])", con, con->http.fd);
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_subscription_attrs(con=%p[%d])",
+ con, con->http.fd);
/*
- * Check policy...
+ * Get subscription attributes...
*/
- if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+ ids = ippFindAttribute(con->request, "notify-subscription-ids",
+ IPP_TAG_INTEGER);
+ sequences = ippFindAttribute(con->request, "notify-sequence-numbers",
+ IPP_TAG_INTEGER);
+
+ if (!ids)
{
- send_http_error(con, status);
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("Missing notify-subscription-ids attribute!"));
return;
}
/*
- * Run cups-driverd command with the given options...
+ * Are the subscription IDs valid?
*/
- 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);
-
- if (requested)
+ for (i = 0, interval = 60; i < ids->num_values; i ++)
{
- for (i = 0, aptr = attrs; i < requested->num_values; i ++)
+ if ((sub = cupsdFindSubscription(ids->values[i].integer)) == NULL)
{
/*
- * 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...
+ * Bad subscription ID...
*/
- strcpy(aptr, requested->values[i].string.text);
- aptr += alen;
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("notify-subscription-id %d no good!"),
+ ids->values[i].integer);
+ return;
}
/*
- * If we have more attribute names than will fit, default to "all"...
+ * Check policy...
*/
- if (i < requested->num_values)
- strcpy(attrs, "all");
- }
- else
- strcpy(attrs, "all");
-
- snprintf(command, sizeof(command), "%s/daemon/cups-driverd", ServerBin);
- snprintf(options, sizeof(options),
- "cups-driverd list+%d+%d+requested-attributes=%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 : "");
-
- if (cupsdSendCommand(con, command, options, 0))
- {
- /*
- * Command started successfully, don't send an IPP response here...
- */
+ if ((status = cupsdCheckPolicy(sub->dest ? sub->dest->op_policy_ptr :
+ DefaultPolicyPtr,
+ con, sub->owner)) != HTTP_OK)
+ {
+ send_http_error(con, status);
+ return;
+ }
- ippDelete(con->response);
- con->response = NULL;
- }
- else
- {
/*
- * Command failed, return "internal error" so the user knows something
- * went wrong...
+ * Check the subscription type and update the interval accordingly.
*/
- send_ipp_status(con, IPP_INTERNAL_ERROR,
- _("cups-driverd failed to execute."));
+ 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;
}
-}
-
-
-/*
- * 'get_printer_attrs()' - Get printer attributes.
- */
-static void
-get_printer_attrs(cupsd_client_t *con, /* I - Client connection */
- 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 */
- cupsd_printer_t *printer; /* Printer/class */
- cups_array_t *ra; /* Requested attributes array */
+ /*
+ * Tell the client to poll again in N seconds...
+ */
+ if (interval > 0)
+ ippAddInteger(con->response, IPP_TAG_OPERATION, IPP_TAG_INTEGER,
+ "notify-get-interval", interval);
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_printer_attrs(%p[%d], %s)", con,
- con->http.fd, uri->values[0].string.text);
+ ippAddInteger(con->response, IPP_TAG_OPERATION, IPP_TAG_INTEGER,
+ "printer-up-time", time(NULL));
/*
- * Is the destination valid?
+ * Copy the subscription event attributes to the response.
*/
- httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
- sizeof(method), username, sizeof(username), host,
- sizeof(host), &port, resource, sizeof(resource));
+ con->response->request.status.status_code =
+ interval ? IPP_OK : IPP_OK_EVENTS_COMPLETE;
- if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
+ for (i = 0; i < ids->num_values; i ++)
{
/*
- * Bad URI...
+ * Get the subscription and sequence number...
*/
- send_ipp_status(con, IPP_NOT_FOUND,
- _("The printer or class was not found."));
- return;
- }
+ sub = cupsdFindSubscription(ids->values[i].integer);
- /*
- * Check policy...
- */
+ if (sequences && i < sequences->num_values)
+ min_seq = sequences->values[i].integer;
+ else
+ min_seq = 1;
- if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
- {
- send_http_error(con, status);
- return;
- }
+ /*
+ * If we don't have any new events, nothing to do here...
+ */
- /*
- * Send the attributes...
- */
+ if (min_seq > (sub->first_event_id + sub->num_events))
+ continue;
- ra = create_requested_array(con->request);
+ /*
+ * Otherwise copy all of the new events...
+ */
- copy_printer_attrs(con, printer, ra);
+ if (sub->first_event_id > min_seq)
+ j = 0;
+ else
+ j = min_seq - sub->first_event_id;
- cupsArrayDelete(ra);
+ for (; j < sub->num_events; j ++)
+ {
+ ippAddSeparator(con->response);
- con->response->request.status.status_code = IPP_OK;
+ copy_attrs(con->response, sub->events[j]->attrs, NULL,
+ IPP_TAG_EVENT_NOTIFICATION, 0);
+ }
+ }
}
/*
- * 'get_printers()' - Get a list of printers or classes.
+ * 'get_ppds()' - Get the list of PPD files on the local system.
*/
static void
-get_printers(cupsd_client_t *con, /* I - Client connection */
- int type) /* I - 0 or CUPS_PRINTER_CLASS */
+get_ppds(cupsd_client_t *con) /* I - Client connection */
{
- http_status_t status; /* Policy status */
- ipp_attribute_t *attr; /* Current attribute */
- int limit; /* Maximum number of printers to return */
- int count; /* Number of printers that match */
- cupsd_printer_t *printer; /* Current printer pointer */
- 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 */
- cups_array_t *ra; /* Requested attributes array */
+ http_status_t status; /* Policy status */
+ int i; /* Looping var */
+ ipp_attribute_t *limit, /* Limit attribute */
+ *make, /* ppd-make 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 */
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_printers(%p[%d], %x)", con,
- con->http.fd, type);
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_ppds(%p[%d])", con, con->http.fd);
/*
* Check policy...
}
/*
- * Check for printers...
- */
-
- if (!Printers || !cupsArrayCount(Printers))
- {
- 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)
- limit = attr->values[0].integer;
- else
- limit = 10000000;
-
- if ((attr = ippFindAttribute(con->request, "first-printer-name",
- IPP_TAG_NAME)) != NULL)
- first_printer_name = attr->values[0].string.text;
- else
- first_printer_name = NULL;
-
- /*
- * Support filtering...
- */
-
- if ((attr = ippFindAttribute(con->request, "printer-type",
- IPP_TAG_ENUM)) != NULL)
- printer_type = attr->values[0].integer;
- else
- printer_type = 0;
-
- if ((attr = ippFindAttribute(con->request, "printer-type-mask",
- IPP_TAG_ENUM)) != NULL)
- printer_mask = attr->values[0].integer;
- else
- printer_mask = 0;
-
- if ((attr = ippFindAttribute(con->request, "printer-location",
- IPP_TAG_TEXT)) != NULL)
- location = attr->values[0].string.text;
- else
- location = NULL;
-
- if (con->username[0])
- username = con->username;
- else if ((attr = ippFindAttribute(con->request, "requesting-user-name",
- IPP_TAG_NAME)) != NULL)
- username = attr->values[0].string.text;
- else
- username = NULL;
-
- ra = create_requested_array(con->request);
-
- /*
- * OK, build a list of printers for this printer...
+ * Run cups-driverd command with the given options...
*/
- if (first_printer_name)
- {
- if ((printer = cupsdFindDest(first_printer_name)) == NULL)
- printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
- }
- else
- printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
+ 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);
- for (count = 0;
- count < limit && printer;
- printer = (cupsd_printer_t *)cupsArrayNext(Printers))
+ if (requested)
{
- if ((!type || (printer->type & CUPS_PRINTER_CLASS) == type) &&
- (printer->type & printer_mask) == printer_type &&
- (!location || !printer->location ||
- !strcasecmp(printer->location, location)))
+ for (i = 0, aptr = attrs; i < requested->num_values; i ++)
{
/*
- * If HideImplicitMembers is enabled, see if this printer or class
- * is a member of an implicit class...
+ * Check that we have enough room...
*/
- if (ImplicitClasses && HideImplicitMembers &&
- printer->in_implicit_class)
- continue;
+ alen = strlen(requested->values[i].string.text);
+ if (alen > (sizeof(attrs) - (aptr - attrs) - 2))
+ break;
/*
- * If a username is specified, see if it is allowed or denied
- * access...
+ * Put commas between values...
*/
- if (printer->num_users && username && !user_allowed(printer, username))
- continue;
+ if (i)
+ *aptr++ = ',';
/*
- * Add the group separator as needed...
+ * Add the value to the end of the string...
*/
- if (count > 0)
- ippAddSeparator(con->response);
-
- count ++;
+ strcpy(aptr, requested->values[i].string.text);
+ aptr += alen;
+ }
- /*
- * Send the attributes...
- */
+ /*
+ * If we have more attribute names than will fit, default to "all"...
+ */
- copy_printer_attrs(con, printer, ra);
- }
+ if (i < requested->num_values)
+ strcpy(attrs, "all");
}
+ else
+ strcpy(attrs, "all");
- cupsArrayDelete(ra);
+ snprintf(command, sizeof(command), "%s/daemon/cups-driverd", ServerBin);
+ snprintf(options, sizeof(options),
+ "list+%d+%d+requested-attributes=%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 : "");
- con->response->request.status.status_code = IPP_OK;
+ if (cupsdSendCommand(con, command, options, 0))
+ {
+ /*
+ * Command started successfully, don't send an IPP response here...
+ */
+
+ ippDelete(con->response);
+ con->response = NULL;
+ }
+ else
+ {
+ /*
+ * Command failed, return "internal error" so the user knows something
+ * went wrong...
+ */
+
+ send_ipp_status(con, IPP_INTERNAL_ERROR,
+ _("cups-driverd failed to execute."));
+ }
}
/*
- * 'get_subscription_attrs()' - Get subscription attributes.
+ * 'get_printer_attrs()' - Get printer attributes.
*/
static void
-get_subscription_attrs(
- cupsd_client_t *con, /* I - Client connection */
- int sub_id) /* I - Subscription ID */
+get_printer_attrs(cupsd_client_t *con, /* I - Client connection */
+ ipp_attribute_t *uri) /* I - Printer URI */
{
http_status_t status; /* Policy status */
- cupsd_subscription_t *sub; /* Subscription */
+ 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/class */
cups_array_t *ra; /* Requested attributes array */
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "get_subscription_attrs(con=%p[%d], sub_id=%d)",
- con, con->http.fd, sub_id);
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_printer_attrs(%p[%d], %s)", con,
+ con->http.fd, uri->values[0].string.text);
/*
- * Is the subscription ID valid?
+ * Is the destination valid?
*/
- if ((sub = cupsdFindSubscription(sub_id)) == NULL)
+ httpSeparateURI(HTTP_URI_CODING_ALL, 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 subscription ID...
+ * Bad URI...
*/
send_ipp_status(con, IPP_NOT_FOUND,
- _("notify-subscription-id %d no good!"), sub_id);
+ _("The printer or class was not found."));
return;
}
* Check policy...
*/
- if ((status = cupsdCheckPolicy(sub->dest ? sub->dest->op_policy_ptr :
- DefaultPolicyPtr,
- con, sub->owner)) != HTTP_OK)
+ if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
{
send_http_error(con, status);
return;
}
/*
- * Copy the subscription attributes to the response using the
- * requested-attributes attribute that may be provided by the client.
+ * Send the attributes...
*/
ra = create_requested_array(con->request);
- copy_subscription_attrs(con, sub, ra);
+ copy_printer_attrs(con, printer, ra);
cupsArrayDelete(ra);
/*
- * 'get_subscriptions()' - Get subscriptions.
+ * 'get_printers()' - Get a list of printers or classes.
*/
static void
-get_subscriptions(cupsd_client_t *con, /* I - Client connection */
- ipp_attribute_t *uri) /* I - Printer/job URI */
+get_printers(cupsd_client_t *con, /* I - Client connection */
+ int type) /* I - 0 or CUPS_PRINTER_CLASS */
{
- http_status_t status; /* Policy status */
- int count; /* Number of subscriptions */
- int limit; /* Limit */
- 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 */
- 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 pointer */
- cupsd_printer_t *printer; /* Printer */
-
-
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "get_subscriptions(con=%p[%d], uri=%s)",
- con, con->http.fd, uri->values[0].string.text);
-
- /*
- * Is the destination valid?
- */
-
- httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
- sizeof(method), username, sizeof(username), host,
- sizeof(host), &port, resource, sizeof(resource));
-
- if (!strcmp(resource, "/") ||
- (!strncmp(resource, "/jobs", 5) && strlen(resource) <= 6) ||
- (!strncmp(resource, "/printers", 9) && strlen(resource) <= 10) ||
- (!strncmp(resource, "/classes", 8) && strlen(resource) <= 9))
- {
- printer = NULL;
- job = NULL;
- }
- else if (!strncmp(resource, "/jobs/", 6) && resource[6])
- {
- printer = NULL;
- job = cupsdFindJob(atoi(resource + 6));
-
- if (!job)
- {
- send_ipp_status(con, IPP_NOT_FOUND, _("Job #%s does not exist!"),
- resource + 6);
- return;
- }
- }
- else if (!cupsdValidateDest(host, resource, &dtype, &printer))
- {
- /*
- * Bad URI...
- */
+ http_status_t status; /* Policy status */
+ ipp_attribute_t *attr; /* Current attribute */
+ int limit; /* Maximum number of printers to return */
+ int count; /* Number of printers that match */
+ cupsd_printer_t *printer; /* Current printer pointer */
+ 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 */
+ cups_array_t *ra; /* Requested attributes array */
- send_ipp_status(con, IPP_NOT_FOUND,
- _("The printer or class was not found."));
- return;
- }
- else if ((attr = ippFindAttribute(con->request, "notify-job-id",
- IPP_TAG_INTEGER)) != NULL)
- {
- job = cupsdFindJob(attr->values[0].integer);
- if (!job)
- {
- send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"),
- attr->values[0].integer);
- return;
- }
- }
- else
- job = NULL;
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_printers(%p[%d], %x)", con,
+ con->http.fd, type);
/*
* Check policy...
*/
- if ((status = cupsdCheckPolicy(printer ? printer->op_policy_ptr :
- DefaultPolicyPtr,
- con, NULL)) != HTTP_OK)
+ if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
{
send_http_error(con, status);
return;
}
/*
- * Copy the subscription attributes to the response using the
- * requested-attributes attribute that may be provided by the client.
+ * Check for printers...
*/
- ra = create_requested_array(con->request);
+ if (!Printers || !cupsArrayCount(Printers))
+ {
+ 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)
limit = attr->values[0].integer;
else
- limit = 0;
+ limit = 10000000;
+
+ if ((attr = ippFindAttribute(con->request, "first-printer-name",
+ IPP_TAG_NAME)) != NULL)
+ first_printer_name = attr->values[0].string.text;
+ else
+ first_printer_name = NULL;
/*
- * See if we only want to see subscriptions for a specific user...
+ * Support filtering...
*/
- if ((attr = ippFindAttribute(con->request, "my-subscriptions",
- IPP_TAG_BOOLEAN)) != NULL &&
- attr->values[0].boolean)
- strlcpy(username, get_username(con), sizeof(username));
+ if ((attr = ippFindAttribute(con->request, "printer-type",
+ IPP_TAG_ENUM)) != NULL)
+ printer_type = attr->values[0].integer;
else
- username[0] = '\0';
-
- for (sub = (cupsd_subscription_t *)cupsArrayFirst(Subscriptions), count = 0;
- sub;
- sub = (cupsd_subscription_t *)cupsArrayNext(Subscriptions))
- if ((!printer || sub->dest == printer) && (!job || sub->job == job) &&
- (!username[0] || !strcasecmp(username, sub->owner)))
- {
- ippAddSeparator(con->response);
- copy_subscription_attrs(con, sub, ra);
-
- count ++;
- if (limit && count >= limit)
- break;
- }
-
- cupsArrayDelete(ra);
+ printer_type = 0;
- if (count)
- con->response->request.status.status_code = IPP_OK;
+ if ((attr = ippFindAttribute(con->request, "printer-type-mask",
+ IPP_TAG_ENUM)) != NULL)
+ printer_mask = attr->values[0].integer;
else
- send_ipp_status(con, IPP_NOT_FOUND, _("No subscriptions found."));
-}
-
-
-/*
- * 'get_username()' - Get the username associated with a request.
- */
-
-static const char * /* O - Username */
-get_username(cupsd_client_t *con) /* I - Connection */
-{
- ipp_attribute_t *attr; /* Attribute */
+ printer_mask = 0;
+ if ((attr = ippFindAttribute(con->request, "printer-location",
+ IPP_TAG_TEXT)) != NULL)
+ location = attr->values[0].string.text;
+ else
+ location = NULL;
if (con->username[0])
- return (con->username);
+ username = con->username;
else if ((attr = ippFindAttribute(con->request, "requesting-user-name",
IPP_TAG_NAME)) != NULL)
- return (attr->values[0].string.text);
+ username = attr->values[0].string.text;
else
- return ("anonymous");
-}
-
-
-/*
- * 'hold_job()' - Hold a print job.
- */
-
-static void
-hold_job(cupsd_client_t *con, /* I - Client connection */
- ipp_attribute_t *uri) /* I - Job or Printer URI */
-{
- 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 */
-
+ username = NULL;
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "hold_job(%p[%d], %s)", con, con->http.fd,
- uri->values[0].string.text);
+ ra = create_requested_array(con->request);
/*
- * See if we have a job URI or a printer URI...
+ * OK, build a list of printers for this printer...
*/
- if (!strcmp(uri->name, "printer-uri"))
+ if (first_printer_name)
{
- /*
- * 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;
+ if ((printer = cupsdFindDest(first_printer_name)) == NULL)
+ printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
}
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));
+ printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
- if (strncmp(resource, "/jobs/", 6))
+ for (count = 0;
+ count < limit && printer;
+ printer = (cupsd_printer_t *)cupsArrayNext(Printers))
+ {
+ if ((!type || (printer->type & CUPS_PRINTER_CLASS) == type) &&
+ (printer->type & printer_mask) == printer_type &&
+ (!location || !printer->location ||
+ !strcasecmp(printer->location, location)))
{
/*
- * Not a valid URI!
+ * If HideImplicitMembers is enabled, see if this printer or class
+ * is a member of an implicit class...
*/
- 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;
- }
+ if (ImplicitClasses && HideImplicitMembers &&
+ printer->in_implicit_class)
+ continue;
- /*
- * Hold the job and return...
- */
+ /*
+ * If a username is specified, see if it is allowed or denied
+ * access...
+ */
- cupsdHoldJob(job);
+ if (printer->num_users && username && !user_allowed(printer, username))
+ continue;
- if ((newattr = ippFindAttribute(con->request, "job-hold-until",
- IPP_TAG_KEYWORD)) == NULL)
- newattr = ippFindAttribute(con->request, "job-hold-until", IPP_TAG_NAME);
+ /*
+ * Add the group separator as needed...
+ */
- if ((attr = ippFindAttribute(job->attrs, "job-hold-until",
- IPP_TAG_KEYWORD)) == NULL)
- attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
+ if (count > 0)
+ ippAddSeparator(con->response);
- if (attr)
- {
- /*
- * Free the old hold value and copy the new one over...
- */
+ count ++;
- _cups_sp_free(attr->values[0].string.text);
+ /*
+ * Send the attributes...
+ */
- if (newattr)
- {
- attr->value_tag = newattr->value_tag;
- attr->values[0].string.text =
- _cups_sp_alloc(newattr->values[0].string.text);
- }
- else
- {
- attr->value_tag = IPP_TAG_KEYWORD;
- attr->values[0].string.text = _cups_sp_alloc("indefinite");
+ copy_printer_attrs(con, printer, ra);
}
-
- /*
- * Hold job until specified time...
- */
-
- cupsdSetJobHoldUntil(job, attr->values[0].string.text);
}
- cupsdLogMessage(CUPSD_LOG_INFO, "Job %d was held by \"%s\".", jobid,
- username);
+ cupsArrayDelete(ra);
con->response->request.status.status_code = IPP_OK;
}
/*
- * 'move_job()' - Move a job to a new destination.
+ * 'get_subscription_attrs()' - Get subscription attributes.
*/
static void
-move_job(cupsd_client_t *con, /* I - Client connection */
- ipp_attribute_t *uri) /* I - Job URI */
+get_subscription_attrs(
+ cupsd_client_t *con, /* I - Client connection */
+ int sub_id) /* I - Subscription ID */
{
- 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 */
- *dest; /* Destination */
- cups_ptype_t stype, /* Source type (printer or class) */
- 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 *sprinter, /* Source printer */
- *dprinter; /* Destination printer */
+ http_status_t status; /* Policy status */
+ cupsd_subscription_t *sub; /* Subscription */
+ cups_array_t *ra; /* Requested attributes array */
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "move_job(%p[%d], %s)", con, con->http.fd,
- uri->values[0].string.text);
+ cupsdLogMessage(CUPSD_LOG_DEBUG2,
+ "get_subscription_attrs(con=%p[%d], sub_id=%d)",
+ con, con->http.fd, sub_id);
/*
- * Get the new printer or class...
+ * Is the subscription ID valid?
*/
- 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;
- }
-
- httpSeparateURI(HTTP_URI_CODING_ALL, attr->values[0].string.text, method,
- sizeof(method), username, sizeof(username), host,
- sizeof(host), &port, resource, sizeof(resource));
-
- if ((dest = cupsdValidateDest(host, resource, &dtype, &dprinter)) == NULL)
+ if ((sub = cupsdFindSubscription(sub_id)) == NULL)
{
/*
- * Bad URI...
+ * Bad subscription ID...
*/
send_ipp_status(con, IPP_NOT_FOUND,
- _("The printer or class was not found."));
+ _("notify-subscription-id %d no good!"), sub_id);
return;
}
* Check policy...
*/
- if ((status = cupsdCheckPolicy(dprinter->op_policy_ptr, con, NULL)) != HTTP_OK)
+ if ((status = cupsdCheckPolicy(sub->dest ? sub->dest->op_policy_ptr :
+ DefaultPolicyPtr,
+ con, sub->owner)) != HTTP_OK)
{
send_http_error(con, status);
return;
}
/*
- * See if we have a job URI or a printer URI...
+ * Copy the subscription attributes to the response using the
+ * requested-attributes attribute that may be provided by the client.
*/
- httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
- sizeof(method), username, sizeof(username), host,
- sizeof(host), &port, resource, sizeof(resource));
+ ra = create_requested_array(con->request);
- if (!strcmp(uri->name, "printer-uri"))
- {
- /*
- * Got a printer URI; see if we also have a job-id attribute...
- */
+ copy_subscription_attrs(con, sub, ra);
- if ((attr = ippFindAttribute(con->request, "job-id",
- IPP_TAG_INTEGER)) == NULL)
- {
- /*
- * Move all jobs...
- */
+ cupsArrayDelete(ra);
- if ((src = cupsdValidateDest(host, resource, &stype, &sprinter)) == NULL)
- {
- /*
- * Bad URI...
- */
+ con->response->request.status.status_code = IPP_OK;
+}
- send_ipp_status(con, IPP_NOT_FOUND,
- _("The printer or class was not found."));
- return;
- }
- job = NULL;
- }
- else
- {
- /*
- * Otherwise, just move a single job...
- */
+/*
+ * 'get_subscriptions()' - Get subscriptions.
+ */
- if ((job = cupsdFindJob(attr->values[0].integer)) == NULL)
- {
- /*
- * Nope - return a "not found" error...
- */
+static void
+get_subscriptions(cupsd_client_t *con, /* I - Client connection */
+ ipp_attribute_t *uri) /* I - Printer/job URI */
+{
+ http_status_t status; /* Policy status */
+ int count; /* Number of subscriptions */
+ int limit; /* Limit */
+ 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 */
+ 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 pointer */
+ cupsd_printer_t *printer; /* Printer */
- send_ipp_status(con, IPP_NOT_FOUND,
- _("Job #%d does not exist!"), attr->values[0].integer);
- return;
- }
- else
- {
- /*
- * Job found, initialize source pointers...
- */
- src = NULL;
- sprinter = NULL;
- }
- }
+ cupsdLogMessage(CUPSD_LOG_DEBUG2,
+ "get_subscriptions(con=%p[%d], uri=%s)",
+ con, con->http.fd, uri->values[0].string.text);
+
+ /*
+ * Is the destination valid?
+ */
+
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
+
+ if (!strcmp(resource, "/") ||
+ (!strncmp(resource, "/jobs", 5) && strlen(resource) <= 6) ||
+ (!strncmp(resource, "/printers", 9) && strlen(resource) <= 10) ||
+ (!strncmp(resource, "/classes", 8) && strlen(resource) <= 9))
+ {
+ printer = NULL;
+ job = NULL;
}
- else
+ else if (!strncmp(resource, "/jobs/", 6) && resource[6])
{
- /*
- * Got a job URI; parse it to get the job ID...
- */
+ printer = NULL;
+ job = cupsdFindJob(atoi(resource + 6));
- if (strncmp(resource, "/jobs/", 6))
+ if (!job)
{
- /*
- * Not a valid URI!
- */
-
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("Bad job-uri attribute \"%s\"!"),
- uri->values[0].string.text);
+ send_ipp_status(con, IPP_NOT_FOUND, _("Job #%s does not exist!"),
+ resource + 6);
return;
}
-
+ }
+ else if (!cupsdValidateDest(host, resource, &dtype, &printer))
+ {
/*
- * See if the job exists...
+ * Bad URI...
*/
- jobid = atoi(resource + 6);
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("The printer or class was not found."));
+ return;
+ }
+ else if ((attr = ippFindAttribute(con->request, "notify-job-id",
+ IPP_TAG_INTEGER)) != NULL)
+ {
+ job = cupsdFindJob(attr->values[0].integer);
- if ((job = cupsdFindJob(jobid)) == NULL)
+ if (!job)
{
- /*
- * Nope - return a "not found" error...
- */
-
- send_ipp_status(con, IPP_NOT_FOUND,
- _("Job #%d does not exist!"), jobid);
+ send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"),
+ attr->values[0].integer);
return;
}
- else
- {
- /*
- * Job found, initialize source pointers...
- */
-
- src = NULL;
- sprinter = NULL;
- }
}
+ else
+ job = NULL;
/*
- * Now move the job or jobs...
+ * Check policy...
*/
- if (job)
+ if ((status = cupsdCheckPolicy(printer ? printer->op_policy_ptr :
+ DefaultPolicyPtr,
+ con, NULL)) != HTTP_OK)
{
- /*
- * See if the job has been completed...
- */
-
- if (job->state->values[0].integer > IPP_JOB_STOPPED)
- {
- /*
- * Return a "not-possible" error...
- */
+ send_http_error(con, status);
+ return;
+ }
- send_ipp_status(con, IPP_NOT_POSSIBLE,
- _("Job #%d is finished and cannot be altered!"),
- job->id);
- return;
- }
+ /*
+ * Copy the subscription attributes to the response using the
+ * requested-attributes attribute that may be provided by the client.
+ */
- /*
- * See if the job is owned by the requesting user...
- */
+ ra = create_requested_array(con->request);
- 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\"!"),
- job->id, job->username);
- return;
- }
+ if ((attr = ippFindAttribute(con->request, "limit",
+ IPP_TAG_INTEGER)) != NULL)
+ limit = attr->values[0].integer;
+ else
+ limit = 0;
- /*
- * Move the job to a different printer or class...
- */
+ /*
+ * See if we only want to see subscriptions for a specific user...
+ */
- cupsdMoveJob(job, dest);
- }
+ if ((attr = ippFindAttribute(con->request, "my-subscriptions",
+ IPP_TAG_BOOLEAN)) != NULL &&
+ attr->values[0].boolean)
+ strlcpy(username, get_username(con), sizeof(username));
else
- {
- /*
- * Got the source printer, now look through the jobs...
- */
+ username[0] = '\0';
- for (job = (cupsd_job_t *)cupsArrayFirst(Jobs);
- job;
- job = (cupsd_job_t *)cupsArrayNext(Jobs))
+ for (sub = (cupsd_subscription_t *)cupsArrayFirst(Subscriptions), count = 0;
+ sub;
+ sub = (cupsd_subscription_t *)cupsArrayNext(Subscriptions))
+ if ((!printer || sub->dest == printer) && (!job || sub->job == job) &&
+ (!username[0] || !strcasecmp(username, sub->owner)))
{
- /*
- * See if the job is pointing at the source printer or has not been
- * completed...
- */
-
- if (strcasecmp(job->dest, src) ||
- job->state->values[0].integer > IPP_JOB_STOPPED)
- continue;
+ ippAddSeparator(con->response);
+ copy_subscription_attrs(con, sub, ra);
- /*
- * See if the job can be moved by the requesting user...
- */
+ count ++;
+ if (limit && count >= limit)
+ break;
+ }
- if (!validate_user(job, con, job->username, username, sizeof(username)))
- continue;
+ cupsArrayDelete(ra);
- /*
- * Move the job to a different printer or class...
- */
+ if (count)
+ con->response->request.status.status_code = IPP_OK;
+ else
+ send_ipp_status(con, IPP_NOT_FOUND, _("No subscriptions found."));
+}
- cupsdMoveJob(job, dest);
- }
- }
- /*
- * Start jobs if possible...
- */
+/*
+ * 'get_username()' - Get the username associated with a request.
+ */
- cupsdCheckJobs();
+static const char * /* O - Username */
+get_username(cupsd_client_t *con) /* I - Connection */
+{
+ ipp_attribute_t *attr; /* Attribute */
- /*
- * Return with "everything is OK" status...
- */
- con->response->request.status.status_code = IPP_OK;
+ 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
+ return ("anonymous");
}
/*
- * 'ppd_add_default()' - Add a PPD default choice.
+ * 'hold_job()' - Hold a print job.
*/
-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 */
+static void
+hold_job(cupsd_client_t *con, /* I - Client connection */
+ ipp_attribute_t *uri) /* I - Job or Printer URI */
{
- int i; /* Looping var */
- ppd_default_t *temp; /* Temporary defaults array */
+ 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);
/*
- * First check if the option already has a default value; the PPD spec
- * says that the first one is used...
+ * See if we have a job URI or a printer URI...
*/
- for (i = 0, temp = *defaults; i < num_defaults; i ++)
- if (!strcmp(option, temp[i].option))
- return (num_defaults);
+ if (!strcmp(uri->name, "printer-uri"))
+ {
+ /*
+ * Got a printer URI; see if we also have a job-id attribute...
+ */
- /*
- * Now add the option...
- */
+ 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;
+ }
- if (num_defaults == 0)
- temp = malloc(sizeof(ppd_default_t));
+ jobid = attr->values[0].integer;
+ }
else
- temp = realloc(*defaults, (num_defaults + 1) * sizeof(ppd_default_t));
-
- if (!temp)
{
- cupsdLogMessage(CUPSD_LOG_ERROR, "ppd_add_default: Unable to add default value for \"%s\" - %s",
- option, strerror(errno));
- return (num_defaults);
- }
-
- *defaults = temp;
- temp += num_defaults;
+ /*
+ * Got a job URI; parse it to get the job ID...
+ */
- strlcpy(temp->option, option, sizeof(temp->option));
- strlcpy(temp->choice, choice, sizeof(temp->choice));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
- return (num_defaults + 1);
-}
+ 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;
+ }
-/*
- * 'ppd_parse_line()' - Parse a PPD default line.
- */
+ jobid = atoi(resource + 6);
+ }
-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 */
-{
/*
- * Verify this is a default option line...
+ * See if the job exists...
*/
- if (strncmp(line, "*Default", 8))
- return (-1);
+ 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;
+ }
/*
- * Read the option name...
+ * See if the job is owned by the requesting user...
*/
- for (line += 8, olen --; isalnum(*line & 255); line ++)
- if (olen > 0)
- {
- *option++ = *line;
- olen --;
- }
-
- *option = '\0';
+ if (!validate_user(job, con, job->username, username, sizeof(username)))
+ {
+ send_http_error(con, HTTP_UNAUTHORIZED);
+ return;
+ }
/*
- * Skip everything else up to the colon (:)...
+ * Hold the job and return...
*/
- while (*line && *line != ':')
- line ++;
+ cupsdHoldJob(job);
- if (!*line)
- return (-1);
+ if ((newattr = ippFindAttribute(con->request, "job-hold-until",
+ IPP_TAG_KEYWORD)) == NULL)
+ newattr = ippFindAttribute(con->request, "job-hold-until", IPP_TAG_NAME);
- line ++;
+ if ((attr = ippFindAttribute(job->attrs, "job-hold-until",
+ IPP_TAG_KEYWORD)) == NULL)
+ attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
- /*
- * Now grab the option choice, skipping leading whitespace...
- */
+ if (attr)
+ {
+ /*
+ * Free the old hold value and copy the new one over...
+ */
- while (isspace(*line & 255))
- line ++;
+ _cupsStrFree(attr->values[0].string.text);
- for (clen --; isalnum(*line & 255); line ++)
- if (clen > 0)
+ if (newattr)
{
- *choice++ = *line;
- clen --;
+ 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");
}
- *choice = '\0';
+ /*
+ * Hold job until specified time...
+ */
- /*
- * Return with no errors...
- */
+ cupsdSetJobHoldUntil(job, attr->values[0].string.text);
+ }
- return (0);
+ cupsdLogMessage(CUPSD_LOG_INFO, "Job %d was held by \"%s\".", jobid,
+ username);
+
+ con->response->request.status.status_code = IPP_OK;
}
/*
- * 'print_job()' - Print a file to a printer or class.
+ * 'move_job()' - Move a job to a new destination.
*/
static void
-print_job(cupsd_client_t *con, /* I - Client connection */
- ipp_attribute_t *uri) /* I - Printer URI */
+move_job(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 */
- 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 */
+ int jobid; /* Job ID */
cupsd_job_t *job; /* Current job */
- char job_uri[HTTP_MAX_URI], /* Job URI */
- method[HTTP_MAX_URI], /* Method portion of URI */
+ const char *src, /* Source printer/class */
+ *dest; /* Destination */
+ cups_ptype_t stype, /* Source type (printer or class) */
+ 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 */
- filename[1024]; /* Job filename */
+ resource[HTTP_MAX_URI]; /* Resource portion of URI */
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 */
+ cupsd_printer_t *sprinter, /* Source printer */
+ *dprinter; /* Destination printer */
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "print_job(%p[%d], %s)", con, con->http.fd,
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "move_job(%p[%d], %s)", con, con->http.fd,
uri->values[0].string.text);
/*
- * Validate job template attributes; for now just copies and page-ranges...
+ * Get the new printer or class...
*/
- if ((attr = ippFindAttribute(con->request, "copies",
- IPP_TAG_INTEGER)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "job-printer-uri",
+ IPP_TAG_URI)) == 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;
- }
+ /*
+ * Need job-printer-uri...
+ */
+
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("job-printer-uri attribute missing!"));
+ return;
}
+
+ httpSeparateURI(HTTP_URI_CODING_ALL, attr->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
- if ((attr = ippFindAttribute(con->request, "page-ranges",
- IPP_TAG_RANGE)) != NULL)
+ if ((dest = cupsdValidateDest(host, resource, &dtype, &dprinter)) == NULL)
{
- for (i = 0, lowerpagerange = 1; i < attr->num_values; i ++)
+ /*
+ * Bad URI...
+ */
+
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("The printer or class was not found."));
+ return;
+ }
+
+ /*
+ * Check policy...
+ */
+
+ if ((status = cupsdCheckPolicy(dprinter->op_policy_ptr, con, NULL)) != HTTP_OK)
+ {
+ send_http_error(con, status);
+ return;
+ }
+
+ /*
+ * See if we have a job URI or a printer URI...
+ */
+
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
+
+ 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->values[i].range.lower < lowerpagerange ||
- attr->values[i].range.lower > attr->values[i].range.upper)
+ /*
+ * Move all jobs...
+ */
+
+ if ((src = cupsdValidateDest(host, resource, &stype, &sprinter)) == NULL)
{
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("Bad page-ranges values %d-%d."),
- attr->values[i].range.lower,
- attr->values[i].range.upper);
+ /*
+ * Bad URI...
+ */
+
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("The printer or class was not found."));
return;
}
- lowerpagerange = attr->values[i].range.upper + 1;
+ job = NULL;
}
- }
+ else
+ {
+ /*
+ * Otherwise, just move a single job...
+ */
- /*
- * OK, see if the client is sending the document compressed - CUPS
- * only supports "none" and "gzip".
- */
+ if ((job = cupsdFindJob(attr->values[0].integer)) == NULL)
+ {
+ /*
+ * Nope - return a "not found" error...
+ */
- compression = CUPS_FILE_NONE;
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("Job #%d does not exist!"), attr->values[0].integer);
+ return;
+ }
+ else
+ {
+ /*
+ * Job found, initialize source pointers...
+ */
- if ((attr = ippFindAttribute(con->request, "compression",
- IPP_TAG_KEYWORD)) != NULL)
+ src = NULL;
+ sprinter = NULL;
+ }
+ }
+ }
+ else
{
- if (strcmp(attr->values[0].string.text, "none")
-#ifdef HAVE_LIBZ
- && strcmp(attr->values[0].string.text, "gzip")
-#endif /* HAVE_LIBZ */
- )
+ /*
+ * Got a job URI; parse it to get the job ID...
+ */
+
+ if (strncmp(resource, "/jobs/", 6))
{
- 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);
+ /*
+ * Not a valid URI!
+ */
+
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("Bad job-uri attribute \"%s\"!"),
+ uri->values[0].string.text);
return;
}
-#ifdef HAVE_LIBZ
- if (!strcmp(attr->values[0].string.text, "gzip"))
- compression = CUPS_FILE_GZIP;
-#endif /* HAVE_LIBZ */
- }
+ /*
+ * See if the job exists...
+ */
- /*
- * Do we have a file to print?
- */
+ jobid = atoi(resource + 6);
- if (!con->filename)
- {
- send_ipp_status(con, IPP_BAD_REQUEST, _("No file!?!"));
- return;
+ 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;
+ }
+ else
+ {
+ /*
+ * Job found, initialize source pointers...
+ */
+
+ src = NULL;
+ sprinter = NULL;
+ }
}
/*
- * Is it a format we support?
+ * Now move the job or jobs...
*/
- if ((format = ippFindAttribute(con->request, "document-format",
- IPP_TAG_MIMETYPE)) != NULL)
+ if (job)
{
/*
- * Grab format from client...
+ * See if the job has been completed...
*/
- if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]", super, type) != 2)
+ if (job->state_value > IPP_JOB_STOPPED)
{
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("Could not scan type \"%s\"!"),
- format->values[0].string.text);
+ /*
+ * Return a "not-possible" error...
+ */
+
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("Job #%d is finished and cannot be altered!"),
+ job->id);
return;
}
- }
- else
- {
+
/*
- * No document format attribute? Auto-type it!
+ * See if the job is owned by the requesting user...
*/
- strcpy(super, "application");
- strcpy(type, "octet-stream");
- }
+ if (!validate_user(job, con, job->username, username, sizeof(username)))
+ {
+ send_http_error(con, HTTP_UNAUTHORIZED);
+ return;
+ }
- if (!strcmp(super, "application") && !strcmp(type, "octet-stream"))
+ /*
+ * Move the job to a different printer or class...
+ */
+
+ cupsdMoveJob(job, dest);
+ }
+ else
{
/*
- * Auto-type the file...
+ * Got the source printer, now look through the jobs...
*/
- cupsdLogMessage(CUPSD_LOG_DEBUG, "print_job: auto-typing file...");
+ for (job = (cupsd_job_t *)cupsArrayFirst(Jobs);
+ job;
+ job = (cupsd_job_t *)cupsArrayNext(Jobs))
+ {
+ /*
+ * See if the job is pointing at the source printer or has not been
+ * completed...
+ */
- filetype = mimeFileType(MimeDatabase, con->filename, NULL, &compression);
+ if (strcasecmp(job->dest, src) ||
+ job->state_value > IPP_JOB_STOPPED)
+ continue;
- if (filetype)
- {
/*
- * Replace the document-format attribute value with the auto-typed one.
+ * See if the job can be moved by the requesting user...
*/
- snprintf(mimetype, sizeof(mimetype), "%s/%s", filetype->super,
- filetype->type);
+ if (!validate_user(job, con, job->username, username, sizeof(username)))
+ continue;
- if (format)
- {
- _cups_sp_free(format->values[0].string.text);
+ /*
+ * Move the job to a different printer or class...
+ */
- format->values[0].string.text = _cups_sp_alloc(mimetype);
- }
- else
- ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_MIMETYPE,
- "document-format", NULL, mimetype);
+ cupsdMoveJob(job, dest);
}
- else
- filetype = mimeType(MimeDatabase, super, type);
}
- else
- filetype = mimeType(MimeDatabase, super, type);
- 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?");
+ /*
+ * Start jobs if possible...
+ */
- if (format)
- ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_MIMETYPE,
- "document-format", NULL, format->values[0].string.text);
+ cupsdCheckJobs();
- return;
- }
+ /*
+ * Return with "everything is OK" status...
+ */
+
+ con->response->request.status.status_code = IPP_OK;
+}
+
+
+/*
+ * 'ppd_add_default()' - Add a PPD default choice.
+ */
+
+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 */
- 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...
+ * First check if the option already has a default value; the PPD spec
+ * says that the first one is used...
*/
- if (!strcasecmp(filetype->super, "application") &&
- !strcasecmp(filetype->type, "postscript"))
- read_ps_job_ticket(con);
+ for (i = 0, temp = *defaults; i < num_defaults; i ++)
+ if (!strcmp(option, temp[i].option))
+ return (num_defaults);
/*
- * Is the destination valid?
+ * Now add the option...
*/
- httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
- sizeof(method), username, sizeof(username), host,
- sizeof(host), &port, resource, sizeof(resource));
+ if (num_defaults == 0)
+ temp = malloc(sizeof(ppd_default_t));
+ else
+ temp = realloc(*defaults, (num_defaults + 1) * sizeof(ppd_default_t));
- if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
+ if (!temp)
{
- /*
- * Bad URI...
- */
-
- send_ipp_status(con, IPP_NOT_FOUND,
- _("The printer or class was not found."));
- return;
+ cupsdLogMessage(CUPSD_LOG_ERROR, "ppd_add_default: Unable to add default value for \"%s\" - %s",
+ option, strerror(errno));
+ return (num_defaults);
}
+ *defaults = temp;
+ temp += num_defaults;
+
+ strlcpy(temp->option, option, sizeof(temp->option));
+ strlcpy(temp->choice, choice, sizeof(temp->choice));
+
+ return (num_defaults + 1);
+}
+
+
+/*
+ * '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;
- }
+ for (line += 8, olen --; isalnum(*line & 255); line ++)
+ if (olen > 0)
+ {
+ *option++ = *line;
+ olen --;
+ }
+
+ *option = '\0';
/*
- * See if the printer is accepting jobs...
+ * Skip everything else up to the colon (:)...
*/
- if (!printer->accepting)
- {
- send_ipp_status(con, IPP_NOT_ACCEPTING,
- _("Destination \"%s\" is not accepting jobs."), dest);
- return;
- }
+ while (*line && *line != ':')
+ line ++;
+
+ if (!*line)
+ return (-1);
+
+ line ++;
/*
- * Make sure we aren't over our limit...
+ * Now grab the option choice, skipping leading whitespace...
*/
- if (cupsArrayCount(Jobs) >= MaxJobs && MaxJobs)
- cupsdCleanJobs();
+ while (isspace(*line & 255))
+ 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;
- }
+ for (clen --; isalnum(*line & 255); line ++)
+ if (clen > 0)
+ {
+ *choice++ = *line;
+ clen --;
+ }
- if (!check_quotas(con, printer))
- {
- send_ipp_status(con, IPP_NOT_POSSIBLE, _("Quota limit reached."));
- return;
- }
+ *choice = '\0';
/*
- * Create the job and set things up...
+ * Return with no errors...
*/
- 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);
+ return (0);
+}
- 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 ((job = cupsdAddJob(priority, printer->name)) == NULL)
- {
- send_ipp_status(con, IPP_INTERNAL_ERROR,
- _("Unable to add job for destination \"%s\"!"), dest);
- return;
- }
+/*
+ * 'print_job()' - Print a file to a printer or class.
+ */
- job->dtype = dtype;
- job->attrs = con->request;
- con->request = NULL;
+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 */
+ 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 */
+
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "print_job(%p[%d], %s)", con, con->http.fd,
+ uri->values[0].string.text);
/*
- * Copy the rest of the job info...
+ * Validate print file attributes, for now just document-format and
+ * compression (CUPS only supports "none" and "gzip")...
*/
- attr = ippFindAttribute(job->attrs, "requesting-user-name", IPP_TAG_NAME);
+ compression = CUPS_FILE_NONE;
- if (con->username[0])
+ if ((attr = ippFindAttribute(con->request, "compression",
+ IPP_TAG_KEYWORD)) != NULL)
{
- cupsdSetString(&job->username, con->username);
-
- if (attr)
- cupsdSetString(&attr->values[0].string.text, con->username);
+ 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;
+ }
- save_auth_info(con, job);
+#ifdef HAVE_LIBZ
+ if (!strcmp(attr->values[0].string.text, "gzip"))
+ compression = CUPS_FILE_GZIP;
+#endif /* HAVE_LIBZ */
}
- else if (attr)
- {
- 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");
+ /*
+ * Do we have a file to print?
+ */
- if (!attr)
- ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME,
- "job-originating-user-name", NULL, job->username);
- else
+ if (!con->filename)
{
- attr->group_tag = IPP_TAG_JOB;
- cupsdSetString(&attr->name, "job-originating-user-name");
+ send_ipp_status(con, IPP_BAD_REQUEST, _("No file!?!"));
+ return;
}
/*
- * Add remaining job attributes...
+ * Is it a format we support?
*/
- if ((attr = ippFindAttribute(job->attrs, "job-originating-host-name",
- IPP_TAG_ZERO)) != NULL)
+ if ((format = ippFindAttribute(con->request, "document-format",
+ IPP_TAG_MIMETYPE)) != NULL)
{
/*
- * Request contains a job-originating-host-name attribute; validate it...
+ * Grab format from client...
*/
- if (attr->value_tag != IPP_TAG_NAME ||
- attr->num_values != 1 ||
- strcmp(con->http.hostname, "localhost"))
+ if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]", super, type) != 2)
{
- /*
- * 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 ++)
- {
- _cups_sp_free(attr->values[i].string.text);
- attr->values[i].string.text = NULL;
- if (attr->values[i].string.charset)
- {
- _cups_sp_free(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 = _cups_sp_alloc(con->http.hostname);
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("Could not scan type \"%s\"!"),
+ format->values[0].string.text);
+ return;
}
-
- 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, "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;
-
- 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 ((attr = ippFindAttribute(job->attrs, "job-hold-until",
- IPP_TAG_KEYWORD)) == NULL)
- attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
- if (!attr)
- attr = ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_KEYWORD,
- "job-hold-until", NULL, "no-hold");
-
- if (attr && strcmp(attr->values[0].string.text, "no-hold") &&
- !(printer->type & CUPS_PRINTER_REMOTE))
{
/*
- * Hold job until specified time...
+ * No document format attribute? Auto-type it!
*/
- job->state->values[0].integer = IPP_JOB_HELD;
- cupsdSetJobHoldUntil(job, attr->values[0].string.text);
+ strcpy(super, "application");
+ strcpy(type, "octet-stream");
}
- if (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)) ||
- Classification)
+ if (!strcmp(super, "application") && !strcmp(type, "octet-stream"))
{
/*
- * Add job sheets options...
+ * Auto-type the file...
*/
- 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]);
+ ipp_attribute_t *doc_name; /* document-name attribute */
- attr = ippAddStrings(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME, "job-sheets",
- 2, NULL, NULL);
- attr->values[0].string.text = _cups_sp_alloc(printer->job_sheets[0]);
- attr->values[1].string.text = _cups_sp_alloc(printer->job_sheets[1]);
- }
- job->job_sheets = attr;
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "print_job: auto-typing file...");
- /*
- * Enforce classification level if set...
- */
+ 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 (Classification)
+ if (filetype)
{
- cupsdLogMessage(CUPSD_LOG_INFO,
- "Classification=\"%s\", ClassifyOverride=%d",
- Classification ? Classification : "(null)",
- ClassifyOverride);
+ /*
+ * Replace the document-format attribute value with the auto-typed one.
+ */
- if (ClassifyOverride)
+ snprintf(mimetype, sizeof(mimetype), "%s/%s", filetype->super,
+ filetype->type);
+
+ if (format)
{
- 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...
- */
+ _cupsStrFree(format->values[0].string.text);
- cupsdSetString(&attr->values[0].string.text, Classification);
+ format->values[0].string.text = _cupsStrAlloc(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);
- 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!
- */
+ 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?");
- cupsdSetString(&attr->values[1].string.text, attr->values[0].string.text);
+ if (format)
+ ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_MIMETYPE,
+ "document-format", NULL, format->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\", "
- "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...
- */
+ return;
+ }
- 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: request file type is %s/%s.",
+ filetype->super, filetype->type);
- if (attr->num_values > 1 &&
- strcmp(attr->values[1].string.text, "none"))
- cupsdSetString(&(attr->values[1].string.text), Classification);
- }
+ /*
+ * Read any embedded job ticket info from PS files...
+ */
- 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 (!strcasecmp(filetype->super, "application") &&
+ !strcasecmp(filetype->type, "postscript"))
+ read_ps_job_ticket(con);
- /*
- * Add the starting sheet...
- */
+ /*
+ * Create the job object...
+ */
- 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 ((job = add_job(con, uri, &printer)) == NULL)
+ return;
- kbytes = copy_banner(con, job, attr->values[0].string.text);
+ /*
+ * Update quota data...
+ */
+
+ if (stat(con->filename, &fileinfo))
+ kbytes = 0;
+ else
+ kbytes = (fileinfo.st_size + 1023) / 1024;
+
+ cupsdUpdateQuota(printer, job->username, 0, kbytes);
+
+ if ((attr = ippFindAttribute(job->attrs, "job-k-octets",
+ IPP_TAG_INTEGER)) != NULL)
+ attr->values[0].integer += kbytes;
- cupsdUpdateQuota(printer, job->username, 0, kbytes);
- }
- }
- else if ((attr = ippFindAttribute(job->attrs, "job-sheets",
- IPP_TAG_ZERO)) != NULL)
- job->sheets = attr;
-
/*
* Add the job file...
*/
cupsdUpdateQuota(printer, job->username, 0, kbytes);
}
- /*
- * 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->values[0].integer);
- 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;
-
/*
* Log and save the job...
*/
cupsdSaveJob(job);
- cupsdAddEvent(CUPSD_EVENT_JOB_CREATED, printer, job, "Job created.");
-
/*
* Start the job if possible...
*/
if (con->request->last == attr2)
con->request->last = prev2;
- _ipp_free_attr(attr2);
+ _ippFreeAttr(attr2);
}
/*
* 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);
return;
}
if (attr)
{
- _cups_sp_free(attr->values[0].string.text);
+ _cupsStrFree(attr->values[0].string.text);
attr->value_tag = IPP_TAG_KEYWORD;
- attr->values[0].string.text = _cups_sp_alloc("no-hold");
+ attr->values[0].string.text = _cupsStrAlloc("no-hold");
}
/*
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);
+ 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;
}
* 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);
return;
}
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);
return;
}
* Auto-type the file...
*/
+ ipp_attribute_t *doc_name; /* document-name attribute */
+
+
cupsdLogMessage(CUPSD_LOG_DEBUG, "send_document: auto-typing file...");
- filetype = mimeFileType(MimeDatabase, con->filename, NULL, &compression);
+ 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 (filetype)
{
if (format)
{
- _cups_sp_free(format->values[0].string.text);
- format->values[0].string.text = _cups_sp_alloc(mimetype);
+ _cupsStrFree(format->values[0].string.text);
+ format->values[0].string.text = _cupsStrAlloc(mimetype);
}
else
ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_MIMETYPE,
* Add the file to the job...
*/
+ cupsdLoadJob(job);
+
if (add_file(con, job, filetype, compression))
return;
cupsdUpdateQuota(printer, job->username, 0, kbytes);
}
- 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)
attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
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);
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_CANCELLED);
add_job_state_reasons(con, job);
con->response->request.status.status_code = IPP_OK;
* 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);
return;
}
* See what the user wants to change.
*/
+ cupsdLoadJob(job);
+
for (attr = con->request->attrs; attr; attr = attr->next)
{
if (attr->group_tag != IPP_TAG_JOB || !attr->name)
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."));
{
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 = attr->values[0].integer;
+ }
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."));
case IPP_JOB_CANCELLED :
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."));
if (JobHistory)
{
job->state->values[0].integer = attr->values[0].integer;
+ job->state_value = attr->values[0].integer;
cupsdSaveJob(job);
}
}
if (job->attrs->last == attr2)
job->attrs->last = job->attrs->prev;
- _ipp_free_attr(attr2);
+ _ippFreeAttr(attr2);
/*
* Then copy the attribute...
if (attr2 == job->attrs->last)
job->attrs->last = job->attrs->prev;
- _ipp_free_attr(attr2);
+ _ippFreeAttr(attr2);
}
}
else
}
+/*
+ * '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);
+ }
+ else if (!strcmp(attr->name, "document-format-default") ||
+ !strcmp(attr->name, "notify-lease-duration-default") ||
+ !strcmp(attr->name, "notify-notify-events-default"))
+ continue;
+
+ /*
+ * 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.
*/
/*
- * End of "$Id: ipp.c 5051 2006-02-02 16:13:16Z mike $".
+ * End of "$Id: ipp.c 5284 2006-03-13 13:34:24Z mike $".
*/
projects / thirdparty / cups.git / blobdiff