Index: components/certificate_transparency/log_proof_fetcher_unittest.cc |
diff --git a/components/certificate_transparency/log_proof_fetcher_unittest.cc b/components/certificate_transparency/log_proof_fetcher_unittest.cc |
index f6caa3beb98bfd091dff8a772d4e987fe5a60abf..b901cba6d6721e7d072dd94a61a7b802bd8f53e4 100644 |
--- a/components/certificate_transparency/log_proof_fetcher_unittest.cc |
+++ b/components/certificate_transparency/log_proof_fetcher_unittest.cc |
@@ -6,6 +6,7 @@ |
#include <string> |
+#include "base/format_macros.h" |
#include "base/strings/stringprintf.h" |
#include "components/safe_json/testing_json_parser.h" |
#include "net/base/net_errors.h" |
@@ -25,11 +26,11 @@ namespace certificate_transparency { |
namespace { |
-const char kGetSTHHeaders[] = |
+const char kGetResponseHeaders[] = |
"HTTP/1.1 200 OK\n" |
"Content-Type: application/json; charset=ISO-8859-1\n"; |
-const char kGetSTHNotFoundHeaders[] = |
+const char kGetResponseNotFoundHeaders[] = |
"HTTP/1.1 404 Not Found\n" |
"Content-Type: text/html; charset=iso-8859-1\n"; |
@@ -38,23 +39,30 @@ const char kLogHost[] = "ct.log.example.com"; |
const char kLogPathPrefix[] = "somelog"; |
const char kLogID[] = "some_id"; |
-class FetchSTHTestJob : public net::URLRequestTestJob { |
+// Node returned will be chr(node_id) * 32. |
+std::string GetDummyConsistencyProofNode(size_t node_id) { |
+ return std::string(32, static_cast<char>(node_id)); |
+} |
+ |
+const size_t kDummyConsistencyProofLength = 4; |
+ |
+class LogFetchTestJob : public net::URLRequestTestJob { |
public: |
- FetchSTHTestJob(const std::string& get_sth_data, |
- const std::string& get_sth_headers, |
+ LogFetchTestJob(const std::string& get_log_data, |
+ const std::string& get_log_headers, |
net::URLRequest* request, |
net::NetworkDelegate* network_delegate) |
: URLRequestTestJob(request, |
network_delegate, |
- get_sth_headers, |
- get_sth_data, |
+ get_log_headers, |
+ get_log_data, |
true), |
async_io_(false) {} |
void set_async_io(bool async_io) { async_io_ = async_io; } |
private: |
- ~FetchSTHTestJob() override {} |
+ ~LogFetchTestJob() override {} |
bool NextReadAsync() override { |
// Response with indication of async IO only once, otherwise the final |
@@ -73,26 +81,26 @@ class FetchSTHTestJob : public net::URLRequestTestJob { |
bool async_io_; |
- DISALLOW_COPY_AND_ASSIGN(FetchSTHTestJob); |
+ DISALLOW_COPY_AND_ASSIGN(LogFetchTestJob); |
}; |
-class GetSTHResponseHandler : public net::URLRequestInterceptor { |
+class LogGetResponseHandler : public net::URLRequestInterceptor { |
public: |
- GetSTHResponseHandler() |
+ LogGetResponseHandler() |
: async_io_(false), |
- response_body_(""), |
response_headers_( |
- std::string(kGetSTHHeaders, arraysize(kGetSTHHeaders))) {} |
- ~GetSTHResponseHandler() override {} |
+ std::string(kGetResponseHeaders, arraysize(kGetResponseHeaders))), |
+ expected_old_tree_size_(0), |
+ expected_new_tree_size_(0) {} |
+ ~LogGetResponseHandler() override {} |
// URLRequestInterceptor implementation: |
net::URLRequestJob* MaybeInterceptRequest( |
net::URLRequest* request, |
net::NetworkDelegate* network_delegate) const override { |
- std::string expected_url = base::StringPrintf( |
- "%s://%s/%s/ct/v1/get-sth", kLogSchema, kLogHost, kLogPathPrefix); |
- EXPECT_EQ(GURL(expected_url), request->url()); |
- FetchSTHTestJob* job = new FetchSTHTestJob( |
+ EXPECT_EQ(expected_url_, request->url()); |
+ |
+ LogFetchTestJob* job = new LogFetchTestJob( |
response_body_, response_headers_, request, network_delegate); |
job->set_async_io(async_io_); |
return job; |
@@ -106,52 +114,71 @@ class GetSTHResponseHandler : public net::URLRequestInterceptor { |
response_headers_ = response_headers; |
} |
+ void set_expect_get_consistency_proof(size_t expected_old_tree_size, |
+ size_t expected_new_tree_size) { |
+ expected_old_tree_size_ = expected_old_tree_size; |
+ expected_new_tree_size_ = expected_new_tree_size; |
+ } |
+ |
void set_async_io(bool async_io) { async_io_ = async_io; } |
+ void set_expected_url(const GURL& url) { expected_url_ = url; } |
+ |
private: |
bool async_io_; |
std::string response_body_; |
std::string response_headers_; |
- DISALLOW_COPY_AND_ASSIGN(GetSTHResponseHandler); |
+ size_t expected_old_tree_size_; |
+ size_t expected_new_tree_size_; |
+ |
+ // Stored for test body to assert on |
+ GURL expected_url_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(LogGetResponseHandler); |
+}; |
+ |
+enum InterceptedRequestType { |
mmenke
2015/11/25 17:40:29
RequestType -> ResultType? I don't think a failur
Eran Messeri
2015/11/26 22:07:13
Done.
|
+ NOTHING, |
+ FAILURE, |
+ STH_FETCH, |
+ CONSISTENCY_PROOF_FETCH |
}; |
class RecordFetchCallbackInvocations { |
public: |
RecordFetchCallbackInvocations(bool expect_success) |
: expect_success_(expect_success), |
- invoked_(false), |
net_error_(net::OK), |
- http_response_code_(-1) {} |
+ http_response_code_(-1), |
+ request_type_(NOTHING) {} |
void STHFetched(const std::string& log_id, |
const net::ct::SignedTreeHead& sth) { |
ASSERT_TRUE(expect_success_); |
- ASSERT_FALSE(invoked_); |
- invoked_ = true; |
- // If expected to succeed, expecting the known_good STH. |
- net::ct::SignedTreeHead expected_sth; |
- net::ct::GetSampleSignedTreeHead(&expected_sth); |
+ ASSERT_EQ(NOTHING, request_type_); |
+ request_type_ = STH_FETCH; |
+ sth_ = sth; |
+ log_id_ = log_id; |
+ } |
- EXPECT_EQ(kLogID, log_id); |
- EXPECT_EQ(expected_sth.version, sth.version); |
- EXPECT_EQ(expected_sth.timestamp, sth.timestamp); |
- EXPECT_EQ(expected_sth.tree_size, sth.tree_size); |
- EXPECT_STREQ(expected_sth.sha256_root_hash, sth.sha256_root_hash); |
- EXPECT_EQ(expected_sth.signature.hash_algorithm, |
- sth.signature.hash_algorithm); |
- EXPECT_EQ(expected_sth.signature.signature_algorithm, |
- sth.signature.signature_algorithm); |
- EXPECT_EQ(expected_sth.signature.signature_data, |
- sth.signature.signature_data); |
+ void ConsistencyProofFetched( |
+ const std::string& log_id, |
+ const std::vector<std::string>& consistency_proof) { |
+ ASSERT_TRUE(expect_success_); |
+ ASSERT_EQ(NOTHING, request_type_); |
+ request_type_ = CONSISTENCY_PROOF_FETCH; |
+ consistency_proof_.assign(consistency_proof.begin(), |
+ consistency_proof.end()); |
+ log_id_ = log_id; |
} |
void FetchingFailed(const std::string& log_id, |
int net_error, |
int http_response_code) { |
ASSERT_FALSE(expect_success_); |
- ASSERT_FALSE(invoked_); |
- invoked_ = true; |
+ ASSERT_EQ(NOTHING, request_type_); |
+ request_type_ = FAILURE; |
net_error_ = net_error; |
http_response_code_ = http_response_code; |
if (net_error_ == net::OK) { |
@@ -159,17 +186,28 @@ class RecordFetchCallbackInvocations { |
} |
} |
- bool invoked() const { return invoked_; } |
+ InterceptedRequestType intercepted_request_type() { return request_type_; } |
mmenke
2015/11/25 17:40:29
intercepted_request_type() const
Eran Messeri
2015/11/26 22:07:13
Done.
|
int net_error() const { return net_error_; } |
int http_response_code() const { return http_response_code_; } |
+ const net::ct::SignedTreeHead& intercepted_sth() { return sth_; } |
mmenke
2015/11/25 17:40:29
const
Eran Messeri
2015/11/26 22:07:13
Done.
|
+ |
+ const std::string& intercepted_log_id() { return log_id_; } |
mmenke
2015/11/25 17:40:29
const
Eran Messeri
2015/11/26 22:07:13
Done.
|
+ |
+ const std::vector<std::string>& intercepted_proof() { |
mmenke
2015/11/25 17:40:29
const
Eran Messeri
2015/11/26 22:07:13
Done.
|
+ return consistency_proof_; |
+ } |
+ |
private: |
const bool expect_success_; |
- bool invoked_; |
int net_error_; |
int http_response_code_; |
+ InterceptedRequestType request_type_; |
+ net::ct::SignedTreeHead sth_; |
+ std::string log_id_; |
+ std::vector<std::string> consistency_proof_; |
}; |
class LogProofFetcherTest : public ::testing::Test { |
@@ -179,7 +217,7 @@ class LogProofFetcherTest : public ::testing::Test { |
kLogSchema, |
kLogHost, |
kLogPathPrefix)) { |
- scoped_ptr<GetSTHResponseHandler> handler(new GetSTHResponseHandler()); |
+ scoped_ptr<LogGetResponseHandler> handler(new LogGetResponseHandler()); |
handler_ = handler.get(); |
net::URLRequestFilter::GetInstance()->AddHostnameInterceptor( |
@@ -197,6 +235,7 @@ class LogProofFetcherTest : public ::testing::Test { |
void SetValidSTHJSONResponse() { |
std::string sth_json_reply_data = net::ct::GetSampleSTHAsJson(); |
handler_->set_response_body(sth_json_reply_data); |
+ handler_->set_expected_url(log_url_.Resolve("ct/v1/get-sth")); |
} |
void RunFetcherWithCallback(RecordFetchCallbackInvocations* callback) { |
@@ -209,12 +248,58 @@ class LogProofFetcherTest : public ::testing::Test { |
message_loop_.RunUntilIdle(); |
} |
+ void RunGetConsistencyFetcherWithCallback( |
+ RecordFetchCallbackInvocations* callback) { |
+ const size_t kOldTree = 5; |
+ const size_t kNewTree = 8; |
+ handler_->set_expected_url(log_url_.Resolve(base::StringPrintf( |
+ "ct/v1/get-sth-consistency?first=%" PRIuS "&second=%" PRIuS, kOldTree, |
+ kNewTree))); |
+ handler_->set_expect_get_consistency_proof(kOldTree, kNewTree); |
+ fetcher_->FetchConsistencyProof( |
+ log_url_, kLogID, kOldTree, kNewTree, |
+ base::Bind(&RecordFetchCallbackInvocations::ConsistencyProofFetched, |
+ base::Unretained(callback)), |
+ base::Bind(&RecordFetchCallbackInvocations::FetchingFailed, |
+ base::Unretained(callback))); |
+ message_loop_.RunUntilIdle(); |
+ } |
+ |
+ void VerifyReceivedSTH(const std::string& log_id, |
+ const net::ct::SignedTreeHead& sth) { |
+ net::ct::SignedTreeHead expected_sth; |
+ net::ct::GetSampleSignedTreeHead(&expected_sth); |
+ |
+ EXPECT_EQ(kLogID, log_id); |
+ EXPECT_EQ(expected_sth.version, sth.version); |
+ EXPECT_EQ(expected_sth.timestamp, sth.timestamp); |
+ EXPECT_EQ(expected_sth.tree_size, sth.tree_size); |
+ EXPECT_STREQ(expected_sth.sha256_root_hash, sth.sha256_root_hash); |
+ EXPECT_EQ(expected_sth.signature.hash_algorithm, |
+ sth.signature.hash_algorithm); |
+ EXPECT_EQ(expected_sth.signature.signature_algorithm, |
+ sth.signature.signature_algorithm); |
+ EXPECT_EQ(expected_sth.signature.signature_data, |
+ sth.signature.signature_data); |
+ } |
+ |
+ void VerifyConsistencyProof( |
+ const std::string& log_id, |
+ const std::vector<std::string>& consistency_proof) { |
+ EXPECT_EQ(kLogID, log_id); |
+ EXPECT_EQ(kDummyConsistencyProofLength, consistency_proof.size()); |
+ for (size_t i = 0; i < kDummyConsistencyProofLength; ++i) { |
+ EXPECT_EQ(GetDummyConsistencyProofNode(i), consistency_proof[i]) |
+ << " node: " << i; |
+ } |
mmenke
2015/11/25 17:40:29
I tossed in a RunLoop locally, and all tests passe
|
+ } |
+ |
base::MessageLoopForIO message_loop_; |
net::TestURLRequestContext context_; |
safe_json::TestingJsonParser::ScopedFactoryOverride factory_override_; |
scoped_ptr<LogProofFetcher> fetcher_; |
const GURL log_url_; |
- GetSTHResponseHandler* handler_; |
+ LogGetResponseHandler* handler_; |
}; |
TEST_F(LogProofFetcherTest, TestValidGetReply) { |
@@ -224,7 +309,8 @@ TEST_F(LogProofFetcherTest, TestValidGetReply) { |
RunFetcherWithCallback(&callback); |
- ASSERT_TRUE(callback.invoked()); |
+ ASSERT_EQ(STH_FETCH, callback.intercepted_request_type()); |
+ VerifyReceivedSTH(callback.intercepted_log_id(), callback.intercepted_sth()); |
} |
TEST_F(LogProofFetcherTest, TestValidGetReplyAsyncIO) { |
@@ -234,7 +320,8 @@ TEST_F(LogProofFetcherTest, TestValidGetReplyAsyncIO) { |
RecordFetchCallbackInvocations callback(true); |
RunFetcherWithCallback(&callback); |
- ASSERT_TRUE(callback.invoked()); |
+ ASSERT_EQ(STH_FETCH, callback.intercepted_request_type()); |
+ VerifyReceivedSTH(callback.intercepted_log_id(), callback.intercepted_sth()); |
} |
TEST_F(LogProofFetcherTest, TestInvalidGetReplyIncompleteJSON) { |
@@ -242,22 +329,24 @@ TEST_F(LogProofFetcherTest, TestInvalidGetReplyIncompleteJSON) { |
21 /* tree_size */, 123456u /* timestamp */, std::string(), |
std::string()); |
handler_->set_response_body(sth_json_reply_data); |
+ handler_->set_expected_url(log_url_.Resolve("ct/v1/get-sth")); |
RecordFetchCallbackInvocations callback(false); |
RunFetcherWithCallback(&callback); |
- ASSERT_TRUE(callback.invoked()); |
+ ASSERT_EQ(FAILURE, callback.intercepted_request_type()); |
EXPECT_EQ(net::ERR_CT_STH_INCOMPLETE, callback.net_error()); |
} |
TEST_F(LogProofFetcherTest, TestInvalidGetReplyInvalidJSON) { |
std::string sth_json_reply_data = "{\"tree_size\":21,\"timestamp\":}"; |
handler_->set_response_body(sth_json_reply_data); |
+ handler_->set_expected_url(log_url_.Resolve("ct/v1/get-sth")); |
RecordFetchCallbackInvocations callback(false); |
RunFetcherWithCallback(&callback); |
- ASSERT_TRUE(callback.invoked()); |
+ ASSERT_EQ(FAILURE, callback.intercepted_request_type()); |
EXPECT_EQ(net::ERR_CT_STH_PARSING_FAILED, callback.net_error()); |
} |
@@ -267,11 +356,12 @@ TEST_F(LogProofFetcherTest, TestLogReplyIsTooLong) { |
sth_json_reply_data.append( |
std::string(LogProofFetcher::kMaxLogResponseSizeInBytes, ' ')); |
handler_->set_response_body(sth_json_reply_data); |
+ handler_->set_expected_url(log_url_.Resolve("ct/v1/get-sth")); |
RecordFetchCallbackInvocations callback(false); |
RunFetcherWithCallback(&callback); |
- ASSERT_TRUE(callback.invoked()); |
+ ASSERT_EQ(FAILURE, callback.intercepted_request_type()); |
EXPECT_EQ(net::ERR_FILE_TOO_BIG, callback.net_error()); |
EXPECT_EQ(net::HTTP_OK, callback.http_response_code()); |
} |
@@ -283,25 +373,57 @@ TEST_F(LogProofFetcherTest, TestLogReplyIsExactlyMaxSize) { |
LogProofFetcher::kMaxLogResponseSizeInBytes - sth_json_reply_data.size(), |
' ')); |
handler_->set_response_body(sth_json_reply_data); |
+ handler_->set_expected_url(log_url_.Resolve("ct/v1/get-sth")); |
RecordFetchCallbackInvocations callback(true); |
RunFetcherWithCallback(&callback); |
- ASSERT_TRUE(callback.invoked()); |
+ ASSERT_EQ(STH_FETCH, callback.intercepted_request_type()); |
+ VerifyReceivedSTH(callback.intercepted_log_id(), callback.intercepted_sth()); |
} |
TEST_F(LogProofFetcherTest, TestLogRepliesWithHttpError) { |
- handler_->set_response_headers( |
- std::string(kGetSTHNotFoundHeaders, arraysize(kGetSTHNotFoundHeaders))); |
+ handler_->set_response_headers(std::string( |
+ kGetResponseNotFoundHeaders, arraysize(kGetResponseNotFoundHeaders))); |
+ handler_->set_expected_url(log_url_.Resolve("ct/v1/get-sth")); |
RecordFetchCallbackInvocations callback(false); |
RunFetcherWithCallback(&callback); |
- ASSERT_TRUE(callback.invoked()); |
+ ASSERT_EQ(FAILURE, callback.intercepted_request_type()); |
EXPECT_EQ(net::OK, callback.net_error()); |
EXPECT_EQ(net::HTTP_NOT_FOUND, callback.http_response_code()); |
} |
+TEST_F(LogProofFetcherTest, TestValidGetConsistencyValidReply) { |
+ std::vector<std::string> proof; |
+ for (size_t i = 0; i < kDummyConsistencyProofLength; ++i) |
+ proof.push_back(GetDummyConsistencyProofNode(i)); |
+ |
+ std::string consistency_proof_reply_data = |
+ net::ct::CreateConsistencyProofJsonString(proof); |
+ handler_->set_response_body(consistency_proof_reply_data); |
+ |
+ RecordFetchCallbackInvocations callback(true); |
+ RunGetConsistencyFetcherWithCallback(&callback); |
+ |
+ ASSERT_EQ(CONSISTENCY_PROOF_FETCH, callback.intercepted_request_type()); |
+ VerifyConsistencyProof(callback.intercepted_log_id(), |
+ callback.intercepted_proof()); |
+} |
+ |
+TEST_F(LogProofFetcherTest, TestInvalidGetConsistencyReplyInvalidJSON) { |
+ std::string consistency_proof_reply_data = "{\"consistency\": [1,2]}"; |
+ handler_->set_response_body(consistency_proof_reply_data); |
+ |
+ RecordFetchCallbackInvocations callback(false); |
+ RunGetConsistencyFetcherWithCallback(&callback); |
+ |
+ ASSERT_EQ(FAILURE, callback.intercepted_request_type()); |
+ EXPECT_EQ(net::ERR_CT_CONSISTENCY_PROOF_PARSING_FAILED, callback.net_error()); |
+ EXPECT_EQ(net::HTTP_OK, callback.http_response_code()); |
+} |
+ |
} // namespace |
} // namespace certificate_transparency |