release

debian/dde-shell.install

@@ -24,6 +24,7 @@ usr/share/dde-shell/org.deepin.ds.notification*/
 usr/share/dde-shell/org.deepin.ds.notificationcenter*/
 usr/share/dde-shell/org.deepin.ds.osd*/
 usr/share/dsg/configs/org.deepin.dde.shell/org.deepin.dde.shell.json
+usr/share/dsg/configs/overrides/org.deepin.dde.shell/*
 usr/share/dsg/configs/org.deepin.dde.shell/org.deepin.dde.shell.notification.json
 usr/share/dsg/configs/org.deepin.dde.shell/org.deepin.ds.dde-apps.json
 usr/share/dsg/configs/org.deepin.dde.shell/org.deepin.ds.dock.json

panels/notification/server/configs/org.deepin.dde.shell.notification.json

@@ -155,6 +155,17 @@
       "description[zh_CN]": "通知自动清理的天数，超过此天数的通知将被自动删除",
       "permissions": "readwrite",
       "visibility": "public"
+    },
+    "safeCommands": {
+      "value": ["xdg-open","dbus-send","qdbus","deepin-defender","dde-control-center","downloader","dde-file-manager","dde-dconfig","/usr/lib/deepin-daemon/dde-bluetooth-dialog","/usr/bin/dde-hints-dialog","/usr/bin/deepin-devicemanager"],
+      "serial": 0,
+      "flags": [],
+      "name": "safe commands",
+      "name[zh_CN]": "安全指令",
+      "description": "safe commands",
+      "description[zh_CN]": "通知扩展的x-deepin-action-携带的指令白名单",
+      "permissions": "readonly",
+      "visibility": "private"
     }
   }
 }

panels/notification/server/notificationmanager.cpp

@@ -532,6 +532,14 @@ void NotificationManager::doActionInvoked(const NotifyEntity &entity, const QStr
             if (!args.isEmpty()) {
                 QString cmd = args.takeFirst(); // 命令
 
+                QScopedPointer<DConfig> config(DConfig::create("org.deepin.dde.shell", "org.deepin.dde.shell.notification"));
+                QStringList safeCommands = config->value("safeCommands").toStringList();
+
+                if (!safeCommands.contains(cmd)) {
+                    qWarning(notifyLog) << "The command is not allowed to be executed:" << cmd << safeCommands;
+                    return;
+                }
+
                 QProcess pro;
                 pro.setProgram(cmd);
                 pro.setArguments(args);

shell/CMakeLists.txt

@@ -65,3 +65,4 @@ install(TARGETS dde-shell DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/[email protected] DESTINATION ${SYSTEMD_USER_UNIT_DIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/[email protected] DESTINATION ${SYSTEMD_USER_UNIT_DIR})
 dtk_add_config_meta_files(APPID org.deepin.dde.shell FILES org.deepin.dde.shell.json)
+dtk_add_config_override_files(APPID org.deepin.dde.shell META_NAME org.deepin.dtk.preference FILES overrides/org.deepin.dtk.preference.json)

shell/overrides/org.deepin.dtk.preference.json

@@ -0,0 +1,17 @@
+{
+    "magic": "dsg.config.override",
+    "version": "1.0",
+    "contents": {
+        "themeType": {
+            "value": 0,
+            "serial": 1,
+            "flags": [],
+            "name": "The application theme type",
+            "name[zh_CN]": "应用主题的颜色",
+            "description": "The application theme type, which can be set to follow the system theme (0), light theme (1), dark theme (2)",
+            "description[zh_CN]": "应用主题的颜色，可以设置为跟随系统(0)、浅色(1)、 深色(2)，默认为跟随系统",
+            "permissions": "readwrite",
+            "visibility": "public"
+        }
+    }
+}