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
2121 }
2222
2323 QVariant SettingsScriptingInterface::getValue(const QString& setting) {
24+ if (_restrictPrivateValues && setting.startsWith(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/")) {
25+ return {""};
26+ }
2427 QVariant value = Setting::Handle<QVariant>(setting).get();
2528 if (!value.isValid()) {
2629 value = "";
2730 }
28− if (_restrictPrivateValues && setting.startsWith(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/")) {
29− value = "";
30− }
3131 return value;
3232 }
3333
3434 QVariant SettingsScriptingInterface::getValue(const QString& setting, const QVariant& defaultValue) {
35+ if (_restrictPrivateValues && setting.startsWith(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/")) {
36+ return {""};
37+ }
3538 QVariant value = Setting::Handle<QVariant>(setting, defaultValue).get();
3639 if (!value.isValid()) {
3740 value = "";
3841 }
39− if (_restrictPrivateValues && setting.startsWith(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/")) {
40− value = "";
41− }
4242 return value;
4343 }
4444