milkcocoa0902/CocoaTweet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ツイートできたぞ！！！(#47)(#48)(#49)

Browse Source
This commit is contained in:
keita
2021-02-17 00:20:35 +09:00
parent 35394bd0ea
commit 45402eb217
8 changed files with 68 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+3 -4
View File
@@ -49,7 +49,6 @@ if(ENABLE_CODE_COVERAGE)
endif()
# Required libraries
find_package(Boost 1.61.0 COMPONENTS unit_test_framework REQUIRED)
find_package(PkgConfig REQUIRED)
find_package(OpenSSL REQUIRED)
if(NOT OPENSSL_FOUND)
@@ -62,14 +61,14 @@ find_package(CURL REQUIRED)
if(NOT CURL_FOUND)
message(FATAL_ERROR "Fail to find OpenSSL") # exit
endif()
message(FATAL_ERROR, "Fail to find libcurl")
include_directories(${CURL_INCLUDE_DIRS})
enable_testing()
find_library(cpprest REQUIRED)
include_directories(${CPP_REST_INCLUDE_DIR})
include_directories(
${PROJECT_SOURCE_DIR}/src
${Boost_INCLUDE_DIRS}
)
add_subdirectory(src)
src/CMakeLists.txt
-1
View File
@@ -4,7 +4,6 @@ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
add_executable(${PROJECT_NAME} main.cc)
target_link_libraries(${PROJECT_NAME}
lib-cocoatweet
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
OpenSSL::SSL
OpenSSL::Crypto
${CURL_LIBRARIES}
src/cocoatweet/CMakeLists.txt
-3
View File
@@ -1,7 +1,4 @@
file(GLOB_RECURSE SOURCES ./*.cc)
add_library(lib-cocoatweet ${SOURCES})
target_link_libraries(lib-cocoatweet PUBLIC
Boost::boost
)
target_include_directories(lib-cocoatweet PUBLIC ${PROJECT_SOURCE_DIR}/src)
set_target_properties(lib-cocoatweet PROPERTIES OUTPUT_NAME cocoatweet)
src/cocoatweet/api/status/update.cc
+17 -13
View File
@@ -22,14 +22,17 @@ void Update::process(std::weak_ptr<CocoaTweet::OAuth::OAuth1> _oauth,
std::function<void(std::string)> _callback) {
// エンドポイントへのパラメータにOAuthパラメータを付加して署名作成
auto oauth = _oauth.lock();
param_.merge(oauth->oauthParam());
auto signature = oauth->signature(param_, "POST", url_);
auto oauthParam = oauth->oauthParam();
auto sigingParam = oauthParam;
for (const auto [k, v] : param_) {
sigingParam.insert_or_assign(k, v);
}
auto signature = oauth->signature(sigingParam, "POST", url_);
// 作成した署名をエンドポイントへのパラメータ及びOAuthパラメータに登録
param_.insert_or_assign("oauth_signature", signature["oauth_signature"]);
auto header = oauth->oauthParam();
std::cout << "signature : " << signature["oauth_signature"] << std::endl;
header.insert_or_assign("oauth_signature", signature["oauth_signature"]);
oauthParam.merge(signature);
// リクエストボディの構築
std::string requestBody = "";
@@ -43,14 +46,13 @@ void Update::process(std::weak_ptr<CocoaTweet::OAuth::OAuth1> _oauth,
requestBody = os.str();
requestBody.erase(requestBody.size() - std::char_traits<char>::length("&"));
}
requestBody += (std::string("&") + "oauth_signature=" + signature["oauth_signature"]);
std::cout << "request Body -> " << requestBody << std::endl;
// ヘッダの構築
std::string oauthHeader = "Authorization: OAuth ";
std::string oauthHeader = "authorization: OAuth ";
{
std::vector<std::string> tmp;
for (const auto& [key, value] : header) {
for (const auto& [key, value] : oauthParam) {
tmp.push_back(key + "=" + value);
}
std::stringstream os;
@@ -58,7 +60,6 @@ void Update::process(std::weak_ptr<CocoaTweet::OAuth::OAuth1> _oauth,
oauthHeader += os.str();
oauthHeader.erase(oauthHeader.size() - std::char_traits<char>::length(","));
}
//oauthHeader += (std::string(",") + "oauth_signature=" + signature["oauth_signature"]);
std::cout << "OAuth Header -> " << oauthHeader << std::endl;
// do post
@@ -66,20 +67,23 @@ void Update::process(std::weak_ptr<CocoaTweet::OAuth::OAuth1> _oauth,
CURLcode res;
std::string rcv;
curl = curl_easy_init();
url_ = url_ + "?status=" + status_;
std::cout << "URL : " << url_ << std::endl;
if (curl) {
curl_easy_setopt(curl, CURLOPT_URL, url_.c_str());
curl_easy_setopt(curl, CURLOPT_POST, 1);
curl_easy_setopt(curl, CURLOPT_POSTFIELDS, requestBody);
curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, requestBody.length());
// curl_easy_setopt(curl, CURLOPT_POSTFIELDS, requestBody);
// curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, requestBody.length());
curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, 0);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curlCallback_);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, (std::string*)&rcv);
curl_easy_setopt(curl, CURLOPT_PROXY, "");
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
// Headerを保持するcurl_slist*を初期化
struct curl_slist* headers = NULL;
// Authorizationをヘッダに追加
headers = curl_slist_append(headers, oauthHeader.c_str());
curl_easy_setopt(curl, CURLOPT_HEADER, headers);
// headers = curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded");
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
res = curl_easy_perform(curl);
curl_easy_cleanup(curl);
}
src/cocoatweet/oauth/oauth.cc
+4 -3
View File
@@ -34,14 +34,16 @@ std::map<std::string, std::string> OAuth1::signature(
query.erase(query.size() - std::char_traits<char>::length("&"));
auto significateKey = key().consumerSecret() + "&" + key().accessTokenSecret();
auto significateBase = _method + "&" + CocoaTweet::Util::urlEncode(_url) + "&" + CocoaTweet::Util::urlEncode(query);
auto significateBase = _method + "&" + CocoaTweet::Util::urlEncode(_url) + "&" +
CocoaTweet::Util::urlEncode(query);
auto k64Sha1 = hmacSha1(significateKey, significateBase);
std::cout << "significate key : " << significateKey << std::endl;
std::cout << "significate base : " << significateBase << std::endl;
std::cout << "hmac-sha1 : " << k64Sha1 << std::endl;
auto ret = std::map<std::string, std::string>{{"oauth_signature", CocoaTweet::Util::urlEncode(k64Sha1)}};
auto ret = std::map<std::string, std::string>{
{"oauth_signature", CocoaTweet::Util::urlEncode(k64Sha1)}};
return ret;
}
@@ -123,7 +125,6 @@ std::string OAuth1::hmacSha1(std::string _key, std::string _data) {
auto sha1 = std::string(reinterpret_cast<char*>(result), length);
// base64 encodeもやっちゃえ日産
BIO* encoder = BIO_new(BIO_f_base64());
BIO* bmem = BIO_new(BIO_s_mem());
src/cocoatweet/util/util.cc
+3 -2
View File
@@ -6,7 +6,8 @@ namespace CocoaTweet::Util{
std::stringstream out;
for (const auto c : _str) {
if(std::isalpha(c) || std::isdigit(c) || (c == '.' || (c == '_') || (c == '-' || (c == '~')))){
if (std::isalpha(c) || std::isdigit(c) ||
(c == '.' || (c == '_') || (c == '-' || (c == '~')))) {
out << c;
} else {
out << '%' << std::hex << std::uppercase << static_cast<int>(c);
@@ -18,4 +19,4 @@ namespace CocoaTweet::Util{
template <typename T>
std::string join(const std::vector<T> _vec) {}
}
} // namespace CocoaTweet::Util
src/cocoatweet/util/util.h
+1 -1
View File
@@ -9,6 +9,6 @@ namespace CocoaTweet::Util{
std::string urlEncode(const std::string& _str);
template <typename T>
std::string join(const std::vector<T> _vec);
}
} // namespace CocoaTweet::Util
#endif
src/main.cc
+1 -1
View File
@@ -8,5 +8,5 @@ auto main()->int{
auto accessTokenSecret = "dpCctbxzMjQ9AjZ6V7Fs6TIQlpPJo7JEkmjMfSO7QCEpW";
CocoaTweet::OAuth::Key key(consumerKey, consumerSecret, accessToken, accessTokenSecret);
CocoaTweet::API::API api(key);
api.status().Update("CocoaTwitterAPI");
api.status().Update("tweet_from_Cocoa_Twitter_Library");
}