pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

enhance behavior of cookies, both cookie jars are now more properly inteconnected, cache/storage now resides under user data folder

Browse source
This commit is contained in:
Martin Rotter 2022-04-06 10:24:42 +02:00
parent fd722f6a4d
commit 7cac9d7f5b
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/librssguard/miscellaneous/application.cpp
View file

@ -151,8 +151,15 @@ Application::Application(const QString& id, int& argc, char** argv, const QStrin
#if defined(USE_WEBENGINE) #if defined(USE_WEBENGINE)
m_webFactory->urlIinterceptor()->load(); m_webFactory->urlIinterceptor()->load();
const QString web_data_root = userDataFolder() + QDir::separator() + QSL("web");
QWebEngineProfile::defaultProfile()->setCachePath(web_data_root + QDir::separator() + QSL("cache"));
QWebEngineProfile::defaultProfile()->setPersistentStoragePath(web_data_root + QDir::separator() + QSL("storage"));
QWebEngineProfile::defaultProfile()->setHttpUserAgent(QString(HTTP_COMPLETE_USERAGENT)); QWebEngineProfile::defaultProfile()->setHttpUserAgent(QString(HTTP_COMPLETE_USERAGENT));
qDebugNN << LOGSEC_NETWORK << "Persistent web data storage path:"
<< QUOTE_W_SPACE_DOT(QWebEngineProfile::defaultProfile()->persistentStoragePath());
connect(QWebEngineProfile::defaultProfile(), &QWebEngineProfile::downloadRequested, this, &Application::downloadRequested); connect(QWebEngineProfile::defaultProfile(), &QWebEngineProfile::downloadRequested, this, &Application::downloadRequested);
#endif #endif

25
src/librssguard/network-web/cookiejar.cpp
View file

@ -20,11 +20,22 @@
CookieJar::CookieJar(QObject* parent) : QNetworkCookieJar(parent) { CookieJar::CookieJar(QObject* parent) : QNetworkCookieJar(parent) {
#if defined(USE_WEBENGINE) #if defined(USE_WEBENGINE)
// WebEngine does not store cookies, CookieJar does.
QWebEngineProfile::defaultProfile()->setPersistentCookiesPolicy(QWebEngineProfile::PersistentCookiesPolicy::NoPersistentCookies); QWebEngineProfile::defaultProfile()->setPersistentCookiesPolicy(QWebEngineProfile::PersistentCookiesPolicy::NoPersistentCookies);
m_webEngineCookies = QWebEngineProfile::defaultProfile()->cookieStore(); m_webEngineCookies = QWebEngineProfile::defaultProfile()->cookieStore();
#endif
// Load all cookies and also set them into WebEngine store.
loadCookies();
#if defined(USE_WEBENGINE)
// When cookies change in WebEngine, then change in main cookie jar too. // When cookies change in WebEngine, then change in main cookie jar too.
//
// Also, the synchronization between WebEngine cookie jar and main cookie jar is this:
// - On app startup, both jars are synchronized to have same cookies.
// - If cookies change in WebEngine jar, the change is propagated to main jar.
// - If cookies change in main jar, cookies are NOT propagated to WebEngine jar.
connect(m_webEngineCookies, &QWebEngineCookieStore::cookieAdded, this, [=](const QNetworkCookie& cookie) { connect(m_webEngineCookies, &QWebEngineCookieStore::cookieAdded, this, [=](const QNetworkCookie& cookie) {
insertCookieInternal(cookie, false, true); insertCookieInternal(cookie, false, true);
}); });
@ -32,8 +43,6 @@ CookieJar::CookieJar(QObject* parent) : QNetworkCookieJar(parent) {
deleteCookieInternal(cookie, false); deleteCookieInternal(cookie, false);
}); });
#endif #endif
loadCookies();
} }
QList<QNetworkCookie> CookieJar::extractCookiesFromUrl(const QString& url) { QList<QNetworkCookie> CookieJar::extractCookiesFromUrl(const QString& url) {
@ -125,7 +134,7 @@ bool CookieJar::insertCookieInternal(const QNetworkCookie& cookie, bool notify_o
#if defined(USE_WEBENGINE) #if defined(USE_WEBENGINE)
if (notify_others) { if (notify_others) {
//m_webEngineCookies->setCookie(cookie); m_webEngineCookies->setCookie(cookie);
} }
#else #else
Q_UNUSED(notify_others) Q_UNUSED(notify_others)
@ -143,7 +152,7 @@ bool CookieJar::updateCookieInternal(const QNetworkCookie& cookie, bool notify_o
#if defined(USE_WEBENGINE) #if defined(USE_WEBENGINE)
if (notify_others) { if (notify_others) {
//m_webEngineCookies->setCookie(cookie); m_webEngineCookies->setCookie(cookie);
} }
#else #else
Q_UNUSED(notify_others) Q_UNUSED(notify_others)
@ -161,7 +170,7 @@ bool CookieJar::deleteCookieInternal(const QNetworkCookie& cookie, bool notify_o
#if defined(USE_WEBENGINE) #if defined(USE_WEBENGINE)
if (notify_others) { if (notify_others) {
//m_webEngineCookies->deleteCookie(cookie); m_webEngineCookies->deleteCookie(cookie);
} }
#else #else
Q_UNUSED(notify_others) Q_UNUSED(notify_others)
@ -172,13 +181,13 @@ bool CookieJar::deleteCookieInternal(const QNetworkCookie& cookie, bool notify_o
} }
bool CookieJar::insertCookie(const QNetworkCookie& cookie) { bool CookieJar::insertCookie(const QNetworkCookie& cookie) {
return insertCookieInternal(cookie, true, true); return insertCookieInternal(cookie, false, true);
} }
bool CookieJar::deleteCookie(const QNetworkCookie& cookie) { bool CookieJar::deleteCookie(const QNetworkCookie& cookie) {
return deleteCookieInternal(cookie, true); return deleteCookieInternal(cookie, false);
} }
bool CookieJar::updateCookie(const QNetworkCookie& cookie) { bool CookieJar::updateCookie(const QNetworkCookie& cookie) {
return updateCookieInternal(cookie, true); return updateCookieInternal(cookie, false);
} }