FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
Martin Rotter 2021-02-08 15:53:01 +01:00
parent 455a07ad83
commit 641b089830
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/librssguard/network-web/oauthhttphandler.cpp
View File

@ -13,7 +13,9 @@
OAuthHttpHandler::OAuthHttpHandler(const QString& success_text, QObject* parent) OAuthHttpHandler::OAuthHttpHandler(const QString& success_text, QObject* parent)
: QObject(parent), m_listenAddress(QHostAddress()), m_listenPort(0), m_successText(success_text) { : QObject(parent), m_listenAddress(QHostAddress()), m_listenPort(0), m_successText(success_text) {
connect(&m_httpServer, &QTcpServer::newConnection, this, &OAuthHttpHandler::clientConnected); connect(&m_httpServer, &QTcpServer::newConnection, this, &OAuthHttpHandler::clientConnected);
setListenAddressPort(QString(OAUTH_REDIRECT_URI) + QL1C(':') + QString::number(OAUTH_REDIRECT_URI_PORT));
// NOTE: We do not want to start handler immediately, sometimes
// we want to start it later, perhaps when correct redirect URL/port comes in.
} }
OAuthHttpHandler::~OAuthHttpHandler() { OAuthHttpHandler::~OAuthHttpHandler() {
@ -39,14 +41,13 @@ void OAuthHttpHandler::setListenAddressPort(const QString& full_uri) {
listen_address = QHostAddress(url.host()); listen_address = QHostAddress(url.host());
} }
if (listen_address == m_listenAddress && m_listenPort == url.port()) { if (listen_address == m_listenAddress &&
m_listenPort == url.port() &&
m_httpServer.isListening()) {
// NOTE: We do not need to change listener's settings or re-start it.
return; return;
} }
m_listenAddress = listen_address;
m_listenPort = listen_port;
m_listenAddressPort = full_uri;
if (m_httpServer.isListening()) { if (m_httpServer.isListening()) {
qWarningNN << LOGSEC_OAUTH << "Redirection OAuth handler is listening. Stopping it now."; qWarningNN << LOGSEC_OAUTH << "Redirection OAuth handler is listening. Stopping it now.";
m_httpServer.close(); m_httpServer.close();
@ -60,6 +61,10 @@ void OAuthHttpHandler::setListenAddressPort(const QString& full_uri) {
<< QUOTE_W_SPACE_DOT(m_listenPort); << QUOTE_W_SPACE_DOT(m_listenPort);
} }
else { else {
m_listenAddress = listen_address;
m_listenPort = listen_port;
m_listenAddressPort = full_uri;
qDebugNN << LOGSEC_OAUTH qDebugNN << LOGSEC_OAUTH
<< "OAuth redirect handler IS LISTENING on address" << "OAuth redirect handler IS LISTENING on address"
<< QUOTE_W_SPACE(m_listenAddress.toString()) << QUOTE_W_SPACE(m_listenAddress.toString())