Add a method to query IPP printers for attributes.

printing/backend/cups_jobs.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "printing/backend/cups_jobs.h"
 
 #include <cups/ipp.h>
 
 #include <array>
 #include <map>
 #include <memory>
 
 #include "base/logging.h"
+#include "base/stl_util.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
+#include "base/threading/thread_restrictions.h"
+#include "printing/backend/cups_deleters.h"
 
 namespace printing {
 namespace {
 
 using PReason = PrinterStatus::PrinterReason::Reason;
 using PSeverity = PrinterStatus::PrinterReason::Severity;
 
 // printer attributes
 const char kPrinterUri[] = "printer-uri";
 const char kPrinterState[] = "printer-state";
 const char kPrinterStateReasons[] = "printer-state-reasons";
 const char kPrinterStateMessage[] = "printer-state-message";
 
+const char kPrinterMakeAndModel[] = "printer-make-and-model";
+const char kIppVersionsSupported[] = "ipp-versions-supported";
+const char kIppFeaturesSupported[] = "ipp-features-supported";
+const char kDocumentFormatSupported[] = "document-format-supported";
+
 // job attributes
 const char kJobUri[] = "job-uri";
 const char kJobId[] = "job-id";
 const char kJobState[] = "job-state";
 const char kJobStateReasons[] = "job-state-reasons";
 const char kJobStateMessage[] = "job-state-message";
 const char kJobImpressionsCompleted[] = "job-impressions-completed";
 const char kTimeAtProcessing[] = "time-at-processing";
 
 // request parameters
 const char kRequestedAttributes[] = "requested-attributes";
 const char kWhichJobs[] = "which-jobs";
 const char kLimit[] = "limit";
 
 // request values
 const char kCompleted[] = "completed";
 const char kNotCompleted[] = "not-completed";
 
+// ipp features
+const char kIppEverywhere[] = "ipp-everywhere";
+
 // printer state severities
 const char kSeverityReport[] = "report";
 const char kSeverityWarn[] = "warning";
 const char kSeverityError[] = "error";
 
 // printer state reason values
 const char kNone[] = "none";
 const char kMediaNeeded[] = "media-needed";
 const char kMediaJam[] = "media-jam";
 const char kMovingToPaused[] = "moving-to-paused";
@@ skipping 24 matching lines @@
 const char kOpcNearEol[] = "opc-near-eol";
 const char kOpcLifeOver[] = "opc-life-over";
 const char kDeveloperLow[] = "developer-low";
 const char kDeveloperEmpty[] = "developer-empty";
 const char kInterpreterResourceUnavailable[] =
     "interpreter-resource-unavailable";
 
 constexpr std::array<const char* const, 3> kPrinterAttributes{
     {kPrinterState, kPrinterStateReasons, kPrinterStateMessage}};
 
-std::unique_ptr<ipp_t, void (*)(ipp_t*)> WrapIpp(ipp_t* ipp) {
-  return std::unique_ptr<ipp_t, void (*)(ipp_t*)>(ipp, &ippDelete);
+constexpr std::array<const char* const, 4> kPrinterInfo{
+    {kPrinterMakeAndModel, kIppVersionsSupported, kIppFeaturesSupported,
+     kDocumentFormatSupported}};
+
+using IppPtr = std::unique_ptr<ipp_t, void (*)(ipp_t*)>;

[Lei Zhang, 2017/05/31 00:48:03]

How about ScopedIppPtr here and ScopedHttpPtr below, to make it clearer what
type of smart pointers they are?

[skau, 2017/05/31 18:37:51]

Done.

+
+IppPtr WrapIpp(ipp_t* ipp) {
+  return IppPtr(ipp, &ippDelete);
 }
 
+using HttpPtr = std::unique_ptr<http_t, HttpDeleter>;
+
 // Converts an IPP attribute |attr| to the appropriate JobState enum.
 CupsJob::JobState ToJobState(ipp_attribute_t* attr) {
   DCHECK_EQ(IPP_TAG_ENUM, ippGetValueTag(attr));
   int state = ippGetInteger(attr, 0);
   switch (state) {
     case IPP_JOB_ABORTED:
       return CupsJob::ABORTED;
     case IPP_JOB_CANCELLED:
       return CupsJob::CANCELED;
     case IPP_JOB_COMPLETED:
@@ skipping 169 matching lines @@
     ParseField(attr, attribute_name, current_job);
   }
 }
 
 // Returns the uri for printer with |id| as served by CUPS.  Assumes that |id|
 // is a valid CUPS printer name and performs no error checking or escaping.
 std::string PrinterUriFromName(const std::string& id) {
   return base::StringPrintf("ipp://localhost/printers/%s", id.c_str());
 }
 
+// Parses the |version| string into a <major, minor> pair.  Returns false if
+// parsing failed.  |major_minor| is only modified if parsing was successful.
+bool ToVersionNumber(const std::string& version,

[Lei Zhang, 2017/05/31 00:48:03]

Do you want to use base::Version and not bother doing your own parsing?

[skau, 2017/05/31 18:37:51]

I didn't see that.  Thanks!

+                     std::pair<int, int>* major_minor) {
+  std::vector<base::StringPiece> pieces = SplitStringPiece(
+      version, ".", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
+  int major;
+  int minor;
+  if (pieces.size() != 2U || !base::StringToInt(pieces[0], &major) ||
+      !base::StringToInt(pieces[1], &minor)) {
+    return false;
+  }
+
+  major_minor->first = major;
+  major_minor->second = minor;
+  return true;
+}
+
+// Extracts PrinterInfo fields from |response| and populates |printer_info|.
+// Returns true if at least printer-make-and-model and ipp-versions-supported
+// were read.
+bool ParsePrinterInfo(ipp_t* response, PrinterInfo* printer_info) {
+  for (ipp_attribute_t* attr = ippFirstAttribute(response); attr != nullptr;
+       attr = ippNextAttribute(response)) {
+    base::StringPiece name = ippGetName(attr);
+
+    if (name == base::StringPiece(kPrinterMakeAndModel)) {
+      DCHECK_EQ(IPP_TAG_TEXT, ippGetValueTag(attr));
+      printer_info->make_and_model = ippGetString(attr, 0, nullptr);
+    } else if (name == base::StringPiece(kIppVersionsSupported)) {
+      std::vector<std::string> ipp_versions;
+      ParseCollection(attr, &ipp_versions);
+      for (const std::string& version : ipp_versions) {
+        std::pair<int, int> major_minor;
+        if (ToVersionNumber(version, &major_minor)) {
+          printer_info->ipp_versions.push_back(major_minor);
+        }
+      }
+    } else if (name == base::StringPiece(kIppFeaturesSupported)) {
+      std::vector<std::string> features;
+      ParseCollection(attr, &features);
+      printer_info->ipp_everywhere =
+          base::ContainsValue(features, kIppEverywhere);
+    } else if (name == base::StringPiece(kDocumentFormatSupported)) {
+      ParseCollection(attr, &printer_info->document_formats);
+    }
+  }
+
+  return !printer_info->make_and_model.empty() &&
+         !printer_info->ipp_versions.empty();
+}
+
 }  // namespace
 
 CupsJob::CupsJob() = default;
 
 CupsJob::CupsJob(const CupsJob& other) = default;
 
 CupsJob::~CupsJob() = default;
 
 PrinterStatus::PrinterStatus() = default;
 
 PrinterStatus::PrinterStatus(const PrinterStatus& other) = default;
 
 PrinterStatus::~PrinterStatus() = default;
 
+PrinterInfo::PrinterInfo() = default;
+
+PrinterInfo::~PrinterInfo() = default;
+
 void ParseJobsResponse(ipp_t* response,
                        const std::string& printer_id,
                        std::vector<CupsJob>* jobs) {
   // Advance the position in the response to the jobs section.
   ipp_attribute_t* attr = ippFirstAttribute(response);
   while (attr != nullptr && ippGetGroupTag(attr) != IPP_TAG_JOB) {
     attr = ippNextAttribute(response);
   }
 
   if (attr != nullptr) {
     ParseJobs(response, printer_id, attr, jobs);
   }
 }
 
+IppPtr GetPrinterAttributes(http_t* http,
+                            const std::string& printer_uri,
+                            int num_attributes,
+                            const char* const* attributes,
+                            ipp_status_t* status) {
+  DCHECK(http);
+  base::ThreadRestrictions::AssertIOAllowed();

[Lei Zhang, 2017/05/31 00:48:03]

Check this first. Ditto on line 480.

If you look at base::ThreadRestrictions::AssertIOAllowed() usage elsewhere, we
usually check what thread we are on first, before doing any other checks. Same
for DCHECK_CURRENTLY_ON() in chrome/ as another set of examples.

[skau, 2017/05/31 18:37:51]

Done.

+
+  auto request = WrapIpp(ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES));
+
+  ippAddString(request.get(), IPP_TAG_OPERATION, IPP_TAG_URI, kPrinterUri,
+               nullptr, printer_uri.data());
+
+  ippAddStrings(request.get(), IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+                kRequestedAttributes, num_attributes, nullptr, attributes);
+
+  auto response =
+      WrapIpp(cupsDoRequest(http, request.release(), printer_uri.c_str()));
+  *status = ippGetStatusCode(response.get());
+
+  return response;
+}
+
 void ParsePrinterStatus(ipp_t* response, PrinterStatus* printer_status) {
   for (ipp_attribute_t* attr = ippFirstAttribute(response); attr != nullptr;
        attr = ippNextAttribute(response)) {
     base::StringPiece name = ippGetName(attr);
     if (name.empty()) {
       continue;
     }
 
     if (name == kPrinterState) {
       DCHECK_EQ(IPP_TAG_ENUM, ippGetValueTag(attr));
       printer_status->state = static_cast<ipp_pstate_t>(ippGetInteger(attr, 0));
     } else if (name == kPrinterStateReasons) {
       std::vector<std::string> reason_strings;
       ParseCollection(attr, &reason_strings);
       for (const std::string& reason : reason_strings) {
         printer_status->reasons.push_back(ToPrinterReason(reason));
       }
     } else if (name == kPrinterStateMessage) {
       printer_status->message = ippGetString(attr, 0, nullptr);
     }
   }
 }
 
+bool GetPrinterInfo(const std::string& address,
+                    const int port,
+                    const std::string& resource,
+                    PrinterInfo* printer_info) {
+  base::ThreadRestrictions::AssertIOAllowed();
+
+  HttpPtr http =
+      HttpPtr(httpConnect2(address.data(), port, nullptr, AF_INET,
+                           HTTP_ENCRYPTION_IF_REQUESTED, 0, 200, nullptr));
+  if (!http)
+    return false;
+
+  ipp_status_t status;
+  auto response = GetPrinterAttributes(
+      http.get(), resource, kPrinterInfo.size(), kPrinterInfo.data(), &status);
+  return status == IPP_STATUS_OK &&
+         ParsePrinterInfo(response.get(), printer_info);
+}
+
 bool GetPrinterStatus(http_t* http,
                       const std::string& printer_id,
                       PrinterStatus* printer_status) {
-  DCHECK(http);
+  base::ThreadRestrictions::AssertIOAllowed();
 
-  auto request = WrapIpp(ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES));
-
+  ipp_status_t status;
   const std::string printer_uri = PrinterUriFromName(printer_id);
-  ippAddString(request.get(), IPP_TAG_OPERATION, IPP_TAG_URI, kPrinterUri,
-               nullptr, printer_uri.data());
-
-  ippAddStrings(request.get(), IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-                kRequestedAttributes, kPrinterAttributes.size(), nullptr,
-                kPrinterAttributes.data());
 
   auto response =

[Lei Zhang, 2017/05/31 00:48:03]

Can we put the actual type here, since it's not immediately clear what
GetPrinterAttributes() returns? Ditto above on line 448.

[skau, 2017/05/31 18:37:51]

Done.

-      WrapIpp(cupsDoRequest(http, request.release(), printer_uri.c_str()));
+      GetPrinterAttributes(http, printer_uri, kPrinterAttributes.size(),
+                           kPrinterAttributes.data(), &status);
 
-  if (ippGetStatusCode(response.get()) != IPP_STATUS_OK)
+  if (status != IPP_STATUS_OK)
     return false;
 
   ParsePrinterStatus(response.get(), printer_status);
 
   return true;
 }
 
 bool GetCupsJobs(http_t* http,
                  const std::string& printer_id,
                  int limit,
                  JobCompletionState which,
                  std::vector<CupsJob>* jobs) {
   DCHECK(http);
+  base::ThreadRestrictions::AssertIOAllowed();
 
   auto request = WrapIpp(ippNewRequest(IPP_OP_GET_JOBS));
   const std::string printer_uri = PrinterUriFromName(printer_id);
   ippAddString(request.get(), IPP_TAG_OPERATION, IPP_TAG_URI, kPrinterUri,
                nullptr, printer_uri.data());
   ippAddInteger(request.get(), IPP_TAG_OPERATION, IPP_TAG_INTEGER, kLimit,
                 limit);
 
   std::vector<const char*> job_attributes = {
       kJobUri,          kJobId,           kJobState,
@@ skipping 22 matching lines @@
     LOG(WARNING) << "IPP Error: " << cupsLastErrorString();
     return false;
   }
 
   ParseJobsResponse(response.get(), printer_id, jobs);
 
   return true;
 }
 
 }  // namespace printing