Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use libcurl #4891

Merged
merged 7 commits into from
Nov 17, 2022
Merged

use libcurl #4891

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
38f4b1d
use libcurl
cangfengzhs Nov 16, 2022
a193924
Merge branch 'master' into http-client
cangfengzhs Nov 17, 2022
626a1bd
remove some useless curl
cangfengzhs Nov 17, 2022
e2b77b3
Merge branch 'master' into http-client
cangfengzhs Nov 17, 2022
bdf7533
address some comment
cangfengzhs Nov 17, 2022
b5202ee
Merge branch 'master' into http-client
cangfengzhs Nov 17, 2022
15dde23
Merge branch 'master' into http-client
cangfengzhs Nov 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/codec/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ nebula_add_test(
${PROXYGEN_LIBRARIES}
wangle
gtest
curl
cangfengzhs marked this conversation as resolved.
Show resolved Hide resolved
)


Expand All @@ -66,6 +67,7 @@ nebula_add_test(
${PROXYGEN_LIBRARIES}
wangle
gtest
curl
)


Expand All @@ -78,6 +80,7 @@ nebula_add_test(
${PROXYGEN_LIBRARIES}
wangle
gtest
curl
)


Expand All @@ -94,6 +97,7 @@ nebula_add_test(
wangle
boost_regex
gtest
curl
)


Expand All @@ -109,6 +113,7 @@ nebula_add_executable(
follybenchmark
wangle
boost_regex
curl
)

#nebula_add_test(
Expand Down
2 changes: 2 additions & 0 deletions src/common/expression/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ nebula_add_test(
gtest
${THRIFT_LIBRARIES}
${PROXYGEN_LIBRARIES}
curl
)

nebula_add_executable(
Expand All @@ -111,6 +112,7 @@ nebula_add_executable(
boost_regex
${THRIFT_LIBRARIES}
${PROXYGEN_LIBRARIES}
curl
)

nebula_add_executable(
Expand Down
168 changes: 95 additions & 73 deletions src/common/http/HttpClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,99 +1,121 @@
/* Copyright (c) 2019 vesoft inc. All rights reserved.
/* Copyright (c) 2022 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License.
*/

#include "common/http/HttpClient.h"

#include "common/process/ProcessUtils.h"

#include "curl/curl.h"
namespace nebula {
namespace http {

StatusOr<std::string> HttpClient::get(const std::string& path, const std::string& options) {
auto command = folly::stringPrintf("/usr/bin/curl %s \"%s\"", options.c_str(), path.c_str());
LOG(INFO) << "HTTP Get Command: " << command;
auto result = nebula::ProcessUtils::runCommand(command.c_str());
if (result.ok()) {
return result.value();
} else {
return Status::Error(folly::stringPrintf("Http Get Failed: %s", path.c_str()));
}

CurlHandle::CurlHandle() {
curl_global_init(CURL_GLOBAL_ALL);
}

StatusOr<std::string> HttpClient::post(const std::string& path, const std::string& header) {
auto command =
folly::stringPrintf("/usr/bin/curl -X POST %s \"%s\"", header.c_str(), path.c_str());
LOG(INFO) << "HTTP POST Command: " << command;
auto result = nebula::ProcessUtils::runCommand(command.c_str());
if (result.ok()) {
return result.value();
} else {
return Status::Error(folly::stringPrintf("Http Post Failed: %s", path.c_str()));
}
CurlHandle::~CurlHandle() {
curl_global_cleanup();
}

StatusOr<std::string> HttpClient::post(const std::string& path,
const std::unordered_map<std::string, std::string>& header) {
folly::dynamic mapData = folly::dynamic::object;
// Build a dynamic object from map
for (auto const& it : header) {
mapData[it.first] = it.second;
}
return post(path, mapData);
CurlHandle* CurlHandle::instance() {
static CurlHandle handle;
return &handle;
}

HttpResponse HttpClient::get(const std::string& url) {
return HttpClient::get(url, {});
}

HttpResponse HttpClient::get(const std::string& url, const std::vector<std::string>& header) {
return sendRequest(url, "GET", header, "");
}

StatusOr<std::string> HttpClient::post(const std::string& path, const folly::dynamic& data) {
return sendRequest(path, data, "POST");
HttpResponse HttpClient::post(const std::string& url,
const std::vector<std::string>& header,
const std::string& body) {
return sendRequest(url, "POST", header, body);
}

StatusOr<std::string> HttpClient::put(const std::string& path,
const std::unordered_map<std::string, std::string>& header) {
folly::dynamic mapData = folly::dynamic::object;
// Build a dynamic object from map
for (auto const& it : header) {
mapData[it.first] = it.second;
HttpResponse HttpClient::delete_(const std::string& url, const std::vector<std::string>& header) {
return sendRequest(url, "DELETE", header, "");
}

HttpResponse HttpClient::put(const std::string& url,
const std::vector<std::string>& header,
const std::string& body) {
return sendRequest(url, "PUT", header, body);
}

HttpResponse HttpClient::sendRequest(const std::string& url,
const std::string& method,
const std::vector<std::string>& header,
const std::string& body) {
CurlHandle::instance();
HttpResponse resp;
CURL* curl = curl_easy_init();
CHECK(curl);
setUrl(curl, url);
setMethod(curl, method);
curl_slist* h = setHeaders(curl, header);
if (!body.empty()) {
curl_easy_setopt(curl, CURLOPT_POSTFIELDS, body.c_str());
}
setRespHeader(curl, resp.header);
setRespBody(curl, resp.body);
setTimeout(curl);
resp.curlCode = curl_easy_perform(curl);
if (resp.curlCode != 0) {
resp.curlMessage = std::string(curl_easy_strerror(resp.curlCode));
}
return put(path, mapData);
}

StatusOr<std::string> HttpClient::put(const std::string& path, const std::string& header) {
auto command =
folly::stringPrintf("/usr/bin/curl -X PUT %s \"%s\"", header.c_str(), path.c_str());
LOG(INFO) << "HTTP PUT Command: " << command;
auto result = nebula::ProcessUtils::runCommand(command.c_str());
if (result.ok()) {
return result.value();
} else {
return Status::Error(folly::stringPrintf("Http Put Failed: %s", path.c_str()));
if (h) {
curl_slist_free_all(h);
}
curl_easy_cleanup(curl);
return resp;
}

StatusOr<std::string> HttpClient::put(const std::string& path, const folly::dynamic& data) {
return sendRequest(path, data, "PUT");
void HttpClient::setUrl(CURL* curl, const std::string& url) {
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
}

StatusOr<std::string> HttpClient::sendRequest(const std::string& path,
const folly::dynamic& data,
const std::string& reqType) {
std::string command;
if (data.empty()) {
command = folly::stringPrintf("curl -X %s -s \"%s\"", reqType.c_str(), path.c_str());
} else {
command =
folly::stringPrintf("curl -X %s -H \"Content-Type: application/json\" -d'%s' -s \"%s\"",
reqType.c_str(),
folly::toJson(data).c_str(),
path.c_str());
void HttpClient::setMethod(CURL* curl, const std::string& method) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, method.c_str());
}
curl_slist* HttpClient::setHeaders(CURL* curl, const std::vector<std::string>& headers) {
curl_slist* h = nullptr;
for (auto& header : headers) {
h = curl_slist_append(h, header.c_str());
}
LOG(INFO) << folly::stringPrintf("HTTP %s Command: %s", reqType.c_str(), command.c_str());
auto result = nebula::ProcessUtils::runCommand(command.c_str());
if (result.ok()) {
return result.value();
} else {
return Status::Error(folly::stringPrintf("Http %s Failed: %s", reqType.c_str(), path.c_str()));
if (h) {
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, h);
}
return h;
}

} // namespace http
void HttpClient::setRespHeader(CURL* curl, const std::string& header) {
curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, onWriteData);
curl_easy_setopt(curl, CURLOPT_HEADERDATA, &header);
}

void HttpClient::setRespBody(CURL* curl, const std::string& body) {
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, onWriteData);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &body);
}

void HttpClient::setTimeout(CURL* curl) {
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 1);
curl_easy_setopt(curl, CURLOPT_TIMEOUT, 3);
}

size_t HttpClient::onWriteData(void* ptr, size_t size, size_t nmemb, void* stream) {
if (ptr == nullptr || size == 0) {
return 0;
}
CHECK(stream);
size_t realsize = size * nmemb;
std::string* buffer = static_cast<std::string*>(stream);
CHECK(buffer);
buffer->append(static_cast<char*>(ptr), realsize);
return realsize;
}
} // namespace nebula
80 changes: 48 additions & 32 deletions src/common/http/HttpClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,63 @@
/* Copyright (c) 2019 vesoft inc. All rights reserved.
/* Copyright (c) 2022 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License.
*/

#ifndef COMMON_HTTPCLIENT_H
#define COMMON_HTTPCLIENT_H
#ifndef COMMON_HTTP_HTTPCLIENT_H_
#define COMMON_HTTP_HTTPCLIENT_H_
#include <memory>
#include <mutex>
#include <string>

#include "common/base/Base.h"
#include "common/base/StatusOr.h"
#include "curl/curl.h"

namespace nebula {
namespace http {

class CurlHandle {
public:
static CurlHandle* instance();

private:
CurlHandle();
~CurlHandle();
};

struct HttpResponse {
CURLcode curlCode;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CURLcode is a int not a enum? Didn't find it in this PR

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's an integer and defined by libcurl

std::string curlMessage;
std::string header;
std::string body;
};

class HttpClient {
public:
HttpClient() = delete;

~HttpClient() = default;
// Send a http GET request
static StatusOr<std::string> get(const std::string& path, const std::string& options = "-G");

// Send a http POST request
static StatusOr<std::string> post(const std::string& path, const std::string& header);
// Send a http POST request with a different function signature
static StatusOr<std::string> post(const std::string& path,
const std::unordered_map<std::string, std::string>& header);
static StatusOr<std::string> post(const std::string& path,
const folly::dynamic& data = folly::dynamic::object());

// Send a http PUT request
static StatusOr<std::string> put(const std::string& path, const std::string& header);
static StatusOr<std::string> put(const std::string& path,
const std::unordered_map<std::string, std::string>& header);
static StatusOr<std::string> put(const std::string& path,
const folly::dynamic& data = folly::dynamic::object());

protected:
static StatusOr<std::string> sendRequest(const std::string& path,
const folly::dynamic& data,
const std::string& reqType);
static HttpResponse get(const std::string& url);
static HttpResponse get(const std::string& url, const std::vector<std::string>& headers);

static HttpResponse post(const std::string& url,
const std::vector<std::string>& headers,
const std::string& body);
static HttpResponse delete_(const std::string& url, const std::vector<std::string>& headers);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

del? Not a big issue, up to you

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Emm, both are OK. But I don't want to change it:)
Maybe someone who doesn't like delete_ will modify it one day.

static HttpResponse put(const std::string& url,
const std::vector<std::string>& headers,
const std::string& body);

private:
static HttpResponse sendRequest(const std::string& url,
const std::string& method,
const std::vector<std::string>& headers,
const std::string& body);
static void setUrl(CURL* curl, const std::string& url);
static void setMethod(CURL* curl, const std::string& method);
static curl_slist* setHeaders(CURL* curl, const std::vector<std::string>& headers);

static void setRespBody(CURL* curl, const std::string& body);
static void setRespHeader(CURL* curl, const std::string& header);
static void setTimeout(CURL* curl);
static size_t onWriteData(void* ptr, size_t size, size_t nmemb, void* stream);
};

} // namespace http
} // namespace nebula

#endif // COMMON_HTTPCLIENT_H
#endif
6 changes: 4 additions & 2 deletions src/common/http/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ nebula_add_test(
SOURCES
HttpClientTest.cpp
OBJECTS
$<TARGET_OBJECTS:base_obj>
cangfengzhs marked this conversation as resolved.
Show resolved Hide resolved
$<TARGET_OBJECTS:http_client_obj>
$<TARGET_OBJECTS:ws_obj>
$<TARGET_OBJECTS:ws_common_obj>
Expand All @@ -22,5 +23,6 @@ nebula_add_test(
LIBRARIES
${PROXYGEN_LIBRARIES}
gtest
gtest_main
)
curl

)
cangfengzhs marked this conversation as resolved.
Show resolved Hide resolved
12 changes: 6 additions & 6 deletions src/common/http/test/HttpClientTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,16 @@ TEST(HttpClient, get) {
{
auto url =
folly::stringPrintf("http://%s:%d%s", FLAGS_ws_ip.c_str(), FLAGS_ws_http_port, "/path");
auto result = HttpClient::get(url);
ASSERT_TRUE(result.ok());
ASSERT_EQ("HttpClientHandler successfully", result.value());
auto httpResp = HttpClient::get(url);
ASSERT_EQ(httpResp.curlCode, 0);
ASSERT_EQ("HttpClientHandler successfully", httpResp.body);
}
{
auto url = folly::stringPrintf(
"http://%s:%d%s", FLAGS_ws_ip.c_str(), FLAGS_ws_http_port, "/not_exist");
auto result = HttpClient::get(url);
ASSERT_TRUE(result.ok());
ASSERT_TRUE(result.value().empty());
auto httpResp = HttpClient::get(url);
ASSERT_EQ(httpResp.curlCode, 0);
ASSERT_TRUE(httpResp.body.empty());
}
}

Expand Down
Loading