Files
@ f328e80a974a
Branch filter:
Location: libtransport.git/libtransport/OAuth2.cpp
f328e80a974a
3.5 KiB
text/x-c++hdr
Fix possible double free in ThreadPool
This makes HTTPRequestTest::GETThreadPool test pass deterministicaly.
Problem was static slot used to cleanup threads. When ThreadPool was instantiated
multiple times, threads were also clened up multiple times resulting in segfault.
This makes HTTPRequestTest::GETThreadPool test pass deterministicaly.
Problem was static slot used to cleanup threads. When ThreadPool was instantiated
multiple times, threads were also clened up multiple times resulting in segfault.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 | /**
* libtransport -- C++ library for easy XMPP Transports development
*
* Copyright (C) 2011, Jan Kaluza <hanzz.k@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
#include "transport/OAuth2.h"
#include "transport/Config.h"
#include "transport/Util.h"
#include "transport/HTTPRequest.h"
#include "transport/Logging.h"
#include <boost/foreach.hpp>
#include <iostream>
#include <iterator>
#include <algorithm>
#include <boost/algorithm/string.hpp>
#include <boost/numeric/conversion/cast.hpp>
#include <boost/uuid/uuid.hpp>
#include <boost/uuid/uuid_generators.hpp>
#include <boost/uuid/uuid_io.hpp>
namespace Transport {
DEFINE_LOGGER(logger, "OAuth2");
OAuth2::OAuth2(const std::string &clientId, const std::string &clientSecret,
const std::string &authURL, const std::string &tokenURL,
const std::string &redirectURL, const std::string &scope)
: m_clientId(clientId), m_clientSecret(clientSecret),
m_authURL(authURL), m_tokenURL(tokenURL),
m_redirectURL(redirectURL), m_scope(scope) {
}
OAuth2::~OAuth2() {
}
std::string OAuth2::generateAuthURL() {
std::string url = m_authURL + "?";
url += "client_id=" + Util::urlencode(m_clientId);
if (!m_scope.empty()) {
url += "&scope=" + Util::urlencode(m_scope);
}
if (!m_redirectURL.empty()) {
url += "&redirect_uri=" + Util::urlencode(m_redirectURL);
}
boost::uuids::uuid uuid = boost::uuids::random_generator()();
m_state = boost::lexical_cast<std::string>(uuid);
url += "&state=" + Util::urlencode(m_state);
return url;
}
std::string OAuth2::requestToken(const std::string &code, std::string &token, std::string &bot_token) {
std::string url = m_tokenURL + "?";
url += "client_id=" + Util::urlencode(m_clientId);
url += "&client_secret=" + Util::urlencode(m_clientSecret);
url += "&code=" + Util::urlencode(code);
if (!m_redirectURL.empty()) {
url += "&redirect_uri=" + Util::urlencode(m_redirectURL);
}
rapidjson::Document resp;
HTTPRequest req(HTTPRequest::Get, url);
if (!req.execute(resp)) {
LOG4CXX_ERROR(logger, url);
LOG4CXX_ERROR(logger, req.getError());
return req.getError();
}
LOG4CXX_ERROR(logger, req.getRawData());
rapidjson::Value& access_token = resp["access_token"];
if (!access_token.IsString()) {
LOG4CXX_ERROR(logger, "No 'access_token' object in the reply.");
LOG4CXX_ERROR(logger, url);
LOG4CXX_ERROR(logger, req.getRawData());
return "No 'access_token' object in the reply.";
}
token = access_token.GetString();
if (token.empty()) {
LOG4CXX_ERROR(logger, "Empty 'access_token' object in the reply.");
LOG4CXX_ERROR(logger, url);
LOG4CXX_ERROR(logger, req.getRawData());
return "Empty 'access_token' object in the reply.";
}
rapidjson::Value& bot = resp["bot"];
if (bot.IsObject()) {
rapidjson::Value& bot_access_token = bot["bot_access_token"];
if (bot_access_token.IsString()) {
bot_token = bot_access_token.GetString();
}
}
return "";
}
}
|