FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

work on #909

This commit is contained in:
Martin Rotter 2023-03-16 15:02:06 +01:00
parent 291a60ee82
commit eeedf8b1a5
18 changed files with 214 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/librssguard/database/databasequeries.cpp
View File

@ -60,7 +60,6 @@ QVariantHash DatabaseQueries::deserializeCustomData(const QString& data) {
}
else {
auto json = QJsonDocument::fromJson(data.toUtf8());
auto json_obj = json.object();
return json.object().toVariantHash();
}

30
src/librssguard/network-web/networkfactory.cpp
View File

@ -44,16 +44,30 @@ QStringList NetworkFactory::extractFeedLinksFromHtmlPage(const QUrl& url, const
return feeds;
}
QPair<QByteArray, QByteArray> NetworkFactory::generateBasicAuthHeader(const QString& username,
QPair<QByteArray, QByteArray> NetworkFactory::generateBasicAuthHeader(Feed::Protection protection,
const QString& username,
const QString& password) {
if (username.isEmpty()) {
return QPair<QByteArray, QByteArray>(QByteArray(), QByteArray());
}
else {
QString basic_value = username + QSL(":") + password;
QString header_value = QSL("Basic ") + QString(basic_value.toUtf8().toBase64());
switch (protection) {
case Feed::Protection::NoProtection:
return {};
return QPair<QByteArray, QByteArray>(HTTP_HEADERS_AUTHORIZATION, header_value.toLocal8Bit());
case Feed::Protection::BasicProtection: {
if (username.isEmpty()) {
return {};
}
else {
QString basic_value = username + QSL(":") + password;
QString header_value = QSL("Basic ") + QString(basic_value.toUtf8().toBase64());
return QPair<QByteArray, QByteArray>(HTTP_HEADERS_AUTHORIZATION, header_value.toLocal8Bit());
}
}
case Feed::Protection::TokenProtection: {
QString header_value = QSL("Bearer ") + username;
return QPair<QByteArray, QByteArray>(HTTP_HEADERS_AUTHORIZATION, header_value.toLocal8Bit());
}
}
}

6
src/librssguard/network-web/networkfactory.h
View File

@ -5,6 +5,8 @@
#include "network-web/httpresponse.h"
#include "services/abstract/feed.h"
#include <QCoreApplication>
#include <QHttpPart>
#include <QNetworkCookie>
@ -37,7 +39,9 @@ class NetworkFactory {
public:
static QStringList extractFeedLinksFromHtmlPage(const QUrl& url, const QString& html);
static QPair<QByteArray, QByteArray> generateBasicAuthHeader(const QString& username, const QString& password);
static QPair<QByteArray, QByteArray> generateBasicAuthHeader(Feed::Protection protection,
const QString& username,
const QString& password);
// Returns human readable text for given network error.
static QString networkErrorText(QNetworkReply::NetworkError error_code);

8
src/librssguard/network-web/oauth2service.cpp
View File

@ -175,7 +175,9 @@ void OAuth2Service::retrieveAccessToken(const QString& auth_code) {
network_request.setHeader(QNetworkRequest::KnownHeaders::ContentTypeHeader, "application/x-www-form-urlencoded");
if (m_useHttpBasicAuthWithClientData) {
auto basic_auth = NetworkFactory::generateBasicAuthHeader(properClientId(), properClientSecret());
auto basic_auth = NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection,
properClientId(),
properClientSecret());
network_request.setRawHeader(basic_auth.first, basic_auth.second);
}
@ -203,7 +205,9 @@ void OAuth2Service::refreshAccessToken(const QString& refresh_token) {
network_request.setHeader(QNetworkRequest::KnownHeaders::ContentTypeHeader, "application/x-www-form-urlencoded");
if (m_useHttpBasicAuthWithClientData) {
auto basic_auth = NetworkFactory::generateBasicAuthHeader(properClientId(), properClientSecret());
auto basic_auth = NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection,
properClientId(),
properClientSecret());
network_request.setRawHeader(basic_auth.first, basic_auth.second);
}

2
src/librssguard/services/abstract/feed.h
View File

@ -19,6 +19,8 @@ class Feed : public RootItem {
// Specifies the auto-download strategy for the feed.
enum class AutoUpdateType { DontAutoUpdate = 0, DefaultAutoUpdate = 1, SpecificAutoUpdate = 2 };
enum class Protection { NoProtection = 0, BasicProtection = 1, TokenProtection = 2 };
// Specifies the actual "status" of the feed.
// For example if it has new messages, error
// occurred, and so on.

63
src/librssguard/services/abstract/gui/authenticationdetails.cpp
View File

@ -2,7 +2,7 @@
#include "services/abstract/gui/authenticationdetails.h"
AuthenticationDetails::AuthenticationDetails(QWidget* parent) : QWidget(parent) {
AuthenticationDetails::AuthenticationDetails(bool only_basic, QWidget* parent) : QWidget(parent) {
setupUi(this);
// Set text boxes.
@ -12,37 +12,64 @@ AuthenticationDetails::AuthenticationDetails(QWidget* parent) : QWidget(parent)
m_txtPassword->lineEdit()->setPlaceholderText(tr("Password"));
m_txtPassword->lineEdit()->setToolTip(tr("Set password to access the feed."));
m_cbAuthType->addItem(tr("No authentication"), QVariant::fromValue(Feed::Protection::NoProtection));
m_cbAuthType->addItem(tr("HTTP Basic"), QVariant::fromValue(Feed::Protection::BasicProtection));
if (!only_basic) {
m_cbAuthType->addItem(tr("Token"), QVariant::fromValue(Feed::Protection::TokenProtection));
}
connect(m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &AuthenticationDetails::onUsernameChanged);
connect(m_txtPassword->lineEdit(), &BaseLineEdit::textChanged, this, &AuthenticationDetails::onPasswordChanged);
connect(m_gbAuthentication, &QGroupBox::toggled, this, &AuthenticationDetails::onAuthenticationSwitched);
connect(m_cbAuthType, &QComboBox::currentIndexChanged, this, &AuthenticationDetails::onAuthenticationSwitched);
onUsernameChanged(QString());
onPasswordChanged(QString());
onAuthenticationSwitched();
}
void AuthenticationDetails::setAuthenticationType(Feed::Protection protect) {
auto fnd = m_cbAuthType->findData(QVariant::fromValue(protect));
if (fnd >= 0) {
m_cbAuthType->setCurrentIndex(fnd);
}
}
Feed::Protection AuthenticationDetails::authenticationType() const {
return m_cbAuthType->currentData().value<Feed::Protection>();
}
void AuthenticationDetails::onUsernameChanged(const QString& new_username) {
bool is_username_ok = !m_gbAuthentication->isChecked() || !new_username.simplified().isEmpty();
bool is_username_ok = authenticationType() == Feed::Protection::NoProtection || !new_username.simplified().isEmpty();
m_txtUsername->setStatus(is_username_ok ?
LineEditWithStatus::StatusType::Ok :
LineEditWithStatus::StatusType::Warning,
is_username_ok ?
tr("Username is ok or it is not needed.") :
tr("Username is empty."));
m_txtUsername->setStatus(is_username_ok ? LineEditWithStatus::StatusType::Ok
: LineEditWithStatus::StatusType::Warning,
is_username_ok ? tr("Username/token is ok or it is not needed.")
: tr("Username/token is empty."));
}
void AuthenticationDetails::onPasswordChanged(const QString& new_password) {
bool is_password_ok = !m_gbAuthentication->isChecked() || !new_password.simplified().isEmpty();
bool is_password_ok = authenticationType() == Feed::Protection::NoProtection || !new_password.simplified().isEmpty();
m_txtPassword->setStatus(is_password_ok ?
LineEditWithStatus::StatusType::Ok :
LineEditWithStatus::StatusType::Warning,
is_password_ok ?
tr("Password is ok or it is not needed.") :
tr("Password is empty."));
m_txtPassword->setStatus(is_password_ok ? LineEditWithStatus::StatusType::Ok
: LineEditWithStatus::StatusType::Warning,
is_password_ok ? tr("Password is ok or it is not needed.") : tr("Password is empty."));
}
void AuthenticationDetails::onAuthenticationSwitched() {
onUsernameChanged(m_txtUsername->lineEdit()->text());
onPasswordChanged(m_txtPassword->lineEdit()->text());
auto prot = authenticationType();
m_lblPassword->setVisible(prot != Feed::Protection::TokenProtection);
m_txtPassword->setVisible(prot != Feed::Protection::TokenProtection);
if (prot == Feed::Protection::TokenProtection) {
m_lblUsername->setText(tr("Access token"));
}
else {
m_lblUsername->setText(tr("Username"));
}
m_gbAuthentication->setEnabled(prot != Feed::Protection::NoProtection);
}

9
src/librssguard/services/abstract/gui/authenticationdetails.h
View File

@ -7,11 +7,16 @@
#include "ui_authenticationdetails.h"
#include "services/abstract/feed.h"
class AuthenticationDetails : public QWidget, public Ui::AuthenticationDetails {
Q_OBJECT
Q_OBJECT
public:
explicit AuthenticationDetails(QWidget* parent = nullptr);
explicit AuthenticationDetails(bool only_basic, QWidget* parent = nullptr);
void setAuthenticationType(Feed::Protection protect);
Feed::Protection authenticationType() const;
private slots:
void onUsernameChanged(const QString& new_username);

28
src/librssguard/services/abstract/gui/authenticationdetails.ui
View File

@ -14,26 +14,23 @@
<string>Form</string>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0" colspan="2">
<item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="m_gbAuthentication">
<property name="toolTip">
<string>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</string>
</property>
<property name="title">
<string>Requires HTTP authentication</string>
<string>Credentials</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<widget class="QLabel" name="m_lblUsername">
<property name="text">
<string>Username</string>
</property>
@ -46,7 +43,7 @@
<widget class="LineEditWithStatus" name="m_txtUsername" native="true"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_5">
<widget class="QLabel" name="m_lblPassword">
<property name="text">
<string>Password</string>
</property>
@ -61,6 +58,19 @@
</layout>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Authentication type</string>
</property>
<property name="buddy">
<cstring>m_cbAuthType</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="m_cbAuthType"/>
</item>
</layout>
</widget>
<customwidgets>
@ -71,6 +81,10 @@
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>m_cbAuthType</tabstop>
<tabstop>m_gbAuthentication</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

21
src/librssguard/services/owncloud/owncloudnetworkfactory.cpp
View File

@ -79,7 +79,7 @@ OwnCloudStatusResponse OwnCloudNetworkFactory::status(const QNetworkProxy& custo
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, OWNCLOUD_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
NetworkResult network_reply =
NetworkFactory::performNetworkOperation(m_urlStatus,
@ -111,7 +111,7 @@ OwnCloudGetFeedsCategoriesResponse OwnCloudNetworkFactory::feedsCategories(const
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, OWNCLOUD_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
NetworkResult network_reply =
NetworkFactory::performNetworkOperation(m_urlFolders,
@ -166,7 +166,7 @@ bool OwnCloudNetworkFactory::deleteFeed(const QString& feed_id, const QNetworkPr
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, OWNCLOUD_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
NetworkResult network_reply =
NetworkFactory::performNetworkOperation(final_url,
@ -210,7 +210,7 @@ bool OwnCloudNetworkFactory::createFeed(const QString& url, int parent_id, const
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, OWNCLOUD_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
NetworkResult network_reply =
NetworkFactory::performNetworkOperation(m_urlFeeds,
@ -248,7 +248,7 @@ bool OwnCloudNetworkFactory::renameFeed(const QString& new_name,
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, OWNCLOUD_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
NetworkResult network_reply =
NetworkFactory::performNetworkOperation(final_url,
@ -287,7 +287,7 @@ OwnCloudGetMessagesResponse OwnCloudNetworkFactory::getMessages(int feed_id, con
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, OWNCLOUD_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
NetworkResult network_reply =
NetworkFactory::performNetworkOperation(final_url,
@ -318,7 +318,7 @@ QNetworkReply::NetworkError OwnCloudNetworkFactory::triggerFeedUpdate(int feed_i
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, OWNCLOUD_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
NetworkResult network_reply =
NetworkFactory::performNetworkOperation(m_urlFeedsUpdate.arg(authUsername(), QString::number(feed_id)),
@ -365,7 +365,7 @@ NetworkResult OwnCloudNetworkFactory::markMessagesRead(RootItem::ReadStatus stat
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, OWNCLOUD_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
QByteArray output;
@ -411,7 +411,7 @@ NetworkResult OwnCloudNetworkFactory::markMessagesStarred(RootItem::Importance i
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, OWNCLOUD_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
QByteArray output;
@ -614,7 +614,8 @@ QList<Message> OwnCloudGetMessagesResponse::messages() const {
enclosure.m_mimeType = QSL("image/png");
}
if (!message_map[QSL("enclosureMime")].toString().isEmpty() || !enclosure_link.startsWith(QSL("https://www.youtube.com/v/"))) {
if (!message_map[QSL("enclosureMime")].toString().isEmpty() ||
!enclosure_link.startsWith(QSL("https://www.youtube.com/v/"))) {
msg.m_enclosures.append(enclosure);
}
}

37
src/librssguard/services/standard/gui/formstandardfeeddetails.cpp
View File

@ -22,18 +22,25 @@
#include <QNetworkCookie>
#include <QTextCodec>
FormStandardFeedDetails::FormStandardFeedDetails(ServiceRoot* service_root, RootItem* parent_to_select,
const QString& url, QWidget* parent)
FormStandardFeedDetails::FormStandardFeedDetails(ServiceRoot* service_root,
RootItem* parent_to_select,
const QString& url,
QWidget* parent)
: FormFeedDetails(service_root, parent), m_standardFeedDetails(new StandardFeedDetails(this)),
m_authDetails(new AuthenticationDetails(this)), m_parentToSelect(parent_to_select), m_urlToProcess(url) {
m_authDetails(new AuthenticationDetails(false, this)), m_parentToSelect(parent_to_select), m_urlToProcess(url) {
insertCustomTab(m_standardFeedDetails, tr("General"), 0);
insertCustomTab(m_authDetails, tr("Network"), 2);
activateTab(0);
connect(m_standardFeedDetails->m_ui.m_btnFetchMetadata, &QPushButton::clicked, this, &FormStandardFeedDetails::guessFeed);
connect(m_standardFeedDetails->m_ui.m_btnFetchMetadata,
&QPushButton::clicked,
this,
&FormStandardFeedDetails::guessFeed);
connect(m_standardFeedDetails->m_actionFetchIcon, &QAction::triggered, this, &FormStandardFeedDetails::guessIconOnly);
connect(m_standardFeedDetails->m_ui.m_txtTitle->lineEdit(), &QLineEdit::textChanged,
this, &FormStandardFeedDetails::onTitleChanged);
connect(m_standardFeedDetails->m_ui.m_txtTitle->lineEdit(),
&QLineEdit::textChanged,
this,
&FormStandardFeedDetails::onTitleChanged);
onTitleChanged(m_standardFeedDetails->m_ui.m_txtTitle->lineEdit()->text());
}
@ -42,6 +49,7 @@ void FormStandardFeedDetails::guessFeed() {
m_standardFeedDetails->guessFeed(m_standardFeedDetails->sourceType(),
m_standardFeedDetails->m_ui.m_txtSource->textEdit()->toPlainText(),
m_standardFeedDetails->m_ui.m_txtPostProcessScript->textEdit()->toPlainText(),
m_authDetails->authenticationType(),
m_authDetails->m_txtUsername->lineEdit()->text(),
m_authDetails->m_txtPassword->lineEdit()->text(),
m_serviceRoot->networkProxy());
@ -51,6 +59,7 @@ void FormStandardFeedDetails::guessIconOnly() {
m_standardFeedDetails->guessIconOnly(m_standardFeedDetails->sourceType(),
m_standardFeedDetails->m_ui.m_txtSource->textEdit()->toPlainText(),
m_standardFeedDetails->m_ui.m_txtPostProcessScript->textEdit()->toPlainText(),
m_authDetails->authenticationType(),
m_authDetails->m_txtUsername->lineEdit()->text(),
m_authDetails->m_txtPassword->lineEdit()->text(),
m_serviceRoot->networkProxy());
@ -65,11 +74,14 @@ void FormStandardFeedDetails::apply() {
auto* std_feed = feed<StandardFeed>();
RootItem* parent =
static_cast<RootItem*>(m_standardFeedDetails->m_ui.m_cmbParentCategory->itemData(
m_standardFeedDetails->m_ui.m_cmbParentCategory->currentIndex()).value<void*>());
static_cast<RootItem*>(m_standardFeedDetails->m_ui.m_cmbParentCategory
->itemData(m_standardFeedDetails->m_ui.m_cmbParentCategory->currentIndex())
.value<void*>());
StandardFeed::Type type =
static_cast<StandardFeed::Type>(m_standardFeedDetails->m_ui.m_cmbType->itemData(m_standardFeedDetails->m_ui.m_cmbType->currentIndex()).value<int>());
static_cast<StandardFeed::Type>(m_standardFeedDetails->m_ui.m_cmbType
->itemData(m_standardFeedDetails->m_ui.m_cmbType->currentIndex())
.value<int>());
// Setup data for new_feed.
std_feed->setTitle(m_standardFeedDetails->m_ui.m_txtTitle->lineEdit()->text().simplified());
@ -83,7 +95,8 @@ void FormStandardFeedDetails::apply() {
std_feed->setType(type);
std_feed->setSourceType(m_standardFeedDetails->sourceType());
std_feed->setPostProcessScript(m_standardFeedDetails->m_ui.m_txtPostProcessScript->textEdit()->toPlainText());
std_feed->setPasswordProtected(m_authDetails->m_gbAuthentication->isChecked());
std_feed->setProtection(m_authDetails->authenticationType());
std_feed->setUsername(m_authDetails->m_txtUsername->lineEdit()->text());
std_feed->setPassword(m_authDetails->m_txtPassword->lineEdit()->text());
@ -97,7 +110,7 @@ void FormStandardFeedDetails::apply() {
}
m_serviceRoot->requestItemReassignment(m_feed, parent);
m_serviceRoot->itemChanged({ m_feed });
m_serviceRoot->itemChanged({m_feed});
}
void FormStandardFeedDetails::loadFeedData() {
@ -108,7 +121,7 @@ void FormStandardFeedDetails::loadFeedData() {
// Load categories.
m_standardFeedDetails->loadCategories(m_serviceRoot->getSubTreeCategories(), m_serviceRoot);
m_authDetails->m_gbAuthentication->setChecked(std_feed->passwordProtected());
m_authDetails->setAuthenticationType(std_feed->protection());
m_authDetails->m_txtUsername->lineEdit()->setText(std_feed->username());
m_authDetails->m_txtPassword->lineEdit()->setText(std_feed->password());

6
src/librssguard/services/standard/gui/standardfeeddetails.cpp
View File

@ -131,12 +131,13 @@ StandardFeedDetails::StandardFeedDetails(QWidget* parent) : QWidget(parent) {
void StandardFeedDetails::guessIconOnly(StandardFeed::SourceType source_type,
const QString& source,
const QString& post_process_script,
Feed::Protection protection,
const QString& username,
const QString& password,
const QNetworkProxy& custom_proxy) {
try {
StandardFeed* metadata =
StandardFeed::guessFeed(source_type, source, post_process_script, username, password, custom_proxy);
StandardFeed::guessFeed(source_type, source, post_process_script, protection, username, password, custom_proxy);
// Icon or whole feed was guessed.
m_ui.m_btnIcon->setIcon(metadata->icon());
@ -167,12 +168,13 @@ void StandardFeedDetails::guessIconOnly(StandardFeed::SourceType source_type,
void StandardFeedDetails::guessFeed(StandardFeed::SourceType source_type,
const QString& source,
const QString& post_process_script,
Feed::Protection protection,
const QString& username,
const QString& password,
const QNetworkProxy& custom_proxy) {
try {
StandardFeed* metadata =
StandardFeed::guessFeed(source_type, source, post_process_script, username, password, custom_proxy);
StandardFeed::guessFeed(source_type, source, post_process_script, protection, username, password, custom_proxy);
// Icon or whole feed was guessed.
m_ui.m_btnIcon->setIcon(metadata->icon());

2
src/librssguard/services/standard/gui/standardfeeddetails.h
View File

@ -28,12 +28,14 @@ class StandardFeedDetails : public QWidget {
void guessIconOnly(StandardFeed::SourceType source_type,
const QString& source,
const QString& post_process_script,
Feed::Protection protection,
const QString& username,
const QString& password,
const QNetworkProxy& custom_proxy = QNetworkProxy::ProxyType::DefaultProxy);
void guessFeed(StandardFeed::SourceType source_type,
const QString& source,
const QString& post_process_script,
Feed::Protection protection,
const QString& username,
const QString& password,
const QNetworkProxy& custom_proxy = QNetworkProxy::ProxyType::DefaultProxy);

21
src/librssguard/services/standard/standardfeed.cpp
View File

@ -42,7 +42,7 @@ StandardFeed::StandardFeed(RootItem* parent_item) : Feed(parent_item) {
m_sourceType = SourceType::Url;
m_encoding = m_postProcessScript = QString();
m_passwordProtected = false;
m_protection = Protection::NoProtection;
m_username = QString();
m_password = QString();
}
@ -52,7 +52,7 @@ StandardFeed::StandardFeed(const StandardFeed& other) : Feed(other) {
m_postProcessScript = other.postProcessScript();
m_sourceType = other.sourceType();
m_encoding = other.encoding();
m_passwordProtected = other.passwordProtected();
m_protection = other.protection();
m_username = other.username();
m_password = other.password();
}
@ -95,12 +95,12 @@ bool StandardFeed::deleteViaGui() {
}
}
bool StandardFeed::passwordProtected() const {
return m_passwordProtected;
StandardFeed::Protection StandardFeed::protection() const {
return m_protection;
}
void StandardFeed::setPasswordProtected(bool passwordProtected) {
m_passwordProtected = passwordProtected;
void StandardFeed::setProtection(Protection protect) {
m_protection = protect;
}
QString StandardFeed::username() const {
@ -126,7 +126,7 @@ QVariantHash StandardFeed::customDatabaseData() const {
data[QSL("type")] = int(type());
data[QSL("encoding")] = encoding();
data[QSL("post_process")] = postProcessScript();
data[QSL("protected")] = passwordProtected();
data[QSL("protected")] = int(protection());
data[QSL("username")] = username();
data[QSL("password")] = TextFactory::encrypt(password());
@ -138,7 +138,7 @@ void StandardFeed::setCustomDatabaseData(const QVariantHash& data) {
setType(Type(data[QSL("type")].toInt()));
setEncoding(data[QSL("encoding")].toString());
setPostProcessScript(data[QSL("post_process")].toString());
setPasswordProtected(data[QSL("protected")].toBool());
setProtection(Protection(data[QSL("protected")].toInt()));
setUsername(data[QSL("username")].toString());
setPassword(TextFactory::decrypt(data[QSL("password")].toString()));
}
@ -184,6 +184,7 @@ void StandardFeed::fetchMetadataForItself() {
StandardFeed* metadata = guessFeed(sourceType(),
source(),
postProcessScript(),
protection(),
username(),
password(),
getParentServiceRoot()->networkProxy());
@ -230,6 +231,7 @@ void StandardFeed::setSourceType(SourceType source_type) {
StandardFeed* StandardFeed::guessFeed(StandardFeed::SourceType source_type,
const QString& source,
const QString& post_process_script,
Feed::Protection protection,
const QString& username,
const QString& password,
const QNetworkProxy& custom_proxy) {
@ -238,7 +240,8 @@ StandardFeed* StandardFeed::guessFeed(StandardFeed::SourceType source_type,
QString content_type;
if (source_type == StandardFeed::SourceType::Url) {
QList<QPair<QByteArray, QByteArray>> headers = {NetworkFactory::generateBasicAuthHeader(username, password)};
QList<QPair<QByteArray, QByteArray>> headers = {
NetworkFactory::generateBasicAuthHeader(protection, username, password)};
NetworkResult network_result =
NetworkFactory::performNetworkOperation(source,
timeout,

26
src/librssguard/services/standard/standardfeed.h
View File

@ -17,21 +17,17 @@ class StandardServiceRoot;
// Represents BASE class for feeds contained in FeedsModel.
// NOTE: This class should be derived to create PARTICULAR feed types.
class StandardFeed : public Feed {
Q_OBJECT
Q_OBJECT
friend class StandardCategory;
friend class StandardCategory;
public:
enum class SourceType {
Url = 0,
Script = 1,
LocalFile = 2
};
enum class SourceType { Url = 0, Script = 1, LocalFile = 2 };
enum class Type {
Rss0X = 0,
Rss2X = 1,
Rdf = 2, // Sometimes denoted as RSS 1.0.
Rdf = 2, // Sometimes denoted as RSS 1.0.
Atom10 = 3,
Json = 4
};
@ -62,8 +58,8 @@ class StandardFeed : public Feed {
QString postProcessScript() const;
void setPostProcessScript(const QString& post_process_script);
bool passwordProtected() const;
void setPasswordProtected(bool passwordProtected);
Protection protection() const;
void setProtection(Protection protect);
QString username() const;
void setUsername(const QString& username);
@ -79,6 +75,7 @@ class StandardFeed : public Feed {
static StandardFeed* guessFeed(SourceType source_type,
const QString& url,
const QString& post_process_script,
Protection protection,
const QString& username = QString(),
const QString& password = QString(),
const QNetworkProxy& custom_proxy = QNetworkProxy::ProxyType::DefaultProxy);
@ -93,8 +90,11 @@ class StandardFeed : public Feed {
static QString postProcessFeedFileWithScript(const QString& execution_line,
const QString& raw_feed_data,
int run_timeout);
static QString runScriptProcess(const QStringList& cmd_args, const QString& working_directory,
int run_timeout, bool provide_input, const QString& input = {});
static QString runScriptProcess(const QStringList& cmd_args,
const QString& working_directory,
int run_timeout,
bool provide_input,
const QString& input = {});
public slots:
void fetchMetadataForItself();
@ -108,7 +108,7 @@ class StandardFeed : public Feed {
Type m_type;
QString m_postProcessScript;
QString m_encoding;
bool m_passwordProtected{};
Protection m_protection = Protection::NoProtection;
QString m_username;
QString m_password;
};

1
src/librssguard/services/standard/standardfeedsimportexportmodel.cpp
View File

@ -184,6 +184,7 @@ bool FeedsImportExportModel::produceFeed(const FeedLookup& feed_lookup) {
new_feed = StandardFeed::guessFeed(StandardFeed::SourceType::Url,
feed_lookup.url,
feed_lookup.post_process_script,
Feed::Protection::NoProtection,
{},
{},
feed_lookup.custom_proxy);

2
src/librssguard/services/standard/standardserviceroot.cpp
View File

@ -165,7 +165,7 @@ QList<Message> StandardServiceRoot::obtainNewMessages(Feed* feed,
QByteArray feed_contents;
QList<QPair<QByteArray, QByteArray>> headers;
headers << NetworkFactory::generateBasicAuthHeader(f->username(), f->password());
headers << NetworkFactory::generateBasicAuthHeader(f->protection(), f->username(), f->password());
auto network_result = NetworkFactory::performNetworkOperation(feed->source(),
download_timeout,

39
src/librssguard/services/tt-rss/gui/formttrssfeeddetails.cpp
View File

@ -16,11 +16,12 @@
#include <QMimeData>
#include <QTimer>
FormTtRssFeedDetails::FormTtRssFeedDetails(ServiceRoot* service_root, RootItem* parent_to_select,
const QString& url, QWidget* parent)
FormTtRssFeedDetails::FormTtRssFeedDetails(ServiceRoot* service_root,
RootItem* parent_to_select,
const QString& url,
QWidget* parent)
: FormFeedDetails(service_root, parent), m_feedDetails(new TtRssFeedDetails(this)),
m_authDetails(new AuthenticationDetails(this)), m_parentToSelect(parent_to_select),
m_urlToProcess(url) {}
m_authDetails(new AuthenticationDetails(true, this)), m_parentToSelect(parent_to_select), m_urlToProcess(url) {}
void FormTtRssFeedDetails::apply() {
if (!m_creatingNew) {
@ -29,25 +30,25 @@ void FormTtRssFeedDetails::apply() {
FormFeedDetails::apply();
}
else {
RootItem* parent = static_cast<RootItem*>(m_feedDetails->ui.m_cmbParentCategory->itemData(
m_feedDetails->ui.m_cmbParentCategory->currentIndex()).value<void*>());
RootItem* parent = static_cast<RootItem*>(m_feedDetails->ui.m_cmbParentCategory
->itemData(m_feedDetails->ui.m_cmbParentCategory->currentIndex())
.value<void*>());
auto* root = qobject_cast<TtRssServiceRoot*>(parent->getParentServiceRoot());
const int category_id = parent->kind() == RootItem::Kind::ServiceRoot ?
0 :
parent->customId().toInt();
const TtRssSubscribeToFeedResponse response = root->network()->subscribeToFeed(m_feedDetails->ui.m_txtUrl->lineEdit()->text(),
category_id,
m_serviceRoot->networkProxy(),
m_authDetails->m_gbAuthentication->isChecked(),
m_authDetails->m_txtUsername->lineEdit()->text(),
m_authDetails->m_txtPassword->lineEdit()->text());
const int category_id = parent->kind() == RootItem::Kind::ServiceRoot ? 0 : parent->customId().toInt();
const TtRssSubscribeToFeedResponse response =
root->network()->subscribeToFeed(m_feedDetails->ui.m_txtUrl->lineEdit()->text(),
category_id,
m_serviceRoot->networkProxy(),
m_authDetails->authenticationType() == Feed::Protection::BasicProtection,
m_authDetails->m_txtUsername->lineEdit()->text(),
m_authDetails->m_txtPassword->lineEdit()->text());
if (response.code() == STF_INSERTED) {
// Feed was added online.
qApp->showGuiMessage(Notification::Event::GeneralEvent, {
tr("Feed added"),
tr("Feed was added, obtaining new tree of feeds now."),
QSystemTrayIcon::MessageIcon::Information });
qApp->showGuiMessage(Notification::Event::GeneralEvent,
{tr("Feed added"),
tr("Feed was added, obtaining new tree of feeds now."),
QSystemTrayIcon::MessageIcon::Information});
QTimer::singleShot(300, root, &TtRssServiceRoot::syncIn);
}
else {

30
src/librssguard/services/tt-rss/ttrssnetworkfactory.cpp
View File

@ -87,7 +87,7 @@ TtRssLoginResponse TtRssNetworkFactory::login(const QNetworkProxy& proxy) {
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
NetworkResult network_reply =
NetworkFactory::performNetworkOperation(m_fullUrl,
@ -126,7 +126,9 @@ TtRssResponse TtRssNetworkFactory::logout(const QNetworkProxy& proxy) {
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection,
m_authUsername,
m_authPassword);
NetworkResult network_reply =
NetworkFactory::performNetworkOperation(m_fullUrl,
@ -171,7 +173,7 @@ TtRssGetLabelsResponse TtRssNetworkFactory::getLabels(const QNetworkProxy& proxy
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
NetworkResult network_reply =
NetworkFactory::performNetworkOperation(m_fullUrl,
@ -222,7 +224,7 @@ TtRssResponse TtRssNetworkFactory::shareToPublished(const TtRssNoteToPublish& no
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
NetworkResult network_reply =
NetworkFactory::performNetworkOperation(m_fullUrl,
@ -275,7 +277,7 @@ TtRssGetFeedsCategoriesResponse TtRssNetworkFactory::getFeedsCategories(const QN
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
NetworkResult network_reply =
NetworkFactory::performNetworkOperation(m_fullUrl,
@ -335,7 +337,7 @@ TtRssGetCompactHeadlinesResponse TtRssNetworkFactory::getCompactHeadlines(int fe
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
NetworkResult network_reply =
NetworkFactory::performNetworkOperation(m_fullUrl,
@ -397,7 +399,7 @@ TtRssGetHeadlinesResponse TtRssNetworkFactory::getArticle(const QStringList& art
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
NetworkResult network_reply =
NetworkFactory::performNetworkOperation(m_fullUrl,
@ -464,7 +466,7 @@ TtRssGetHeadlinesResponse TtRssNetworkFactory::getHeadlines(int feed_id,
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
NetworkResult network_reply =
NetworkFactory::performNetworkOperation(m_fullUrl,
@ -522,7 +524,7 @@ TtRssResponse TtRssNetworkFactory::setArticleLabel(const QStringList& article_id
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
NetworkResult network_reply =
NetworkFactory::performNetworkOperation(m_fullUrl,
@ -581,7 +583,7 @@ TtRssUpdateArticleResponse TtRssNetworkFactory::updateArticles(const QStringList
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
NetworkResult network_reply =
NetworkFactory::performNetworkOperation(m_fullUrl,
@ -645,7 +647,7 @@ TtRssSubscribeToFeedResponse TtRssNetworkFactory::subscribeToFeed(const QString&
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
NetworkResult network_reply =
NetworkFactory::performNetworkOperation(m_fullUrl,
@ -697,7 +699,7 @@ TtRssUnsubscribeFeedResponse TtRssNetworkFactory::unsubscribeFeed(int feed_id, c
QList<QPair<QByteArray, QByteArray>> headers;
headers << QPair<QByteArray, QByteArray>(HTTP_HEADERS_CONTENT_TYPE, TTRSS_CONTENT_TYPE_JSON);
headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword);
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection, m_authUsername, m_authPassword);
NetworkResult network_reply =
NetworkFactory::performNetworkOperation(m_fullUrl,
@ -947,7 +949,9 @@ RootItem* TtRssGetFeedsCategoriesResponse::feedsCategories(TtRssNetworkFactory*
QList<QPair<QByteArray, QByteArray>> headers;
if (network->authIsUsed()) {
headers << NetworkFactory::generateBasicAuthHeader(network->authUsername(), network->authPassword());
headers << NetworkFactory::generateBasicAuthHeader(Feed::Protection::BasicProtection,
network->authUsername(),
network->authPassword());
}
auto res =