Backport changes for attribute substitution (Issue #5229)

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index ad8f1f0bf0597f7b5e10d8ce535c987c95b86143..b4f7910022dddc9d1693bf642212253850302b42 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -1,8 +1,8 @@
 /*
  * IPP routines for the CUPS scheduler.
  *
 /*
  * IPP routines for the CUPS scheduler.
  *

- * Copyright 2007-2016 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * Copyright © 2007-2018 by Apple Inc.
+ * Copyright © 1997-2007 by Easy Software Products, all rights reserved.

  *
  * This file contains Kerberos support code, copyright 2006 by
  * Jelmer Vernooij.
  *
  * This file contains Kerberos support code, copyright 2006 by
  * Jelmer Vernooij.


@@ -150,6 +150,7 @@ cupsdProcessIPPRequest(
   ipp_attribute_t      *uri = NULL;    /* Printer or job URI attribute */
   ipp_attribute_t      *username;      /* requesting-user-name attr */
   int                  sub_id;         /* Subscription ID */
   ipp_attribute_t      *uri = NULL;    /* Printer or job URI attribute */
   ipp_attribute_t      *username;      /* requesting-user-name attr */
   int                  sub_id;         /* Subscription ID */

+  int                  valid = 1;      /* Valid request? */

 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdProcessIPPRequest(%p[%d]): operation_id=%04x(%s)", con, con->number, con->request->request.op.operation_id, ippOpString(con->request->request.op.operation_id));
 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdProcessIPPRequest(%p[%d]): operation_id=%04x(%s)", con, con->number, con->request->request.op.operation_id, ippOpString(con->request->request.op.operation_id));


@@ -183,34 +184,23 @@ cupsdProcessIPPRequest(
 
   con->response = ippNew();
 
 
   con->response = ippNew();
 

-  con->response->request.status.version[0] =
-      con->request->request.op.version[0];
-  con->response->request.status.version[1] =
-      con->request->request.op.version[1];
-  con->response->request.status.request_id =
-      con->request->request.op.request_id;
+  con->response->request.status.version[0] = con->request->request.op.version[0];
+  con->response->request.status.version[1] = con->request->request.op.version[1];
+  con->response->request.status.request_id = con->request->request.op.request_id;

 
  /*
   * Then validate the request header and required attributes...
   */
 
 
  /*
   * Then validate the request header and required attributes...
   */
 

-  if (con->request->request.any.version[0] != 1 &&
-      con->request->request.any.version[0] != 2)
+  if (con->request->request.any.version[0] != 1 && con->request->request.any.version[0] != 2)

   {
    /*
     * Return an error, since we only support IPP 1.x and 2.x.
     */
 
   {
    /*
     * Return an error, since we only support IPP 1.x and 2.x.
     */
 

-    cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL,
-                  "%04X %s Bad request version number %d.%d",
-                 IPP_VERSION_NOT_SUPPORTED, con->http->hostname,
-                  con->request->request.any.version[0],
-                 con->request->request.any.version[1]);
+    cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL, "%04X %s Bad request version number %d.%d.", IPP_STATUS_ERROR_VERSION_NOT_SUPPORTED, con->http->hostname, con->request->request.any.version[0], con->request->request.any.version[1]);

 
 

-    send_ipp_status(con, IPP_VERSION_NOT_SUPPORTED,
-                    _("Bad request version number %d.%d."),
-                   con->request->request.any.version[0],
-                   con->request->request.any.version[1]);
+    send_ipp_status(con, IPP_STATUS_ERROR_VERSION_NOT_SUPPORTED, _("Bad request version number %d.%d."), con->request->request.any.version[0], con->request->request.any.version[1]);

   }
   else if (con->request->request.any.request_id < 1)
   {
   }
   else if (con->request->request.any.request_id < 1)
   {


@@ -218,21 +208,15 @@ cupsdProcessIPPRequest(
     * Return an error, since request IDs must be between 1 and 2^31-1
     */
 
     * Return an error, since request IDs must be between 1 and 2^31-1
     */
 

-    cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL,
-                  "%04X %s Bad request ID %d",
-                 IPP_BAD_REQUEST, con->http->hostname,
-                  con->request->request.any.request_id);
+    cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL, "%04X %s Bad request ID %d.", IPP_STATUS_ERROR_BAD_REQUEST, con->http->hostname, con->request->request.any.request_id);

 
 

-    send_ipp_status(con, IPP_BAD_REQUEST, _("Bad request ID %d."),
-                   con->request->request.any.request_id);
+    send_ipp_status(con, IPP_STATUS_ERROR_BAD_REQUEST, _("Bad request ID %d."), con->request->request.any.request_id);

   }
   else if (!con->request->attrs)
   {
   }
   else if (!con->request->attrs)
   {

-    cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL,
-                  "%04X %s No attributes in request",
-                 IPP_BAD_REQUEST, con->http->hostname);
+    cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL, "%04X %s No attributes in request.", IPP_STATUS_ERROR_BAD_REQUEST, con->http->hostname);

 
 

-    send_ipp_status(con, IPP_BAD_REQUEST, _("No attributes in request."));
+    send_ipp_status(con, IPP_STATUS_ERROR_BAD_REQUEST, _("No attributes in request."));

   }
   else
   {
   }
   else
   {


@@ -250,13 +234,9 @@ cupsdProcessIPPRequest(
        * Out of order; return an error...
        */
 
        * Out of order; return an error...
        */
 

-       cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL,
-                      "%04X %s Attribute groups are out of order",
-                     IPP_BAD_REQUEST, con->http->hostname);
+       cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL, "%04X %s Attribute groups are out of order", IPP_STATUS_ERROR_BAD_REQUEST, con->http->hostname);

 
 

-       send_ipp_status(con, IPP_BAD_REQUEST,
-                       _("Attribute groups are out of order (%x < %x)."),
-                       attr->group_tag, group);
+       send_ipp_status(con, IPP_STATUS_ERROR_BAD_REQUEST, _("Attribute groups are out of order (%x < %x)."), attr->group_tag, group);

        break;
       }
       else
        break;
       }
       else


@@ -273,9 +253,7 @@ cupsdProcessIPPRequest(
       */
 
       attr = con->request->attrs;
       */
 
       attr = con->request->attrs;

-      if (attr && attr->name &&
-          !strcmp(attr->name, "attributes-charset") &&
-         (attr->value_tag & IPP_TAG_MASK) == IPP_TAG_CHARSET)
+      if (attr && attr->name && !strcmp(attr->name, "attributes-charset") && (attr->value_tag & IPP_TAG_MASK) == IPP_TAG_CHARSET)

        charset = attr;
       else
        charset = NULL;
        charset = attr;
       else
        charset = NULL;


@@ -283,9 +261,7 @@ cupsdProcessIPPRequest(
       if (attr)
         attr = attr->next;
 
       if (attr)
         attr = attr->next;
 

-      if (attr && attr->name &&
-          !strcmp(attr->name, "attributes-natural-language") &&
-         (attr->value_tag & IPP_TAG_MASK) == IPP_TAG_LANGUAGE)
+      if (attr && attr->name && !strcmp(attr->name, "attributes-natural-language") && (attr->value_tag & IPP_TAG_MASK) == IPP_TAG_LANGUAGE)

       {
        language = attr;
 
       {
        language = attr;
 


@@ -303,11 +279,9 @@ cupsdProcessIPPRequest(
       else
        language = NULL;
 
       else
        language = NULL;
 

-      if ((attr = ippFindAttribute(con->request, "printer-uri",
-                                   IPP_TAG_URI)) != NULL)
+      if ((attr = ippFindAttribute(con->request, "printer-uri", IPP_TAG_URI)) != NULL)

        uri = attr;
        uri = attr;

-      else if ((attr = ippFindAttribute(con->request, "job-uri",
-                                        IPP_TAG_URI)) != NULL)
+      else if ((attr = ippFindAttribute(con->request, "job-uri", IPP_TAG_URI)) != NULL)

        uri = attr;
       else if (con->request->request.op.operation_id == CUPS_GET_PPD)
         uri = ippFindAttribute(con->request, "ppd-name", IPP_TAG_NAME);
        uri = attr;
       else if (con->request->request.op.operation_id == CUPS_GET_PPD)
         uri = ippFindAttribute(con->request, "ppd-name", IPP_TAG_NAME);


@@ -315,24 +289,16 @@ cupsdProcessIPPRequest(
        uri = NULL;
 
       if (charset)
        uri = NULL;
 
       if (charset)

-       ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-                    "attributes-charset", NULL,
-                    charset->values[0].string.text);
+       ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, charset->values[0].string.text);

       else
       else

-       ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-                    "attributes-charset", NULL, "utf-8");
+       ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, "utf-8");

 
       if (language)
 
       if (language)

-       ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-                     "attributes-natural-language", NULL,
-                    language->values[0].string.text);
+       ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, language->values[0].string.text);

       else
       else

-       ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-                     "attributes-natural-language", NULL, DefaultLanguage);
+       ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, DefaultLanguage);

 
 

-      if (charset &&
-          _cups_strcasecmp(charset->values[0].string.text, "us-ascii") &&
-          _cups_strcasecmp(charset->values[0].string.text, "utf-8"))
+      if (charset && _cups_strcasecmp(charset->values[0].string.text, "us-ascii") && _cups_strcasecmp(charset->values[0].string.text, "utf-8"))

       {
        /*
         * Bad character set...
       {
        /*
         * Bad character set...


@@ -340,13 +306,8 @@ cupsdProcessIPPRequest(
 
         cupsdLogMessage(CUPSD_LOG_ERROR, "Unsupported character set \"%s\"",
                        charset->values[0].string.text);
 
         cupsdLogMessage(CUPSD_LOG_ERROR, "Unsupported character set \"%s\"",
                        charset->values[0].string.text);

-       cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL,
-                     "%04X %s Unsupported attributes-charset value \"%s\"",
-                     IPP_CHARSET, con->http->hostname,
-                     charset->values[0].string.text);
-       send_ipp_status(con, IPP_BAD_REQUEST,
-                       _("Unsupported character set \"%s\"."),
-                       charset->values[0].string.text);
+       cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL, "%04X %s Unsupported attributes-charset value \"%s\".", IPP_STATUS_ERROR_CHARSET, con->http->hostname, charset->values[0].string.text);
+       send_ipp_status(con, IPP_STATUS_ERROR_CHARSET, _("Unsupported character set \"%s\"."), charset->values[0].string.text);

       }
       else if (!charset || !language ||
               (!uri &&
       }
       else if (!charset || !language ||
               (!uri &&


@@ -364,33 +325,24 @@ cupsdProcessIPPRequest(
 
         if (!charset)
        {
 
         if (!charset)
        {

-         cupsdLogMessage(CUPSD_LOG_ERROR,
-                         "Missing attributes-charset attribute");
+         cupsdLogMessage(CUPSD_LOG_ERROR, "Missing attributes-charset attribute.");

 
 

-         cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL,
-                       "%04X %s Missing attributes-charset attribute",
-                       IPP_BAD_REQUEST, con->http->hostname);
+         cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL, "%04X %s Missing attributes-charset attribute.", IPP_STATUS_ERROR_BAD_REQUEST, con->http->hostname);

         }
 
         if (!language)
        {
          cupsdLogMessage(CUPSD_LOG_ERROR,
         }
 
         if (!language)
        {
          cupsdLogMessage(CUPSD_LOG_ERROR,

-                         "Missing attributes-natural-language attribute");
+                         "Missing attributes-natural-language attribute.");

 
 

-         cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL,
-                       "%04X %s Missing attributes-natural-language attribute",
-                       IPP_BAD_REQUEST, con->http->hostname);
+         cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL, "%04X %s Missing attributes-natural-language attribute.", IPP_STATUS_ERROR_BAD_REQUEST, con->http->hostname);

         }
 
         if (!uri)
        {
         }
 
         if (!uri)
        {

-         cupsdLogMessage(CUPSD_LOG_ERROR,
-                         "Missing printer-uri, job-uri, or ppd-name "
-                         "attribute");
+         cupsdLogMessage(CUPSD_LOG_ERROR, "Missing printer-uri, job-uri, or ppd-name attribute.");

 
 

-         cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL,
-                       "%04X %s Missing printer-uri, job-uri, or ppd-name "
-                       "attribute", IPP_BAD_REQUEST, con->http->hostname);
+         cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL, "%04X %s Missing printer-uri, job-uri, or ppd-name attribute.", IPP_STATUS_ERROR_BAD_REQUEST, con->http->hostname);

         }
 
        cupsdLogMessage(CUPSD_LOG_DEBUG, "Request attributes follow...");
         }
 
        cupsdLogMessage(CUPSD_LOG_DEBUG, "Request attributes follow...");


@@ -409,20 +361,55 @@ cupsdProcessIPPRequest(
       else
       {
        /*
       else
       {
        /*

-       * OK, all the checks pass so far; make sure requesting-user-name is
-       * not "root" from a remote host...
+       * OK, all the checks pass so far; validate "requesting-user-name"
+       * attribute value...

        */
 
        */
 

-        if ((username = ippFindAttribute(con->request, "requesting-user-name",
-                                        IPP_TAG_NAME)) != NULL)
-       {
-        /*
-         * Check for root user...
-         */
-
-         if (!strcmp(username->values[0].string.text, "root") &&
-             _cups_strcasecmp(con->http->hostname, "localhost") &&
-             strcmp(con->username, "root"))
+        if ((username = ippFindAttribute(con->request, "requesting-user-name", IPP_TAG_ZERO)) != NULL)
+        {
+         /*
+          * Validate "requesting-user-name"...
+          */
+
+          if (username->group_tag != IPP_TAG_OPERATION && StrictConformance)
+          {
+           cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL, "%04X %s \"requesting-user-name\" attribute in wrong group.", IPP_STATUS_ERROR_BAD_REQUEST, con->http->hostname);
+           send_ipp_status(con, IPP_STATUS_ERROR_BAD_REQUEST, _("\"requesting-user-name\" attribute in wrong group."));
+           valid = 0;
+          }
+          else if (username->value_tag != IPP_TAG_NAME && username->value_tag != IPP_TAG_NAMELANG)
+          {
+           cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL, "%04X %s \"requesting-user-name\" attribute with wrong syntax.", IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES, con->http->hostname);
+           send_ipp_status(con, IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES, _("\"requesting-user-name\" attribute with wrong syntax."));
+           if ((attr = ippCopyAttribute(con->response, username, 0)) != NULL)
+             attr->group_tag = IPP_TAG_UNSUPPORTED_GROUP;
+           valid = 0;
+          }
+          else if (!ippValidateAttribute(username))
+          {
+           cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL, "%04X %s \"requesting-user-name\" attribute with bad value.", IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES, con->http->hostname);
+
+            if (StrictConformance)
+            {
+             /*
+              * Throw an error...
+              */
+
+             send_ipp_status(con, IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES, _("\"requesting-user-name\" attribute with wrong syntax."));
+              if ((attr = ippCopyAttribute(con->response, username, 0)) != NULL)
+                attr->group_tag = IPP_TAG_UNSUPPORTED_GROUP;
+             valid = 0;
+           }
+           else
+           {
+            /*
+             * Map bad "requesting-user-name" to 'anonymous'...
+             */
+
+              ippSetString(con->request, &username, 0, "anonymous");
+           }
+          }
+          else if (!strcmp(username->values[0].string.text, "root") && _cups_strcasecmp(con->http->hostname, "localhost") && strcmp(con->username, "root"))

          {
           /*
            * Remote unauthenticated user masquerading as local root...
          {
           /*
            * Remote unauthenticated user masquerading as local root...


@@ -432,215 +419,207 @@ cupsdProcessIPPRequest(
          }
        }
 
          }
        }
 

-        if ((attr = ippFindAttribute(con->request, "notify-subscription-id",
-                                    IPP_TAG_INTEGER)) != NULL)
+        if ((attr = ippFindAttribute(con->request, "notify-subscription-id", IPP_TAG_INTEGER)) != NULL)

          sub_id = attr->values[0].integer;
        else
          sub_id = 0;
 
          sub_id = attr->values[0].integer;
        else
          sub_id = 0;
 

-       /*
-        * Then try processing the operation...
-       */
-
-        if (uri)
-         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)
-       {
-         case IPP_OP_PRINT_JOB :
-              print_job(con, uri);
-              break;
-
-         case IPP_OP_VALIDATE_JOB :
-              validate_job(con, uri);
-              break;
-
-         case IPP_OP_CREATE_JOB :
-              create_job(con, uri);
-              break;
-
-         case IPP_OP_SEND_DOCUMENT :
-              send_document(con, uri);
-              break;
-
-         case IPP_OP_CANCEL_JOB :
-              cancel_job(con, uri);
-              break;
-
-         case IPP_OP_GET_JOB_ATTRIBUTES :
-              get_job_attrs(con, uri);
-              break;
-
-         case IPP_OP_GET_JOBS :
-              get_jobs(con, uri);
-              break;
-
-         case IPP_OP_GET_PRINTER_ATTRIBUTES :
-              get_printer_attrs(con, uri);
-              break;
-
-         case IPP_OP_GET_PRINTER_SUPPORTED_VALUES :
-              get_printer_supported(con, uri);
-              break;
-
-         case IPP_OP_HOLD_JOB :
-              hold_job(con, uri);
-              break;
-
-         case IPP_OP_RELEASE_JOB :
-              release_job(con, uri);
-              break;
-
-         case IPP_OP_RESTART_JOB :
-              restart_job(con, uri);
-              break;
-
-         case IPP_OP_PAUSE_PRINTER :
-              stop_printer(con, uri);
-             break;
-
-         case IPP_OP_RESUME_PRINTER :
-              start_printer(con, uri);
-             break;
-
-         case IPP_OP_PURGE_JOBS :
-         case IPP_OP_CANCEL_JOBS :
-         case IPP_OP_CANCEL_MY_JOBS :
-              cancel_all_jobs(con, uri);
-              break;
-
-         case IPP_OP_SET_JOB_ATTRIBUTES :
-              set_job_attrs(con, uri);
-              break;
-
-         case IPP_OP_SET_PRINTER_ATTRIBUTES :
-              set_printer_attrs(con, uri);
-              break;
-
-         case IPP_OP_HOLD_NEW_JOBS :
-              hold_new_jobs(con, uri);
-              break;
-
-         case IPP_OP_RELEASE_HELD_NEW_JOBS :
-              release_held_new_jobs(con, uri);
-              break;
-
-         case IPP_OP_CLOSE_JOB :
-              close_job(con, uri);
-              break;
-
-         case IPP_OP_CUPS_GET_DEFAULT :
-              get_default(con);
-              break;
-
-         case IPP_OP_CUPS_GET_PRINTERS :
-              get_printers(con, 0);
-              break;
-
-         case IPP_OP_CUPS_GET_CLASSES :
-              get_printers(con, CUPS_PRINTER_CLASS);
-              break;
-
-         case IPP_OP_CUPS_ADD_MODIFY_PRINTER :
-              add_printer(con, uri);
-              break;
-
-         case IPP_OP_CUPS_DELETE_PRINTER :
-              delete_printer(con, uri);
-              break;
-
-         case IPP_OP_CUPS_ADD_MODIFY_CLASS :
-              add_class(con, uri);
-              break;
-
-         case IPP_OP_CUPS_DELETE_CLASS :
-              delete_printer(con, uri);
-              break;
-
-         case IPP_OP_CUPS_ACCEPT_JOBS :
-         case IPP_OP_ENABLE_PRINTER :
-              accept_jobs(con, uri);
-              break;
+        if (valid)
+        {
+        /*
+         * Try processing the operation...
+         */

 
 

-         case IPP_OP_CUPS_REJECT_JOBS :
-         case IPP_OP_DISABLE_PRINTER :
-              reject_jobs(con, uri);
-              break;
+         if (uri)
+           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));

 
 

-         case IPP_OP_CUPS_SET_DEFAULT :
-              set_default(con, uri);
-              break;
+         switch (con->request->request.op.operation_id)
+         {
+           case IPP_OP_PRINT_JOB :
+               print_job(con, uri);
+               break;
+
+           case IPP_OP_VALIDATE_JOB :
+               validate_job(con, uri);
+               break;
+
+           case IPP_OP_CREATE_JOB :
+               create_job(con, uri);
+               break;
+
+           case IPP_OP_SEND_DOCUMENT :
+               send_document(con, uri);
+               break;
+
+           case IPP_OP_CANCEL_JOB :
+               cancel_job(con, uri);
+               break;
+
+           case IPP_OP_GET_JOB_ATTRIBUTES :
+               get_job_attrs(con, uri);
+               break;
+
+           case IPP_OP_GET_JOBS :
+               get_jobs(con, uri);
+               break;
+
+           case IPP_OP_GET_PRINTER_ATTRIBUTES :
+               get_printer_attrs(con, uri);
+               break;
+
+           case IPP_OP_GET_PRINTER_SUPPORTED_VALUES :
+               get_printer_supported(con, uri);
+               break;
+
+           case IPP_OP_HOLD_JOB :
+               hold_job(con, uri);
+               break;
+
+           case IPP_OP_RELEASE_JOB :
+               release_job(con, uri);
+               break;
+
+           case IPP_OP_RESTART_JOB :
+               restart_job(con, uri);
+               break;
+
+           case IPP_OP_PAUSE_PRINTER :
+               stop_printer(con, uri);
+               break;
+
+           case IPP_OP_RESUME_PRINTER :
+               start_printer(con, uri);
+               break;
+
+           case IPP_OP_PURGE_JOBS :
+           case IPP_OP_CANCEL_JOBS :
+           case IPP_OP_CANCEL_MY_JOBS :
+               cancel_all_jobs(con, uri);
+               break;
+
+           case IPP_OP_SET_JOB_ATTRIBUTES :
+               set_job_attrs(con, uri);
+               break;
+
+           case IPP_OP_SET_PRINTER_ATTRIBUTES :
+               set_printer_attrs(con, uri);
+               break;
+
+           case IPP_OP_HOLD_NEW_JOBS :
+               hold_new_jobs(con, uri);
+               break;
+
+           case IPP_OP_RELEASE_HELD_NEW_JOBS :
+               release_held_new_jobs(con, uri);
+               break;
+
+           case IPP_OP_CLOSE_JOB :
+               close_job(con, uri);
+               break;
+
+           case IPP_OP_CUPS_GET_DEFAULT :
+               get_default(con);
+               break;
+
+           case IPP_OP_CUPS_GET_PRINTERS :
+               get_printers(con, 0);
+               break;
+
+           case IPP_OP_CUPS_GET_CLASSES :
+               get_printers(con, CUPS_PRINTER_CLASS);
+               break;
+
+           case IPP_OP_CUPS_ADD_MODIFY_PRINTER :
+               add_printer(con, uri);
+               break;
+
+           case IPP_OP_CUPS_DELETE_PRINTER :
+               delete_printer(con, uri);
+               break;
+
+           case IPP_OP_CUPS_ADD_MODIFY_CLASS :
+               add_class(con, uri);
+               break;
+
+           case IPP_OP_CUPS_DELETE_CLASS :
+               delete_printer(con, uri);
+               break;
+
+           case IPP_OP_CUPS_ACCEPT_JOBS :
+           case IPP_OP_ENABLE_PRINTER :
+               accept_jobs(con, uri);
+               break;
+
+           case IPP_OP_CUPS_REJECT_JOBS :
+           case IPP_OP_DISABLE_PRINTER :
+               reject_jobs(con, uri);
+               break;

 
 

-         case IPP_OP_CUPS_GET_DEVICES :
-              get_devices(con);
-              break;
+           case IPP_OP_CUPS_SET_DEFAULT :
+               set_default(con, uri);
+               break;

 
 

-          case IPP_OP_CUPS_GET_DOCUMENT :
-             get_document(con, uri);
-             break;
+           case IPP_OP_CUPS_GET_DEVICES :
+               get_devices(con);
+               break;

 
 

-         case IPP_OP_CUPS_GET_PPD :
-              get_ppd(con, uri);
-              break;
+           case IPP_OP_CUPS_GET_DOCUMENT :
+               get_document(con, uri);
+               break;

 
 

-         case IPP_OP_CUPS_GET_PPDS :
-              get_ppds(con);
-              break;
+           case IPP_OP_CUPS_GET_PPD :
+               get_ppd(con, uri);
+               break;

 
 

-         case IPP_OP_CUPS_MOVE_JOB :
-              move_job(con, uri);
-              break;
+           case IPP_OP_CUPS_GET_PPDS :
+               get_ppds(con);
+               break;

 
 

-         case IPP_OP_CUPS_AUTHENTICATE_JOB :
-              authenticate_job(con, uri);
-              break;
+           case IPP_OP_CUPS_MOVE_JOB :
+               move_job(con, uri);
+               break;

 
 

-          case IPP_OP_CREATE_PRINTER_SUBSCRIPTIONS :
-         case IPP_OP_CREATE_JOB_SUBSCRIPTIONS :
-             create_subscriptions(con, uri);
-             break;
+           case IPP_OP_CUPS_AUTHENTICATE_JOB :
+               authenticate_job(con, uri);
+               break;

 
 

-          case IPP_OP_GET_SUBSCRIPTION_ATTRIBUTES :
-             get_subscription_attrs(con, sub_id);
-             break;
+           case IPP_OP_CREATE_PRINTER_SUBSCRIPTIONS :
+           case IPP_OP_CREATE_JOB_SUBSCRIPTIONS :
+               create_subscriptions(con, uri);
+               break;
+
+           case IPP_OP_GET_SUBSCRIPTION_ATTRIBUTES :
+               get_subscription_attrs(con, sub_id);
+               break;
+
+           case IPP_OP_GET_SUBSCRIPTIONS :
+               get_subscriptions(con, uri);
+               break;

 
 

-         case IPP_OP_GET_SUBSCRIPTIONS :
-             get_subscriptions(con, uri);
-             break;
+           case IPP_OP_RENEW_SUBSCRIPTION :
+               renew_subscription(con, sub_id);
+               break;

 
 

-         case IPP_OP_RENEW_SUBSCRIPTION :
-             renew_subscription(con, sub_id);
-             break;
+           case IPP_OP_CANCEL_SUBSCRIPTION :
+               cancel_subscription(con, sub_id);
+               break;

 
 

-         case IPP_OP_CANCEL_SUBSCRIPTION :
-             cancel_subscription(con, sub_id);
-             break;
+           case IPP_OP_GET_NOTIFICATIONS :
+               get_notifications(con);
+               break;

 
 

-          case IPP_OP_GET_NOTIFICATIONS :
-             get_notifications(con);
-             break;
+           case IPP_OP_CUPS_CREATE_LOCAL_PRINTER :
+               create_local_printer(con);
+               break;

 
 

-         case IPP_OP_CUPS_CREATE_LOCAL_PRINTER :
-             create_local_printer(con);
-             break;
+           default :
+               cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL, "%04X %s Operation %04X (%s) not supported.", IPP_STATUS_ERROR_OPERATION_NOT_SUPPORTED, con->http->hostname, con->request->request.op.operation_id, ippOpString(con->request->request.op.operation_id));

 
 

-         default :
-             cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL,
-                           "%04X %s Operation %04X (%s) not supported",
-                           IPP_OPERATION_NOT_SUPPORTED, con->http->hostname,
-                           con->request->request.op.operation_id,
-                           ippOpString(con->request->request.op.operation_id));
-
-              send_ipp_status(con, IPP_OPERATION_NOT_SUPPORTED,
-                             _("%s not supported."),
-                             ippOpString(
-                                 con->request->request.op.operation_id));
-             break;
+               send_ipp_status(con, IPP_STATUS_ERROR_OPERATION_NOT_SUPPORTED, _("%s not supported."), ippOpString(con->request->request.op.operation_id));
+               break;
+         }

        }
       }
     }
        }
       }
     }


@@ -652,16 +631,7 @@ cupsdProcessIPPRequest(
     * Sending data from the scheduler...
     */
 
     * Sending data from the scheduler...
     */
 

-    cupsdLogMessage(con->response->request.status.status_code
-                        >= IPP_BAD_REQUEST &&
-                    con->response->request.status.status_code
-                       != IPP_NOT_FOUND ? CUPSD_LOG_ERROR : CUPSD_LOG_DEBUG,
-                    "[Client %d] Returning IPP %s for %s (%s) from %s",
-                   con->number,
-                   ippErrorString(con->response->request.status.status_code),
-                   ippOpString(con->request->request.op.operation_id),
-                   uri ? uri->values[0].string.text : "no URI",
-                   con->http->hostname);
+    cupsdLogClient(con, con->response->request.status.status_code >= IPP_STATUS_ERROR_BAD_REQUEST && con->response->request.status.status_code != IPP_STATUS_ERROR_NOT_FOUND ? CUPSD_LOG_ERROR : CUPSD_LOG_DEBUG, "Returning IPP %s for %s (%s) from %s.",  ippErrorString(con->response->request.status.status_code), ippOpString(con->request->request.op.operation_id), uri ? uri->values[0].string.text : "no URI", con->http->hostname);

 
     httpClearFields(con->http);
 
 
     httpClearFields(con->http);
 


@@ -676,10 +646,7 @@ cupsdProcessIPPRequest(
 
     if (con->http->version == HTTP_1_1)
     {
 
     if (con->http->version == HTTP_1_1)
     {

-      cupsdLogMessage(CUPSD_LOG_DEBUG,
-                     "[Client %d] Transfer-Encoding: chunked",
-                     con->number);
-
+      cupsdLogClient(con, CUPSD_LOG_DEBUG, "Transfer-Encoding: chunked");

       cupsdSetLength(con->http, 0);
     }
     else
       cupsdSetLength(con->http, 0);
     }
     else


@@ -698,9 +665,7 @@ cupsdProcessIPPRequest(
          length += (size_t)fileinfo.st_size;
       }
 
          length += (size_t)fileinfo.st_size;
       }
 

-      cupsdLogMessage(CUPSD_LOG_DEBUG,
-                     "[Client %d] Content-Length: " CUPS_LLFMT,
-                     con->number, CUPS_LLCAST length);
+      cupsdLogClient(con, CUPSD_LOG_DEBUG, "Content-Length: " CUPS_LLFMT, CUPS_LLCAST length);

       httpSetLength(con->http, length);
     }
 
       httpSetLength(con->http, length);
     }
 


@@ -710,8 +675,7 @@ cupsdProcessIPPRequest(
       * Tell the caller the response header was sent successfully...
       */
 
       * Tell the caller the response header was sent successfully...
       */
 

-      cupsdAddSelect(httpGetFd(con->http), (cupsd_selfunc_t)cupsdReadClient,
-                    (cupsd_selfunc_t)cupsdWriteClient, con);
+      cupsdAddSelect(httpGetFd(con->http), (cupsd_selfunc_t)cupsdReadClient, (cupsd_selfunc_t)cupsdWriteClient, con);

 
       return (1);
     }
 
       return (1);
     }


@@ -1586,27 +1550,34 @@ add_job(cupsd_client_t  *con,           /* I - Client connection */
                     _("Bad job-name value: Wrong type or count."));
     if ((attr = ippCopyAttribute(con->response, attr, 0)) != NULL)
       attr->group_tag = IPP_TAG_UNSUPPORTED_GROUP;
                     _("Bad job-name value: Wrong type or count."));
     if ((attr = ippCopyAttribute(con->response, attr, 0)) != NULL)
       attr->group_tag = IPP_TAG_UNSUPPORTED_GROUP;

-    return (NULL);
+
+    if (StrictConformance)
+      return (NULL);
+
+    /* Don't use invalid attribute */
+    ippDeleteAttribute(con->request, attr);
+
+    ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL, "Untitled");

   }
   else if (!ippValidateAttribute(attr))
   {
     send_ipp_status(con, IPP_ATTRIBUTES, _("Bad job-name value: %s"),
                     cupsLastErrorString());
   }
   else if (!ippValidateAttribute(attr))
   {
     send_ipp_status(con, IPP_ATTRIBUTES, _("Bad job-name value: %s"),
                     cupsLastErrorString());

+

     if ((attr = ippCopyAttribute(con->response, attr, 0)) != NULL)
       attr->group_tag = IPP_TAG_UNSUPPORTED_GROUP;
     if ((attr = ippCopyAttribute(con->response, attr, 0)) != NULL)
       attr->group_tag = IPP_TAG_UNSUPPORTED_GROUP;

-    return (NULL);
-  }

 
 

-  attr = ippFindAttribute(con->request, "requesting-user-name", IPP_TAG_NAME);
+    if (StrictConformance)
+      return (NULL);

 
 

-  if (attr && !ippValidateAttribute(attr))
-  {
-    send_ipp_status(con, IPP_ATTRIBUTES, _("Bad requesting-user-name value: %s"), cupsLastErrorString());
-    if ((attr = ippCopyAttribute(con->response, attr, 0)) != NULL)
-      attr->group_tag = IPP_TAG_UNSUPPORTED_GROUP;
-    return (NULL);
+    /* Don't use invalid attribute */
+    ippDeleteAttribute(con->request, attr);
+
+    ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL, "Untitled");

   }
 
   }
 

+  attr = ippFindAttribute(con->request, "requesting-user-name", IPP_TAG_NAME);
+

   if ((job = cupsdAddJob(priority, printer->name)) == NULL)
   {
     send_ipp_status(con, IPP_INTERNAL_ERROR,
   if ((job = cupsdAddJob(priority, printer->name)) == NULL)
   {
     send_ipp_status(con, IPP_INTERNAL_ERROR,


@@ -5317,6 +5288,7 @@ create_local_bg_thread(
   ipp_t                *request,               /* Request to printer */
                *response;              /* Response from printer */
   ipp_attribute_t *attr;               /* Attribute in response */
   ipp_t                *request,               /* Request to printer */
                *response;              /* Response from printer */
   ipp_attribute_t *attr;               /* Attribute in response */

+  ipp_status_t status;                 /* Status code */

 
 
  /*
 
 
  /*


@@ -5349,12 +5321,35 @@ create_local_bg_thread(
   cupsdLogMessage(CUPSD_LOG_DEBUG, "%s: Connected to %s:%d, sending Get-Printer-Attributes request...", printer->name, host, port);
 
   request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);
   cupsdLogMessage(CUPSD_LOG_DEBUG, "%s: Connected to %s:%d, sending Get-Printer-Attributes request...", printer->name, host, port);
 
   request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);

+  ippSetVersion(request, 2, 0);

   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, printer->device_uri);
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", NULL, "all");
 
   response = cupsDoRequest(http, request, resource);
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, printer->device_uri);
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", NULL, "all");
 
   response = cupsDoRequest(http, request, resource);

+  status   = cupsLastError();
+
+  cupsdLogMessage(CUPSD_LOG_DEBUG, "%s: Get-Printer-Attributes returned %s (%s)", printer->name, ippErrorString(cupsLastError()), cupsLastErrorString());
+
+  if (status == IPP_STATUS_ERROR_BAD_REQUEST || status == IPP_STATUS_ERROR_VERSION_NOT_SUPPORTED)
+  {
+   /*
+    * Try request using IPP/1.1, in case we are talking to an old CUPS server or
+    * printer...
+    */

 
 

-  cupsdLogMessage(CUPSD_LOG_DEBUG, "%s: Get-Printer-Attributes returned %s", printer->name, ippErrorString(cupsLastError()));
+    ippDelete(response);
+
+    cupsdLogMessage(CUPSD_LOG_DEBUG, "%s: Re-sending Get-Printer-Attributes request using IPP/1.1...", printer->name);
+
+    request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);
+    ippSetVersion(request, 1, 1);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, printer->device_uri);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", NULL, "all");
+
+    response = cupsDoRequest(http, request, resource);
+
+    cupsdLogMessage(CUPSD_LOG_DEBUG, "%s: IPP/1.1 Get-Printer-Attributes returned %s (%s)", printer->name, ippErrorString(cupsLastError()), cupsLastErrorString());
+  }

 
   // TODO: Grab printer icon file...
   httpClose(http);
 
   // TODO: Grab printer icon file...
   httpClose(http);