[ssu] List configured domains and their variables. Fixes JB#47762

sailfishos · Nov 1, 2019 · 3c10bbd · 3c10bbd
1 parent 2a81fa8
commit 3c10bbd
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 3 deletions.
diff --git a/dbus/org.nemo.ssu.xml b/dbus/org.nemo.ssu.xml
@@ -4,8 +4,9 @@
 <!--
 /**
  * DBus service for interfacing with ssu management
- * Copyright (C) 2013 Jolla Ltd.
- * Contact: Bernd Wachter <bernd.wachter@jollamobile.com>
+ * Copyright (C) 2013-2019 Jolla Ltd.
+ * Copyright (C) 2019 Open Mobile Platform LLC
+ * Contact: Andrew Branson <andrew.branson@jolla.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -103,6 +104,20 @@
     </method>
     <method name="updateRepos">
     </method>
+    <method name="listDomains">
+      <arg direction="out" type="a(s)"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringList"/>
+    </method>
+    <method name="setDomainConfig">
+      <arg direction="in" type="s" name="domain"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg direction="in" type="a{ss}" name="config"/>
+    </method>
+    <method name="getDomainConfig">
+      <arg direction="in" type="s" name="domain"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
+      <arg direction="out" type="a{ss}"/>
+    </method>
 
     <method name="error">
       <arg direction="out" type="b" name="status"/>

diff --git a/declarative/plugins.qmltypes b/declarative/plugins.qmltypes
@@ -123,6 +123,16 @@ Module {
             Parameter { name: "domain"; type: "string" }
         }
         Method { name: "useSslVerify"; type: "bool" }
+        Method { name: "listDomains"; type: "QStringList" }
+        Method {
+            name: "getDomainConfig"; type: "QVariantMap"
+            Parameter { name: "domain"; type: "string" }
+        }
+        Method {
+            name: "setDomainConfig"
+            Parameter { name: "domain"; type: "string" }
+            Parameter { name: "config"; type: "QVariantMap" }
+        }
     }
     Component {
         name: "SsuFeatureModel"

diff --git a/libssu/ssu.cpp b/libssu/ssu.cpp
@@ -262,6 +262,35 @@ bool Ssu::registerDevice(QDomDocument *response)
     return true;
 }
 
+QStringList Ssu::listDomains() {
+    SsuSettings repoSettings(SSU_REPO_CONFIGURATION, SSU_REPO_CONFIGURATION_DIR);
+    QRegExp domainFilter("-domain$");
+    return repoSettings.childGroups().filter(domainFilter).replaceInStrings(domainFilter, "");
+}
+
+void Ssu::setDomainConfig(const QString &domain, QVariantMap config) {
+    SsuSettings repoSettings(SSU_REPO_CONFIGURATION, SSU_REPO_CONFIGURATION_DIR);
+    repoSettings.beginGroup(domain + "-domain");
+    repoSettings.remove("");
+
+    for (QVariantMap::iterator i = config.begin(); i != config.end(); i++) {
+        repoSettings.setValue(i.key(), i.value());
+    }
+    repoSettings.endGroup();
+    repoSettings.sync();
+}
+
+QVariantMap Ssu::getDomainConfig(const QString &domain) {
+    SsuSettings repoSettings(SSU_REPO_CONFIGURATION, SSU_REPO_CONFIGURATION_DIR);
+    QVariantMap config;
+    repoSettings.beginGroup(domain + "-domain");
+    foreach(QString key, repoSettings.allKeys()) {
+        config.insert(key, repoSettings.value(key).toString());
+    }
+    repoSettings.endGroup();
+    return config;
+}
+
 // RND repos have flavour (devel, testing, release), and release (latest, next)
 // Release repos only have release (latest, next, version number)
 QString Ssu::repoUrl(const QString &repoName, bool rndRepo,

diff --git a/libssu/ssu.h b/libssu/ssu.h
@@ -160,6 +160,9 @@ class Ssu: public QObject
     /// See SsuCoreConfig::useSslVerify
     Q_INVOKABLE bool useSslVerify();
 
+    Q_INVOKABLE QStringList listDomains();
+    Q_INVOKABLE void setDomainConfig(const QString &domain, QVariantMap config);
+    Q_INVOKABLE QVariantMap getDomainConfig(const QString &domain);
 private:
     QString errorString;
     bool errorFlag;

diff --git a/libssu/ssusettings_p.h b/libssu/ssusettings_p.h
@@ -32,7 +32,7 @@ class SsuSettings: public QSettings
 
 private:
     QString defaultSettingsFile, settingsd;
-    void merge(bool keepOld = false);
+    void merge(bool keepOld = true);
     static void merge(QSettings *masterSettings, const QStringList &settingsFiles);
     void upgrade();
 

diff --git a/ssud/ssud.cpp b/ssud/ssud.cpp
@@ -256,3 +256,21 @@ QList<SsuRepo> Ssud::listRepos(bool rnd)
     autoclose.start();
     return reposList;
 }
+
+QStringList Ssud::listDomains()
+{
+    autoclose.start();
+    return ssu.listDomains();
+}
+
+void Ssud::setDomainConfig(const QString &domain, QVariantMap config)
+{
+    ssu.setDomainConfig(domain, config);
+    autoclose.start();
+}
+
+QVariantMap Ssud::getDomainConfig(const QString &domain)
+{
+    autoclose.start();
+    return ssu.getDomainConfig(domain);
+}
diff --git a/ssud/ssud.h b/ssud/ssud.h
@@ -48,6 +48,9 @@ public slots:
     void addRepo(const QString &repo, const QString &url);
     void updateRepos();
     QList<SsuRepo> listRepos(bool rnd);
+    QStringList listDomains();
+    void setDomainConfig(const QString &domain, QVariantMap config);
+    QVariantMap getDomainConfig(const QString &domain);
 
     bool error();
     QString lastError();