| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "net/cert/single_request_cert_verifier.h" | 5 #include "net/cert/single_request_cert_verifier.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "net/base/net_errors.h" | 9 #include "net/base/net_errors.h" |
| 10 #include "net/cert/x509_certificate.h" | 10 #include "net/cert/x509_certificate.h" |
| 11 | 11 |
| 12 namespace net { | 12 namespace net { |
| 13 | 13 |
| 14 SingleRequestCertVerifier::SingleRequestCertVerifier( | 14 SingleRequestCertVerifier::SingleRequestCertVerifier( |
| 15 CertVerifier* cert_verifier) | 15 CertVerifier* cert_verifier) |
| 16 : cert_verifier_(cert_verifier), | 16 : cert_verifier_(cert_verifier), |
| 17 cur_request_(NULL) { | 17 cur_request_(NULL) { |
| 18 DCHECK(cert_verifier_ != NULL); | 18 DCHECK(cert_verifier_ != NULL); |
| 19 } | 19 } |
| 20 | 20 |
| 21 SingleRequestCertVerifier::~SingleRequestCertVerifier() { | 21 SingleRequestCertVerifier::~SingleRequestCertVerifier() { |
| 22 if (cur_request_) { | 22 if (cur_request_) { |
| 23 cert_verifier_->CancelRequest(cur_request_); | 23 cert_verifier_->CancelRequest(cur_request_); |
| 24 cur_request_ = NULL; | 24 cur_request_ = NULL; |
| 25 } | 25 } |
| 26 } | 26 } |
| 27 | 27 |
| 28 int SingleRequestCertVerifier::Verify(X509Certificate* cert, | 28 int SingleRequestCertVerifier::Verify(X509Certificate* cert, |
| 29 const std::string& hostname, | 29 const std::string& hostname, |
| 30 const std::string& ocsp_response, |
| 30 int flags, | 31 int flags, |
| 31 CRLSet* crl_set, | 32 CRLSet* crl_set, |
| 32 CertVerifyResult* verify_result, | 33 CertVerifyResult* verify_result, |
| 33 const CompletionCallback& callback, | 34 const CompletionCallback& callback, |
| 34 const BoundNetLog& net_log) { | 35 const BoundNetLog& net_log) { |
| 35 // Should not be already in use. | 36 // Should not be already in use. |
| 36 DCHECK(!cur_request_ && cur_request_callback_.is_null()); | 37 DCHECK(!cur_request_ && cur_request_callback_.is_null()); |
| 37 | 38 |
| 38 CertVerifier::RequestHandle request = NULL; | 39 CertVerifier::RequestHandle request = NULL; |
| 39 | 40 |
| 40 // We need to be notified of completion before |callback| is called, so that | 41 // We need to be notified of completion before |callback| is called, so that |
| 41 // we can clear out |cur_request_*|. | 42 // we can clear out |cur_request_*|. |
| 42 int rv = cert_verifier_->Verify( | 43 int rv = cert_verifier_->Verify( |
| 43 cert, hostname, flags, crl_set, verify_result, | 44 cert, hostname, ocsp_response, flags, crl_set, verify_result, |
| 44 base::Bind(&SingleRequestCertVerifier::OnVerifyCompletion, | 45 base::Bind(&SingleRequestCertVerifier::OnVerifyCompletion, |
| 45 base::Unretained(this)), | 46 base::Unretained(this)), |
| 46 &request, net_log); | 47 &request, net_log); |
| 47 | 48 |
| 48 if (rv == ERR_IO_PENDING) { | 49 if (rv == ERR_IO_PENDING) { |
| 49 // Cleared in OnVerifyCompletion(). | 50 // Cleared in OnVerifyCompletion(). |
| 50 cur_request_ = request; | 51 cur_request_ = request; |
| 51 cur_request_callback_ = callback; | 52 cur_request_callback_ = callback; |
| 52 } | 53 } |
| 53 | 54 |
| 54 return rv; | 55 return rv; |
| 55 } | 56 } |
| 56 | 57 |
| 57 void SingleRequestCertVerifier::OnVerifyCompletion(int result) { | 58 void SingleRequestCertVerifier::OnVerifyCompletion(int result) { |
| 58 DCHECK(cur_request_ && !cur_request_callback_.is_null()); | 59 DCHECK(cur_request_ && !cur_request_callback_.is_null()); |
| 59 | 60 |
| 60 CompletionCallback callback = cur_request_callback_; | 61 CompletionCallback callback = cur_request_callback_; |
| 61 | 62 |
| 62 // Clear the outstanding request information. | 63 // Clear the outstanding request information. |
| 63 cur_request_ = NULL; | 64 cur_request_ = NULL; |
| 64 cur_request_callback_.Reset(); | 65 cur_request_callback_.Reset(); |
| 65 | 66 |
| 66 // Call the user's original callback. | 67 // Call the user's original callback. |
| 67 callback.Run(result); | 68 callback.Run(result); |
| 68 } | 69 } |
| 69 | 70 |
| 70 } // namespace net | 71 } // namespace net |
| OLD | NEW |