summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/adblock/adblockmanager.cpp2
-rw-r--r--src/adblock/adblockrule.cpp30
-rw-r--r--src/adblock/adblockrule.h11
-rw-r--r--src/adblock/adblockrulenullimpl.cpp135
-rw-r--r--src/adblock/adblockrulenullimpl.h51
-rw-r--r--src/adblock/adblockruletextmatchimpl.cpp4
7 files changed, 232 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e0f75a04..9e197f59 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -62,6 +62,7 @@ SET( rekonq_KDEINIT_SRCS
adblock/adblocknetworkreply.cpp
adblock/adblockrule.cpp
adblock/adblockrulefallbackimpl.cpp
+ adblock/adblockrulenullimpl.cpp
adblock/adblockruletextmatchimpl.cpp
#----------------------------------------
urlbar/stackedurlbar.cpp
diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index fb36ef0f..8f51fd1a 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -137,6 +137,7 @@ void AdBlockManager::loadRules(const QStringList &rules)
const QString filter = stringRule.mid(2);
if (_hostWhiteList.tryAddFilter(filter))
continue;
+
AdBlockRule rule(filter);
_whiteList << rule;
continue;
@@ -155,6 +156,7 @@ void AdBlockManager::loadRules(const QStringList &rules)
if (_hostBlackList.tryAddFilter(stringRule))
continue;
+
AdBlockRule rule(stringRule);
_blackList << rule;
}
diff --git a/src/adblock/adblockrule.cpp b/src/adblock/adblockrule.cpp
index 1cb6773a..7fdb3e10 100644
--- a/src/adblock/adblockrule.cpp
+++ b/src/adblock/adblockrule.cpp
@@ -55,13 +55,39 @@
// Self Includes
#include "adblockrule.h"
+// Local Includes
#include "adblockrulefallbackimpl.h"
+#include "adblockrulenullimpl.h"
#include "adblockruletextmatchimpl.h"
+
AdBlockRule::AdBlockRule(const QString &filter)
{
- if (AdBlockRuleTextMatchImpl::isTextMatchFilter(filter))
+ switch( AdBlockRule::ruleType(filter) )
+ {
+ case TextRule:
m_implementation = QSharedPointer<AdBlockRuleImpl>(new AdBlockRuleTextMatchImpl(filter));
- else
+ break;
+
+ case FallbackRule:
m_implementation = QSharedPointer<AdBlockRuleImpl>(new AdBlockRuleFallbackImpl(filter));
+ break;
+
+ case NullRule:
+ default:
+ m_implementation = QSharedPointer<AdBlockRuleImpl>(new AdBlockRuleNullImpl(filter));
+ break;
+ }
+}
+
+
+RuleTypes AdBlockRule::ruleType(const QString &filter)
+{
+ if( AdBlockRuleTextMatchImpl::isTextMatchFilter(filter) )
+ return TextRule;
+
+ if( AdBlockRuleNullImpl::isNullFilter(filter) )
+ return NullRule;
+
+ return FallbackRule;
}
diff --git a/src/adblock/adblockrule.h b/src/adblock/adblockrule.h
index 81110054..f8d6bf39 100644
--- a/src/adblock/adblockrule.h
+++ b/src/adblock/adblockrule.h
@@ -66,6 +66,15 @@
class QNetworkRequest;
class QString;
+
+enum RuleTypes
+{
+ TextRule,
+ FallbackRule,
+ NullRule
+};
+
+
class AdBlockRule
{
public:
@@ -81,6 +90,8 @@ public:
return b;
}
+ static RuleTypes ruleType(const QString &filter);
+
private:
QSharedPointer<AdBlockRuleImpl> m_implementation;
};
diff --git a/src/adblock/adblockrulenullimpl.cpp b/src/adblock/adblockrulenullimpl.cpp
new file mode 100644
index 00000000..6d68715d
--- /dev/null
+++ b/src/adblock/adblockrulenullimpl.cpp
@@ -0,0 +1,135 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot 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) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* 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, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+// Self Includes
+#include "adblockrulenullimpl.h"
+
+// Rekonq Includes
+#include "rekonq_defines.h"
+
+// Qt Includes
+#include <QStringList>
+
+
+AdBlockRuleNullImpl::AdBlockRuleNullImpl(const QString &filter)
+ : AdBlockRuleImpl(filter)
+{
+}
+
+
+bool AdBlockRuleNullImpl::match(const QNetworkRequest &, const QString &, const QString &) const
+{
+ return false;
+}
+
+
+bool AdBlockRuleNullImpl::isNullFilter(const QString &filter)
+{
+ QString parsedLine = filter;
+
+ const int optionsNumber = parsedLine.lastIndexOf(QL1C('$'));
+ if (optionsNumber == 0)
+ return false;
+
+ const QStringList options(parsedLine.mid(optionsNumber + 1).split(QL1C(',')));
+
+ Q_FOREACH(const QString &option, options)
+ {
+ // script
+ if (option == QL1S("script"))
+ return true;
+
+ // image
+ if (option == QL1S("image"))
+ return true;
+
+ // background
+ if (option == QL1S("background"))
+ return true;
+
+ // stylesheet
+ if (option == QL1S("stylesheet"))
+ return true;
+
+ // object
+ if (option == QL1S("object"))
+ return true;
+
+ // xbl
+ if (option == QL1S("xbl"))
+ return true;
+
+ // ping
+ if (option == QL1S("ping"))
+ return true;
+
+ // xmlhttprequest
+ if (option == QL1S("xmlhttprequest"))
+ return true;
+
+ // object_subrequest
+ if (option == QL1S("object-subrequest"))
+ return true;
+
+ // dtd
+ if (option == QL1S("dtd"))
+ return true;
+
+ // subdocument
+ if (option == QL1S("subdocument"))
+ return true;
+
+ // document
+ if (option == QL1S("document"))
+ return true;
+
+ // other
+ if (option == QL1S("other"))
+ return true;
+
+ // third_party
+ if (option == QL1S("third-party"))
+ return true;
+
+ // collapse
+ if (option == QL1S("collapse"))
+ return true;
+ }
+
+ return false;
+}
+
+
+QString AdBlockRuleNullImpl::ruleString() const
+{
+ return QString();
+}
+
+
+QString AdBlockRuleNullImpl::ruleType() const
+{
+ return QL1S("AdBlockRuleNullImpl");
+}
diff --git a/src/adblock/adblockrulenullimpl.h b/src/adblock/adblockrulenullimpl.h
new file mode 100644
index 00000000..3d2e94a1
--- /dev/null
+++ b/src/adblock/adblockrulenullimpl.h
@@ -0,0 +1,51 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot 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) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* 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, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+#ifndef ADBLOCKRULE_NULL_IMPL_H
+#define ADBLOCKRULE_NULL_IMPL_H
+
+
+// Local Includes
+#include "adblockruleimpl.h"
+
+// Qt Includes
+#include <QString>
+
+
+class AdBlockRuleNullImpl : public AdBlockRuleImpl
+{
+
+public:
+ AdBlockRuleNullImpl(const QString &filter);
+ bool match(const QNetworkRequest &, const QString &, const QString &) const;
+
+ static bool isNullFilter(const QString &filter);
+
+ QString ruleString() const;
+ QString ruleType() const;
+};
+
+#endif // ADBLOCKRULE_NULL_IMPL_H
diff --git a/src/adblock/adblockruletextmatchimpl.cpp b/src/adblock/adblockruletextmatchimpl.cpp
index 7296d837..04fb040b 100644
--- a/src/adblock/adblockruletextmatchimpl.cpp
+++ b/src/adblock/adblockruletextmatchimpl.cpp
@@ -23,12 +23,14 @@
*
* ============================================================ */
+
// Self Includes
#include "adblockruletextmatchimpl.h"
// Rekonq Includes
#include "rekonq_defines.h"
+
AdBlockRuleTextMatchImpl::AdBlockRuleTextMatchImpl(const QString &filter)
: AdBlockRuleImpl(filter)
{
@@ -38,6 +40,7 @@ AdBlockRuleTextMatchImpl::AdBlockRuleTextMatchImpl(const QString &filter)
m_textToMatch.remove(QL1C('*'));
}
+
bool AdBlockRuleTextMatchImpl::match(const QNetworkRequest &request, const QString &encodedUrl, const QString &encodedUrlLowerCase) const
{
Q_UNUSED(encodedUrl);
@@ -49,6 +52,7 @@ bool AdBlockRuleTextMatchImpl::match(const QNetworkRequest &request, const QStri
return encodedUrlLowerCase.contains(m_textToMatch, Qt::CaseSensitive);
}
+
bool AdBlockRuleTextMatchImpl::isTextMatchFilter(const QString &filter)
{
// We don't deal with options just yet
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-02 20:07:55 +0000