とりあえずcURLを使って投げられるようなデータは作成できた(#47)(#48)(#49)

.gitignore

@@ -1,2 +1,3 @@
 build/
 *.swp
+src/main.cc

src/cocoatweet/api/api.cc

@@ -9,4 +9,4 @@ namespace CocoaTweet::API{
 Statuses::Status API::status() const {
   return status_;
 }
-}
+} // namespace CocoaTweet::API

src/cocoatweet/api/api.h

@@ -9,10 +9,11 @@ class API{
 public:
   API(CocoaTweet::OAuth::Key _key);
   Statuses::Status status() const;
+
 private:
   Statuses::Status status_;
   std::shared_ptr<CocoaTweet::OAuth::OAuth1> oauth_;
 };
-}
+} // namespace CocoaTweet::API
 
 #endif

src/cocoatweet/api/groupInterface.h

@@ -9,6 +9,6 @@ class groupInterface{
 protected:
   std::weak_ptr<CocoaTweet::OAuth::OAuth1> oauth_;
 };
-}
+} // namespace CocoaTweet::API
 
 #endif

src/cocoatweet/api/interface.cc

@@ -6,4 +6,4 @@ namespace CocoaTweet::API{
   _stream->append(_ptr, realsize);
   return realsize;
 }
-}
+} // namespace CocoaTweet::API

src/cocoatweet/api/interface.h

@@ -7,13 +7,15 @@
 namespace CocoaTweet::API {
 class Interface {
 public:
-		virtual void process(std::weak_ptr<CocoaTweet::OAuth::OAuth1> _oauth, std::function<void(std::string)> _callback) = 0;
+  virtual void process(std::weak_ptr<CocoaTweet::OAuth::OAuth1> _oauth,
+                       std::function<void(std::string)> _callback) = 0;
+
 protected:
   std::weak_ptr<CocoaTweet::OAuth::OAuth1> oauth_;
   std::map<std::string, std::string> param_;
   std::string url_;
   static size_t curlCallback_(char* _ptr, size_t _size, size_t _nmemb, std::string* _stream);
 };
-}
+} // namespace CocoaTweet::API
 
 #endif

src/cocoatweet/api/status/status.cc

@@ -13,4 +13,4 @@ namespace CocoaTweet::API::Statuses{
   update.status(_status);
   update.process(oauth_, [](std::string _rcv) { std::cout << _rcv << std::endl; });
 }
-}
+} // namespace CocoaTweet::API::Statuses

src/cocoatweet/api/status/status.h

@@ -10,8 +10,9 @@ class Status : public groupInterface{
   Status() = default;
   Status(std::shared_ptr<CocoaTweet::OAuth::OAuth1> _oauth);
   void Update(const std::string& _status) const;
+
 private:
 };
-}
+} // namespace CocoaTweet::API::Statuses
 
 #endif

src/cocoatweet/api/status/update.cc

@@ -1,4 +1,5 @@
 #include "cocoatweet/api/status/update.h"
+#include "cocoatweet/util/util.h"
 #include <iterator>
 #include <memory>
 #include <vector>
@@ -17,7 +18,8 @@ namespace CocoaTweet::API::Statuses{
   param_.insert_or_assign("status", status_);
 }
 
-		void Update::process(std::weak_ptr<CocoaTweet::OAuth::OAuth1> _oauth, std::function<void(std::string)> _callback){
+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());
@@ -41,7 +43,8 @@ namespace CocoaTweet::API::Statuses{
     requestBody = os.str();
     requestBody.erase(requestBody.size() - std::char_traits<char>::length("&"));
   }
-				std::cout << "Body : " << requestBody << std::endl;
+	requestBody += (std::string("&") + "oauth_signature=" + signature["oauth_signature"]);
+  std::cout << "request Body -> " << requestBody << std::endl;
 
   // ヘッダの構築
   std::string oauthHeader = "Authorization: OAuth ";
@@ -55,10 +58,8 @@ namespace CocoaTweet::API::Statuses{
     oauthHeader += os.str();
     oauthHeader.erase(oauthHeader.size() - std::char_traits<char>::length(","));
   }
-				std::cout << "OAuth Header : " << oauthHeader << std::endl;
+	//oauthHeader += (std::string(",") + "oauth_signature=" + signature["oauth_signature"]);
-
+  std::cout << "OAuth Header -> " << oauthHeader << std::endl;
-
-
 
   // do post
   CURL* curl;
@@ -91,4 +92,4 @@ namespace CocoaTweet::API::Statuses{
     _callback(rcv);
   }
 }
-}
+} // namespace CocoaTweet::API::Statuses

src/cocoatweet/api/status/update.h

@@ -11,10 +11,12 @@ class Update :public Interface{
 public:
   Update();
   void status(const std::string _status);
-		void process(std::weak_ptr<CocoaTweet::OAuth::OAuth1> _oauth, std::function<void(std::string)> _callback);
+  void process(std::weak_ptr<CocoaTweet::OAuth::OAuth1> _oauth,
+               std::function<void(std::string)> _callback);
+
 private:
   std::string status_;
 };
-}
+} // namespace CocoaTweet::API::Statuses
 
 #endif

src/cocoatweet/oauth/key.h

@@ -11,24 +11,33 @@ const std::string accessTokenSecret_;
 
 public:
   Key() = default;
-Key(const std::string& _consumerKey, const std::string& _consumerSecret, const std::string& _accessToken, const std::string& _accessTokenSecret):consumerKey_(_consumerKey), consumerSecret_(_consumerSecret), accessToken_(_accessToken), accessTokenSecret_(_accessTokenSecret){}
+  Key(const std::string& _consumerKey, const std::string& _consumerSecret,
-const std::string& consumerKey() const{return consumerKey_;}
+      const std::string& _accessToken, const std::string& _accessTokenSecret)
-const std::string& consumerSecret() const{return consumerSecret_;}
+      : consumerKey_(_consumerKey),
-const std::string& accessToken() const{return accessToken_;}
+        consumerSecret_(_consumerSecret),
-const std::string& accessTokenSecret() const{return accessTokenSecret_;}
+        accessToken_(_accessToken),
+        accessTokenSecret_(_accessTokenSecret) {}
+  const std::string& consumerKey() const {
+    return consumerKey_;
+  }
+  const std::string& consumerSecret() const {
+    return consumerSecret_;
+  }
+  const std::string& accessToken() const {
+    return accessToken_;
+  }
+  const std::string& accessTokenSecret() const {
+    return accessTokenSecret_;
+  }
   std::map<std::string, std::string> noSecret() const {
-    return std::map<std::string, std::string>{
+    return std::map<std::string, std::string>{{"oauth_consumer_key", consumerKey_},
-        {"oauth_consumer_key", consumerKey_},
+                                              {"oauth_token", accessToken_}};
-        {"oauth_token", accessToken_}
-    };
   }
   const std::map<std::string, std::string> secret() const {
-    return std::map<std::string, std::string>{
+    return std::map<std::string, std::string>{{"oauth_consumer_key", consumerSecret_},
-        {"oauth_consumer_key", consumerSecret_},
+                                              {"oauth_token", accessTokenSecret_}};
-        {"oauth_token", accessTokenSecret_}
-    };
   }
 };
-}
+} // namespace CocoaTweet::OAuth
 
 #endif

src/cocoatweet/oauth/oauth.cc

@@ -1,31 +1,32 @@
 #include "oauth.h"
-
+#include "cocoatweet/util/util.h"
 #include <random>
 #include <ctime>
 #include <bitset>
 #include <sstream>
 #include <string>
+#include <cstring>
 #include <iterator>
 #include <iostream>
 
 extern "C" {
 #include <openssl/hmac.h>
 #include <openssl/sha.h>
+#include <openssl/buffer.h>
 }
 
 namespace CocoaTweet::OAuth {
-    OAuth1::OAuth1(){
+OAuth1::OAuth1() {}
 
-    }
+OAuth1::OAuth1(const Key _key) : key_(_key) {}
 
-    OAuth1::OAuth1(const Key _key):key_(_key){
+std::map<std::string, std::string> OAuth1::signature(
-
+    const std::map<std::string, std::string>& _param, const std::string& _method,
-    }
+    const std::string& _url) {
-
-    std::map<std::string, std::string> OAuth1::signature(const std::map<std::string, std::string>& _param, const std::string& _method, const std::string& _url){
   std::vector<std::string> tmp;
   for (const auto& [key, value] : _param) {
     tmp.push_back(key + "=" + value);
+		std::cout << (key + "=" + value) << std::endl;
   }
   std::ostringstream os;
   std::copy(tmp.begin(), tmp.end(), std::ostream_iterator<std::string>(os, "&"));
@@ -33,16 +34,14 @@ namespace CocoaTweet::OAuth{
   query.erase(query.size() - std::char_traits<char>::length("&"));
 
   auto significateKey  = key().consumerSecret() + "&" + key().accessTokenSecret();
-				auto significateBase = _method + "&" + _url + "&" + query;
+  auto significateBase = _method + "&" + CocoaTweet::Util::urlEncode(_url) + "&" + CocoaTweet::Util::urlEncode(query);
-				auto result = hmacSha1(significateKey, significateBase);
+  auto k64Sha1          = hmacSha1(significateKey, significateBase);
 
   std::cout << "significate key : " << significateKey << std::endl;
   std::cout << "significate base : " << significateBase << std::endl;
-				std::cout << "hmac-sha1 : " << base64(result) << std::endl;
+  std::cout << "hmac-sha1 : " << k64Sha1 << std::endl;
 
-				auto ret = std::map<std::string, std::string>{
+  auto ret = std::map<std::string, std::string>{{"oauth_signature", CocoaTweet::Util::urlEncode(k64Sha1)}};
-					{"oauth_signature", base64(result)}
-					};
   return ret;
 }
 
@@ -59,7 +58,6 @@ namespace CocoaTweet::OAuth{
   return nonce;
 }
 
-
 const std::string OAuth1::timestamp() const {
   return std::to_string(time(nullptr));
 }
@@ -77,12 +75,10 @@ namespace CocoaTweet::OAuth{
 }
 
 std::map<std::string, std::string> OAuth1::oauthParam() const {
-				auto tmp = std::map<std::string, std::string>{
+  auto tmp = std::map<std::string, std::string>{{"oauth_nonce", nonce()},
-						{"oauth_nonce", nonce()},
                                                 {"oauth_signature_method", method()},
                                                 {"oauth_timestamp", timestamp()},
-						{"oauth_version", version()}
+                                                {"oauth_version", version()}};
-				};
   tmp.merge(key().noSecret());
 
   return tmp;
@@ -95,7 +91,6 @@ namespace CocoaTweet::OAuth{
     ss << std::bitset<8>(r);
   }
 
-
   if (_raw.length() % 3 == 1) {
     ss << "0000";
   } else if (_raw.length() % 3 == 2) {
@@ -123,9 +118,29 @@ namespace CocoaTweet::OAuth{
   unsigned char result[255];
   unsigned int length = 255;
 
-				HMAC(EVP_sha1(), reinterpret_cast<const unsigned char*>(_key.c_str()), _key.length(), reinterpret_cast<const unsigned char*>(_data.c_str()), _data.length(), result, &length);
+  HMAC(EVP_sha1(), reinterpret_cast<const unsigned char*>(_key.c_str()), _key.length(),
+       reinterpret_cast<const unsigned char*>(_data.c_str()), _data.length(), result, &length);
 
-				return std::string(reinterpret_cast<char*>(result));
+	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());
+  encoder = BIO_push(encoder,bmem);
+  BIO_write(encoder, sha1.c_str(), sha1.length());
+  BIO_flush(encoder);
+
+  BUF_MEM *bptr;
+  BIO_get_mem_ptr(encoder,&bptr);
+  
+  char *k64 = (char *)std::malloc(bptr->length);
+	std::memcpy(k64, bptr->data, bptr->length-1);
+  k64[bptr->length-1] = 0;
+  
+  BIO_free_all(encoder);
+
+  return static_cast<std::string>(k64);
 }
 
-}
+} // namespace CocoaTweet::OAuth

src/cocoatweet/oauth/oauth.h

@@ -10,7 +10,9 @@ class OAuth1{
 public:
   OAuth1();
   OAuth1(const Key _key);
-std::map<std::string, std::string> signature(const std::map<std::string, std::string>& _param, const std::string& _method, const std::string& _url);
+  std::map<std::string, std::string> signature(const std::map<std::string, std::string>& _param,
+                                               const std::string& _method,
+                                               const std::string& _url);
   const std::string nonce() const;
   const std::string timestamp() const;
   const std::string method() const;
@@ -19,12 +21,12 @@ const Key key()const;
   std::map<std::string, std::string> oauthParam() const;
   std::string hmacSha1(std::string _key, std::string _data);
   const std::string base64(const std::string& _raw);
+
 private:
   Key key_;
   const std::string SIGNATURE_METHOD_ = "HMAC-SHA1";
   const std::string OAUTH_VERSION_    = "1.0";
-
 };
-}
+} // namespace CocoaTweet::OAuth
 
 #endif