alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

security constraints can be defined now, whee

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=935220
This commit is contained in:
Chani Armitage 2009-03-04 17:05:51 +00:00
parent a409afab79
commit 5332b1edc8
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
applet.cpp
View File

@ -1669,6 +1669,12 @@ void Applet::createConfigurationInterface(KConfigDialog *parent)
// do not put anything here ...
}
bool Applet::isAllowed(const QString &constraint)
{
KConfigGroup constraintGroup(KGlobal::config(), "Constraints");
return constraintGroup.readEntry(constraint, true);
}
KPluginInfo::List Applet::listAppletInfo(const QString &category,
const QString &parentApp)
{
@ -1697,6 +1703,28 @@ KPluginInfo::List Applet::listAppletInfo(const QString &category,
}
KService::List offers = KServiceTypeTrader::self()->query("Plasma/Applet", constraint);
//now we have to do some manual filtering because the constraint can't handle everything
KConfigGroup constraintGroup(KGlobal::config(), "Constraints");
foreach (const QString &key, constraintGroup.keyList()) {
//kDebug() << "security constraint" << key;
if (constraintGroup.readEntry(key, true)) {
continue;
}
//ugh. a qlist of ksharedptr<kservice>
QMutableListIterator<KService::Ptr> it(offers);
while (it.hasNext()) {
KService::Ptr p = it.next();
QString prop = QString("X-Plasma-Requires-").append(key);
QVariant req = p->property(prop, QVariant::Bool);
//FIXME before release, switch the if statement:
//if (!req.isValid() || req.toBool()) {
if (req.isValid() && req.toBool()) {
it.remove();
}
}
}
//kDebug() << "Applet::listAppletInfo constraint was '" << constraint
// << "' which got us " << offers.count() << " matches";
return KPluginInfo::fromServices(offers);

6
applet.h
View File

@ -592,6 +592,12 @@ class PLASMA_EXPORT Applet : public QGraphicsWidget
*/
virtual void createConfigurationInterface(KConfigDialog *parent);
/**
* returns true if the applet is allowed to perform functions covered by the given constraint
* eg. isAllowed("FileDialog") returns true iff applets are allowed to show filedialogs.
*/
bool isAllowed(const QString &constraint);
Q_SIGNALS:
/**
* This signal indicates that an application launch, window