suyu/breakpad
26
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

GoogleCrashdumpUploader: adds Upload(string*) API to get the HTTP response.

Browse source 
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1379 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
gunsch@chromium.org 2014-09-18 16:48:49 +00:00
parent 18b1418b25
commit 63a2ea9245
6 changed files with 46 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/linux/sender/google_crash_report_sender.cc
View file

@ -100,5 +100,5 @@ int main(int argc, char *argv[]) {
FLAGS_crash_server,
FLAGS_proxy_host,
FLAGS_proxy_userpasswd);
g.Upload();
g.Upload(NULL, NULL, NULL);
}

8
src/common/linux/google_crashdump_uploader.cc
View file

@ -161,7 +161,9 @@ bool GoogleCrashdumpUploader::CheckRequiredParametersArePresent() {
}
bool GoogleCrashdumpUploader::Upload() {
bool GoogleCrashdumpUploader::Upload(int* http_status_code,
string* http_response_header,
string* http_response_body) {
bool ok = http_layer_->Init();
if (!ok) {
std::cout << "http layer init failed";
@ -193,6 +195,8 @@ bool GoogleCrashdumpUploader::Upload() {
std::cout << "Sending request to " << crash_server_;
return http_layer_->SendRequest(crash_server_,
parameters_,
NULL);
http_status_code,
http_response_header,
http_response_body);
}
}

4
src/common/linux/google_crashdump_uploader.h
View file

@ -79,7 +79,9 @@ class GoogleCrashdumpUploader {
const string& proxy_host,
const string& proxy_userpassword,
LibcurlWrapper* http_layer);
bool Upload();
bool Upload(int* http_status_code,
string* http_response_header,
string* http_response_body);
private:
bool CheckRequiredParametersArePresent();

23
src/common/linux/google_crashdump_uploader_test.cc
View file

@ -32,7 +32,6 @@
#include <string>
#include "common/linux/google_crashdump_uploader.h"
#include "common/linux/libcurl_wrapper.h"
#include "breakpad_googletest_includes.h"
#include "common/using_std_string.h"
@ -48,10 +47,12 @@ class MockLibcurlWrapper : public LibcurlWrapper {
const string& proxy_userpwd));
MOCK_METHOD2(AddFile, bool(const string& upload_file_path,
const string& basename));
MOCK_METHOD3(SendRequest,
MOCK_METHOD5(SendRequest,
bool(const string& url,
const std::map<string, string>& parameters,
string* server_response));
int* http_status_code,
string* http_header_data,
string* http_response_data));
};
class GoogleCrashdumpUploaderTest : public ::testing::Test {
@ -72,7 +73,7 @@ TEST_F(GoogleCrashdumpUploaderTest, InitFailsCausesUploadFailure) {
"",
"",
&m);
ASSERT_FALSE(uploader->Upload());
ASSERT_FALSE(uploader->Upload(NULL, NULL, NULL));
}
TEST_F(GoogleCrashdumpUploaderTest, TestSendRequestHappensWithValidParameters) {
@ -86,7 +87,7 @@ TEST_F(GoogleCrashdumpUploaderTest, TestSendRequestHappensWithValidParameters) {
EXPECT_CALL(m, Init()).Times(1).WillOnce(Return(true));
EXPECT_CALL(m, AddFile(tempfn, _)).WillOnce(Return(true));
EXPECT_CALL(m,
SendRequest("http://foo.com",_,_)).Times(1).WillOnce(Return(true));
SendRequest("http://foo.com",_,_,_,_)).Times(1).WillOnce(Return(true));
GoogleCrashdumpUploader *uploader = new GoogleCrashdumpUploader("foobar",
"1.0",
"AAA-BBB",
@ -99,14 +100,14 @@ TEST_F(GoogleCrashdumpUploaderTest, TestSendRequestHappensWithValidParameters) {
"",
"",
&m);
ASSERT_TRUE(uploader->Upload());
ASSERT_TRUE(uploader->Upload(NULL, NULL, NULL));
}
TEST_F(GoogleCrashdumpUploaderTest, InvalidPathname) {
MockLibcurlWrapper m;
EXPECT_CALL(m, Init()).Times(1).WillOnce(Return(true));
EXPECT_CALL(m, SendRequest(_,_,_)).Times(0);
EXPECT_CALL(m, SendRequest(_,_,_,_,_)).Times(0);
GoogleCrashdumpUploader *uploader = new GoogleCrashdumpUploader("foobar",
"1.0",
"AAA-BBB",
@ -119,7 +120,7 @@ TEST_F(GoogleCrashdumpUploaderTest, InvalidPathname) {
"",
"",
&m);
ASSERT_FALSE(uploader->Upload());
ASSERT_FALSE(uploader->Upload(NULL, NULL, NULL));
}
TEST_F(GoogleCrashdumpUploaderTest, TestRequiredParametersMustBePresent) {
@ -135,7 +136,7 @@ TEST_F(GoogleCrashdumpUploaderTest, TestRequiredParametersMustBePresent) {
"http://foo.com",
"",
"");
ASSERT_FALSE(uploader.Upload());
ASSERT_FALSE(uploader.Upload(NULL, NULL, NULL));
// Test with empty product version.
GoogleCrashdumpUploader uploader1("product",
@ -150,7 +151,7 @@ TEST_F(GoogleCrashdumpUploaderTest, TestRequiredParametersMustBePresent) {
"",
"");
ASSERT_FALSE(uploader1.Upload());
ASSERT_FALSE(uploader1.Upload(NULL, NULL, NULL));
// Test with empty client GUID.
GoogleCrashdumpUploader uploader2("product",
@ -164,6 +165,6 @@ TEST_F(GoogleCrashdumpUploaderTest, TestRequiredParametersMustBePresent) {
"",
"",
"");
ASSERT_FALSE(uploader2.Upload());
ASSERT_FALSE(uploader2.Upload(NULL, NULL, NULL));
}
}

23
src/common/linux/libcurl_wrapper.cc
View file

@ -110,7 +110,9 @@ static size_t WriteCallback(void *ptr, size_t size,
bool LibcurlWrapper::SendRequest(const string& url,
const std::map<string, string>& parameters,
string* server_response) {
int* http_status_code,
string* http_header_data,
string* http_response_data) {
(*easy_setopt_)(curl_, CURLOPT_URL, url.c_str());
std::map<string, string>::const_iterator iter = parameters.begin();
for (; iter != parameters.end(); ++iter)
@ -120,10 +122,17 @@ bool LibcurlWrapper::SendRequest(const string& url,
CURLFORM_END);
(*easy_setopt_)(curl_, CURLOPT_HTTPPOST, formpost_);
if (server_response != NULL) {
if (http_response_data != NULL) {
http_response_data->clear();
(*easy_setopt_)(curl_, CURLOPT_WRITEFUNCTION, WriteCallback);
(*easy_setopt_)(curl_, CURLOPT_WRITEDATA,
reinterpret_cast<void *>(server_response));
reinterpret_cast<void *>(http_response_data));
}
if (http_header_data != NULL) {
http_header_data->clear();
(*easy_setopt_)(curl_, CURLOPT_HEADERFUNCTION, WriteCallback);
(*easy_setopt_)(curl_, CURLOPT_HEADERDATA,
reinterpret_cast<void *>(http_header_data));
}
CURLcode err_code = CURLE_OK;
@ -131,6 +140,10 @@ bool LibcurlWrapper::SendRequest(const string& url,
easy_strerror_ = reinterpret_cast<const char* (*)(CURLcode)>
(dlsym(curl_lib_, "curl_easy_strerror"));
if (http_status_code != NULL) {
(*easy_getinfo_)(curl_, CURLINFO_RESPONSE_CODE, http_status_code);
}
#ifndef NDEBUG
if (err_code != CURLE_OK)
fprintf(stderr, "Failed to send http request to %s, error: %s\n",
@ -211,6 +224,10 @@ bool LibcurlWrapper::SetFunctionPointers() {
"curl_easy_cleanup",
void(*)(CURL*));
SET_AND_CHECK_FUNCTION_POINTER(easy_getinfo_,
"curl_easy_getinfo",
CURLcode(*)(CURL *, CURLINFO info, ...));
SET_AND_CHECK_FUNCTION_POINTER(slist_free_all_,
"curl_slist_free_all",
void(*)(curl_slist*));

5
src/common/linux/libcurl_wrapper.h
View file

@ -51,7 +51,9 @@ class LibcurlWrapper {
const string& basename);
virtual bool SendRequest(const string& url,
const std::map<string, string>& parameters,
string* server_response);
int* http_status_code,
string* http_header_data,
string* http_response_data);
private:
// This function initializes class state corresponding to function
// pointers into the CURL library.
@ -82,6 +84,7 @@ class LibcurlWrapper {
CURLcode (*easy_perform_)(CURL *);
const char* (*easy_strerror_)(CURLcode);
void (*easy_cleanup_)(CURL *);
CURLcode (*easy_getinfo_)(CURL *, CURLINFO info, ...);
void (*formfree_)(struct curl_httppost *);
};