History

Script security fixes and cleanups

ksuprynowicz committed 2 years ago

Commit 1887a821 parent e57874a6 files · +49 −55Browse files

Showing the changes to interface/src/scripting/SettingsScriptingInterface.cpp (1 of 6 files). Show all

Unified · Split

interface/src/scripting/SettingsScriptingInterface.cpp+6−6
@@ -21,24 +21,24 @@ SettingsScriptingInterface* SettingsScriptingInterface::getInstance() { · 20 unmodified lines
21}21}
22 22
23QVariant SettingsScriptingInterface::getValue(const QString& setting) {23QVariant SettingsScriptingInterface::getValue(const QString& setting) {
24 if (_restrictPrivateValues && setting.startsWith(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/")) {
25 return {""};
26 }
24 QVariant value = Setting::Handle<QVariant>(setting).get();27 QVariant value = Setting::Handle<QVariant>(setting).get();
25 if (!value.isValid()) {28 if (!value.isValid()) {
26 value = "";29 value = "";
27 }30 }
28 if (_restrictPrivateValues && setting.startsWith(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/")) {
29 value = "";
30 }
31 return value;31 return value;
32}32}
33 33
34QVariant SettingsScriptingInterface::getValue(const QString& setting, const QVariant& defaultValue) {34QVariant SettingsScriptingInterface::getValue(const QString& setting, const QVariant& defaultValue) {
35 if (_restrictPrivateValues && setting.startsWith(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/")) {
36 return {""};
37 }
35 QVariant value = Setting::Handle<QVariant>(setting, defaultValue).get();38 QVariant value = Setting::Handle<QVariant>(setting, defaultValue).get();
36 if (!value.isValid()) {39 if (!value.isValid()) {
37 value = "";40 value = "";
38 }41 }
39 if (_restrictPrivateValues && setting.startsWith(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/")) {
40 value = "";
41 }
42 return value;42 return value;
43}43}
44 44