Skip to content

Include all oauth_ headers in authorization header #31

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

Open
ewencp wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Include all oauth_ headers in authorization header #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 9 additions & 16 deletions src/liboauthcpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ namespace Defaults
/* Constants */
const int BUFFSIZE = 1024;
const int BUFFSIZE_LARGE = 1024;

const std::string OAUTH_PARAMETER_PREFIX = "oauth_";

const std::string CONSUMERKEY_KEY = "oauth_consumer_key";
const std::string CALLBACK_KEY = "oauth_callback";
const std::string VERSION_KEY = "oauth_version";
Expand Down Expand Up @@ -506,7 +509,7 @@ std::string Client::buildOAuthParameterString(
// request type.
std::string nonce;
std::string timeStamp;

generateNonceTimeStamp(nonce, timeStamp);

/* Build key-value pairs needed for OAuth request token, without signature */
Expand All @@ -523,21 +526,11 @@ std::string Client::buildOAuthParameterString(
*/
if (string_type == AuthorizationHeaderString) {
KeyValuePairs oauthKeyValuePairs;
std::vector<std::string> oauth_keys;
oauth_keys.push_back(Defaults::CONSUMERKEY_KEY);
oauth_keys.push_back(Defaults::NONCE_KEY);
oauth_keys.push_back(Defaults::SIGNATURE_KEY);
oauth_keys.push_back(Defaults::SIGNATUREMETHOD_KEY);
oauth_keys.push_back(Defaults::TIMESTAMP_KEY);
oauth_keys.push_back(Defaults::TOKEN_KEY);
oauth_keys.push_back(Defaults::VERIFIER_KEY);
oauth_keys.push_back(Defaults::VERSION_KEY);

for(size_t i = 0; i < oauth_keys.size(); i++) {
assert(rawKeyValuePairs.count(oauth_keys[i]) <= 1);
KeyValuePairs::iterator oauth_key_it = rawKeyValuePairs.find(oauth_keys[i]);
if (oauth_key_it != rawKeyValuePairs.end())
ReplaceOrInsertKeyValuePair(oauthKeyValuePairs, oauth_keys[i], oauth_key_it->second);
for(KeyValuePairs::iterator oauth_keys_it = rawKeyValuePairs.begin(); oauth_keys_it != rawKeyValuePairs.end(); oauth_keys_it++) {
if (oauth_keys_it->first.substr(0, Defaults::OAUTH_PARAMETER_PREFIX.size()) == Defaults::OAUTH_PARAMETER_PREFIX) {
assert(rawKeyValuePairs.count(oauth_keys_it->first) <= 1);
ReplaceOrInsertKeyValuePair(oauthKeyValuePairs, oauth_keys_it->first, oauth_keys_it->second);
}
}
getStringFromOAuthKeyValuePairs( oauthKeyValuePairs, rawParams, separator );
}
Expand Down