Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Side by Side Diff: chromeos/printing/ppd_provider.cc

Issue 2814633002: Add CupsFilter extraction from resolved ppds for printing. (Closed)
Patch Set: Address skau@ comments Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chromeos/printing/ppd_provider.h ('k') | chromeos/printing/ppd_provider_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromeos/printing/ppd_provider.h" 5 #include "chromeos/printing/ppd_provider.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <deque> 8 #include <deque>
9 #include <set>
9 #include <unordered_map> 10 #include <unordered_map>
10 #include <utility> 11 #include <utility>
11 #include <vector> 12 #include <vector>
12 13
13 #include "base/base64.h" 14 #include "base/base64.h"
14 #include "base/bind_helpers.h" 15 #include "base/bind_helpers.h"
15 #include "base/files/file.h" 16 #include "base/files/file.h"
16 #include "base/files/file_util.h" 17 #include "base/files/file_util.h"
17 #include "base/json/json_parser.h" 18 #include "base/json/json_parser.h"
18 #include "base/memory/ptr_util.h" 19 #include "base/memory/ptr_util.h"
19 #include "base/strings/string_number_conversions.h" 20 #include "base/strings/string_number_conversions.h"
20 #include "base/strings/string_split.h" 21 #include "base/strings/string_split.h"
22 #include "base/strings/string_tokenizer.h"
21 #include "base/strings/string_util.h" 23 #include "base/strings/string_util.h"
22 #include "base/strings/stringprintf.h" 24 #include "base/strings/stringprintf.h"
23 #include "base/synchronization/lock.h" 25 #include "base/synchronization/lock.h"
24 #include "base/task_runner_util.h" 26 #include "base/task_runner_util.h"
25 #include "base/threading/sequenced_task_runner_handle.h" 27 #include "base/threading/sequenced_task_runner_handle.h"
26 #include "base/threading/thread_restrictions.h" 28 #include "base/threading/thread_restrictions.h"
27 #include "base/time/time.h" 29 #include "base/time/time.h"
28 #include "base/values.h" 30 #include "base/values.h"
29 #include "chromeos/printing/ppd_cache.h" 31 #include "chromeos/printing/ppd_cache.h"
30 #include "chromeos/printing/printing_constants.h" 32 #include "chromeos/printing/printing_constants.h"
31 #include "net/base/load_flags.h" 33 #include "net/base/load_flags.h"
32 #include "net/http/http_status_code.h" 34 #include "net/http/http_status_code.h"
33 #include "net/url_request/url_fetcher.h" 35 #include "net/url_request/url_fetcher.h"
34 #include "net/url_request/url_fetcher_delegate.h" 36 #include "net/url_request/url_fetcher_delegate.h"
35 #include "net/url_request/url_request_context_getter.h" 37 #include "net/url_request/url_request_context_getter.h"
36 #include "url/gurl.h" 38 #include "url/gurl.h"
37 39
38 namespace chromeos { 40 namespace chromeos {
39 namespace printing { 41 namespace printing {
40 namespace { 42 namespace {
41 43
44 // Extract cupsFilter/cupsFilter2 filter names from the contents
45 // of a ppd, pre-split into lines.
46
47 // cupsFilter2 lines look like this:
48 //
49 // *cupsFilter2: "application/vnd.cups-raster application/vnd.foo 100
50 // rastertofoo"
51 //
52 // cupsFilter lines look like this:
53 //
54 // *cupsFilter: "application/vnd.cups-raster 100 rastertofoo"
55 //
56 // |field_name| is the starting token we look for (*cupsFilter: or
57 // *cupsFilter2:).
58 //
59 // |num_value_tokens| is the number of tokens we expect to find in the
60 // value string. The filter is always the last of these.
61 //
62 // This function looks at each line in ppd_lines for lines of this format, and,
63 // for each one found, adds the name of the filter (rastertofoo in the examples
64 // above) to the returned set.
65 //
66 // This would be simpler with re2, but re2 is not an allowed dependency in
67 // this part of the tree.
68 std::set<std::string> ExtractCupsFilters(
69 const std::vector<std::string>& ppd_lines,
70 const std::string& field_name,
71 int num_value_tokens) {
72 std::set<std::string> ret;
73 std::string delims(" \n\t\r\"");
74
75 for (const std::string& line : ppd_lines) {
76 base::StringTokenizer line_tok(line, delims);
77
78 if (!line_tok.GetNext()) {
79 continue;
80 }
81 if (line_tok.token_piece() != field_name) {
82 continue;
83 }
84
85 // Skip to the last of the value tokens.
86 for (int i = 0; i < num_value_tokens; ++i) {
87 if (!line_tok.GetNext()) {
88 // Continue the outer loop.
89 goto next_line;
90 }
91 }
92
93 if (line_tok.token_piece() != "") {
94 ret.insert(line_tok.token_piece().as_string());
95 }
96 next_line : {} // Lint requires {} instead of ; for an empty statement.
97 }
98 return ret;
99 }
100
101 // The ppd spec explicitly disallows quotes inside quoted strings, and provides
102 // no way for including escaped quotes in a quoted string. It also requires
103 // that the string be a single line, and that everything in these fields be
104 // 7-bit ASCII. The CUPS spec on these particular fields is not particularly
105 // rigorous, but specifies no way of including escaped spaces in the tokens
106 // themselves, and the cups *code* just parses out these lines with a sscanf
107 // call that uses spaces as delimiters.
108 //
109 // Furthermore, cups (post 1.5) discards all cupsFilter lines if *any*
110 // cupsFilter2 lines exist.
111 //
112 // All of this is a long way of saying the regular-expression based parsing
113 // done here is, to the best of my knowledge, actually conformant to the specs
114 // that exist, and not just a hack.
115 std::vector<std::string> ExtractFiltersFromPpd(
116 const std::string& ppd_contents) {
117 std::vector<std::string> lines = base::SplitString(
118 ppd_contents, "\n\r", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
119 std::set<std::string> filters = ExtractCupsFilters(lines, "*cupsFilter2:", 4);
120 if (filters.empty()) {
121 // No cupsFilter2 lines found, fall back to looking for cupsFilter lines.
122 filters = ExtractCupsFilters(lines, "*cupsFilter:", 3);
123 }
124 return std::vector<std::string>(filters.begin(), filters.end());
125 }
126
42 // Returns false if there are obvious errors in the reference that will prevent 127 // Returns false if there are obvious errors in the reference that will prevent
43 // resolution. 128 // resolution.
44 bool PpdReferenceIsWellFormed(const Printer::PpdReference& reference) { 129 bool PpdReferenceIsWellFormed(const Printer::PpdReference& reference) {
45 int filled_fields = 0; 130 int filled_fields = 0;
46 if (!reference.user_supplied_ppd_url.empty()) { 131 if (!reference.user_supplied_ppd_url.empty()) {
47 ++filled_fields; 132 ++filled_fields;
48 GURL tmp_url(reference.user_supplied_ppd_url); 133 GURL tmp_url(reference.user_supplied_ppd_url);
49 if (!tmp_url.is_valid() || !tmp_url.SchemeIs("file")) { 134 if (!tmp_url.is_valid() || !tmp_url.SchemeIs("file")) {
50 LOG(ERROR) << "Invalid url for a user-supplied ppd: " 135 LOG(ERROR) << "Invalid url for a user-supplied ppd: "
51 << reference.user_supplied_ppd_url 136 << reference.user_supplied_ppd_url
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 auto it = cached_ppd_index_->find(next.first.effective_make_and_model); 281 auto it = cached_ppd_index_->find(next.first.effective_make_and_model);
197 if (it != cached_ppd_index_->end()) { 282 if (it != cached_ppd_index_->end()) {
198 StartFetch(GetPpdURL(it->second), FT_PPD); 283 StartFetch(GetPpdURL(it->second), FT_PPD);
199 return; 284 return;
200 } 285 }
201 // This ppd reference isn't in the index. That's not good. Fail 286 // This ppd reference isn't in the index. That's not good. Fail
202 // out the current resolution and go try to start the next 287 // out the current resolution and go try to start the next
203 // thing if there is one. 288 // thing if there is one.
204 LOG(ERROR) << "PPD " << next.first.effective_make_and_model 289 LOG(ERROR) << "PPD " << next.first.effective_make_and_model
205 << " not found in server index"; 290 << " not found in server index";
206 base::SequencedTaskRunnerHandle::Get()->PostTask( 291 FinishPpdResolution(next.second, PpdProvider::INTERNAL_ERROR,
207 FROM_HERE, 292 std::string());
208 base::Bind(next.second, PpdProvider::INTERNAL_ERROR, std::string()));
209 ppd_resolution_queue_.pop_front(); 293 ppd_resolution_queue_.pop_front();
210 } 294 }
211 } 295 }
212 296
213 void ResolvePrinters(const std::string& manufacturer, 297 void ResolvePrinters(const std::string& manufacturer,
214 const ResolvePrintersCallback& cb) override { 298 const ResolvePrintersCallback& cb) override {
215 std::unordered_map<std::string, ManufacturerMetadata>::iterator it; 299 std::unordered_map<std::string, ManufacturerMetadata>::iterator it;
216 if (cached_metadata_.get() == nullptr || 300 if (cached_metadata_.get() == nullptr ||
217 (it = cached_metadata_->find(manufacturer)) == 301 (it = cached_metadata_->find(manufacturer)) ==
218 cached_metadata_->end()) { 302 cached_metadata_->end()) {
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 *reference = Printer::PpdReference(); 350 *reference = Printer::PpdReference();
267 reference->effective_make_and_model = it2->second; 351 reference->effective_make_and_model = it2->second;
268 return true; 352 return true;
269 } 353 }
270 354
271 void ResolvePpd(const Printer::PpdReference& reference, 355 void ResolvePpd(const Printer::PpdReference& reference,
272 const ResolvePpdCallback& cb) override { 356 const ResolvePpdCallback& cb) override {
273 // Do a sanity check here, so we can assumed |reference| is well-formed in 357 // Do a sanity check here, so we can assumed |reference| is well-formed in
274 // the rest of this class. 358 // the rest of this class.
275 if (!PpdReferenceIsWellFormed(reference)) { 359 if (!PpdReferenceIsWellFormed(reference)) {
276 base::SequencedTaskRunnerHandle::Get()->PostTask( 360 FinishPpdResolution(cb, PpdProvider::INTERNAL_ERROR, std::string());
277 FROM_HERE, base::Bind(cb, PpdProvider::INTERNAL_ERROR, ""));
278 return; 361 return;
279 } 362 }
280 // First step, check the cache. If the cache lookup fails, we'll (try to) 363 // First step, check the cache. If the cache lookup fails, we'll (try to)
281 // consult the server. 364 // consult the server.
282 ppd_cache_->Find(PpdReferenceToCacheKey(reference), 365 ppd_cache_->Find(PpdReferenceToCacheKey(reference),
283 base::Bind(&PpdProviderImpl::ResolvePpdCacheLookupDone, 366 base::Bind(&PpdProviderImpl::ResolvePpdCacheLookupDone,
284 weak_factory_.GetWeakPtr(), reference, cb)); 367 weak_factory_.GetWeakPtr(), reference, cb));
285 } 368 }
286 369
287 // Our only sources of long running ops are cache fetches and network fetches. 370 // Our only sources of long running ops are cache fetches and network fetches.
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 // Fetch the file pointed at by url and store it in |file_fetch_contents_|. 465 // Fetch the file pointed at by url and store it in |file_fetch_contents_|.
383 // Use |file_fetch_success_| to indicate success or failure. 466 // Use |file_fetch_success_| to indicate success or failure.
384 void FetchFile(const GURL& url) { 467 void FetchFile(const GURL& url) {
385 CHECK(url.is_valid()); 468 CHECK(url.is_valid());
386 CHECK(url.SchemeIs("file")); 469 CHECK(url.SchemeIs("file"));
387 base::ThreadRestrictions::AssertIOAllowed(); 470 base::ThreadRestrictions::AssertIOAllowed();
388 file_fetch_success_ = base::ReadFileToString(base::FilePath(url.path()), 471 file_fetch_success_ = base::ReadFileToString(base::FilePath(url.path()),
389 &file_fetch_contents_); 472 &file_fetch_contents_);
390 } 473 }
391 474
475 void FinishPpdResolution(const ResolvePpdCallback& cb,
476 PpdProvider::CallbackResultCode result_code,
477 const std::string& ppd_contents) {
478 if (result_code == PpdProvider::SUCCESS) {
479 base::SequencedTaskRunnerHandle::Get()->PostTask(
480 FROM_HERE, base::Bind(cb, PpdProvider::SUCCESS, ppd_contents,
481 ExtractFiltersFromPpd(ppd_contents)));
482 } else {
483 // Just post the failure.
484 base::SequencedTaskRunnerHandle::Get()->PostTask(
485 FROM_HERE, base::Bind(cb, result_code, std::string(),
486 std::vector<std::string>()));
487 }
488 }
489
392 // Callback when the cache lookup for a ppd request finishes. If we hit in 490 // Callback when the cache lookup for a ppd request finishes. If we hit in
393 // the cache, satisfy the resolution, otherwise kick it over to the fetcher 491 // the cache, satisfy the resolution, otherwise kick it over to the fetcher
394 // queue to be grabbed from a server. 492 // queue to be grabbed from a server.
395 void ResolvePpdCacheLookupDone(const Printer::PpdReference& reference, 493 void ResolvePpdCacheLookupDone(const Printer::PpdReference& reference,
396 const ResolvePpdCallback& cb, 494 const ResolvePpdCallback& cb,
397 const PpdCache::FindResult& result) { 495 const PpdCache::FindResult& result) {
398 if (result.success) { 496 if (result.success) {
399 // Cache hit. 497 // Cache hit.
400 base::SequencedTaskRunnerHandle::Get()->PostTask( 498 FinishPpdResolution(cb, PpdProvider::SUCCESS, result.contents);
401 FROM_HERE, base::Bind(cb, PpdProvider::SUCCESS, result.contents));
402 } else { 499 } else {
403 // Cache miss. Queue it to be satisfied by the fetcher queue. 500 // Cache miss. Queue it to be satisfied by the fetcher queue.
404 ppd_resolution_queue_.push_back({reference, cb}); 501 ppd_resolution_queue_.push_back({reference, cb});
405 MaybeStartFetch(); 502 MaybeStartFetch();
406 } 503 }
407 } 504 }
408 505
409 // Handler for the completion of the locales fetch. This response should be a 506 // Handler for the completion of the locales fetch. This response should be a
410 // list of strings, each of which is a locale in which we can answer queries 507 // list of strings, each of which is a locale in which we can answer queries
411 // on the server. The server (should) guarantee that we get 'en' as an 508 // on the server. The server (should) guarantee that we get 'en' as an
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 } 649 }
553 } 650 }
554 } 651 }
555 652
556 // This is called when |fetcher_| should have just downloaded a ppd. If we 653 // This is called when |fetcher_| should have just downloaded a ppd. If we
557 // downloaded something successfully, use it to satisfy the front of the ppd 654 // downloaded something successfully, use it to satisfy the front of the ppd
558 // resolution queue, otherwise fail out that resolution. 655 // resolution queue, otherwise fail out that resolution.
559 void OnPpdFetchComplete() { 656 void OnPpdFetchComplete() {
560 DCHECK(!ppd_resolution_queue_.empty()); 657 DCHECK(!ppd_resolution_queue_.empty());
561 std::string contents; 658 std::string contents;
659
562 if ((ValidateAndGetResponseAsString(&contents) != PpdProvider::SUCCESS) || 660 if ((ValidateAndGetResponseAsString(&contents) != PpdProvider::SUCCESS) ||
563 contents.size() > kMaxPpdSizeBytes) { 661 contents.size() > kMaxPpdSizeBytes) {
564 base::SequencedTaskRunnerHandle::Get()->PostTask( 662 FinishPpdResolution(ppd_resolution_queue_.front().second,
565 FROM_HERE, base::Bind(ppd_resolution_queue_.front().second, 663 PpdProvider::SERVER_ERROR, std::string());
566 PpdProvider::SERVER_ERROR, std::string()));
567 } else { 664 } else {
568 ppd_cache_->Store( 665 ppd_cache_->Store(
569 PpdReferenceToCacheKey(ppd_resolution_queue_.front().first), contents, 666 PpdReferenceToCacheKey(ppd_resolution_queue_.front().first), contents,
570
571 base::Callback<void()>()); 667 base::Callback<void()>());
572 base::SequencedTaskRunnerHandle::Get()->PostTask( 668 FinishPpdResolution(ppd_resolution_queue_.front().second,
573 FROM_HERE, base::Bind(ppd_resolution_queue_.front().second, 669 PpdProvider::SUCCESS, contents);
574 PpdProvider::SUCCESS, contents));
575 } 670 }
576 ppd_resolution_queue_.pop_front(); 671 ppd_resolution_queue_.pop_front();
577 } 672 }
578 673
579 // Called when |fetcher_| should have just downloaded a usb device map 674 // Called when |fetcher_| should have just downloaded a usb device map
580 // for the vendor at the head of the |usb_resolution_queue_|. 675 // for the vendor at the head of the |usb_resolution_queue_|.
581 void OnUsbFetchComplete() { 676 void OnUsbFetchComplete() {
582 DCHECK(!usb_resolution_queue_.empty()); 677 DCHECK(!usb_resolution_queue_.empty());
583 std::string contents; 678 std::string contents;
584 std::string buffer; 679 std::string buffer;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 // the necessary index data from the server. Note we leave any user-based ppd 741 // the necessary index data from the server. Note we leave any user-based ppd
647 // resolutions intact, as they don't depend on the data we're missing. 742 // resolutions intact, as they don't depend on the data we're missing.
648 void FailQueuedServerPpdResolutions(PpdProvider::CallbackResultCode code) { 743 void FailQueuedServerPpdResolutions(PpdProvider::CallbackResultCode code) {
649 std::deque<std::pair<Printer::PpdReference, ResolvePpdCallback>> 744 std::deque<std::pair<Printer::PpdReference, ResolvePpdCallback>>
650 filtered_queue; 745 filtered_queue;
651 746
652 for (const auto& entry : ppd_resolution_queue_) { 747 for (const auto& entry : ppd_resolution_queue_) {
653 if (!entry.first.user_supplied_ppd_url.empty()) { 748 if (!entry.first.user_supplied_ppd_url.empty()) {
654 filtered_queue.push_back(entry); 749 filtered_queue.push_back(entry);
655 } else { 750 } else {
656 base::SequencedTaskRunnerHandle::Get()->PostTask( 751 FinishPpdResolution(entry.second, code, std::string());
657 FROM_HERE, base::Bind(entry.second, code, std::string()));
658 } 752 }
659 } 753 }
660 ppd_resolution_queue_ = std::move(filtered_queue); 754 ppd_resolution_queue_ = std::move(filtered_queue);
661 } 755 }
662 756
663 // Given a list of possible locale strings (e.g. 'en-GB'), determine which of 757 // Given a list of possible locale strings (e.g. 'en-GB'), determine which of
664 // them we should use to best serve results for the browser locale (which was 758 // them we should use to best serve results for the browser locale (which was
665 // given to us at construction time). 759 // given to us at construction time).
666 std::string GetBestLocale(const std::vector<std::string>& available_locales) { 760 std::string GetBestLocale(const std::vector<std::string>& available_locales) {
667 // First look for an exact match. If we find one, just use that. 761 // First look for an exact match. If we find one, just use that.
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
908 scoped_refptr<net::URLRequestContextGetter> url_context_getter, 1002 scoped_refptr<net::URLRequestContextGetter> url_context_getter,
909 scoped_refptr<PpdCache> ppd_cache, 1003 scoped_refptr<PpdCache> ppd_cache,
910 scoped_refptr<base::SequencedTaskRunner> disk_task_runner, 1004 scoped_refptr<base::SequencedTaskRunner> disk_task_runner,
911 const PpdProvider::Options& options) { 1005 const PpdProvider::Options& options) {
912 return scoped_refptr<PpdProvider>( 1006 return scoped_refptr<PpdProvider>(
913 new PpdProviderImpl(browser_locale, url_context_getter, ppd_cache, 1007 new PpdProviderImpl(browser_locale, url_context_getter, ppd_cache,
914 disk_task_runner, options)); 1008 disk_task_runner, options));
915 } 1009 }
916 } // namespace printing 1010 } // namespace printing
917 } // namespace chromeos 1011 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/printing/ppd_provider.h ('k') | chromeos/printing/ppd_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698