Sanitize vis instance

ioBroker · Jul 16, 2024 · 41e5414 · 41e5414
1 parent d89c9cd
commit 41e5414
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/packages/iobroker.vis-2/src/src/Toolbar/Settings.tsx b/packages/iobroker.vis-2/src/src/Toolbar/Settings.tsx
@@ -79,14 +79,17 @@ const Settings: React.FC<SettingsProps> = props => {
     const [projectMode, setProjectMode] = useState(0);
 
     const [settings, setSettings] = useState<ProjectSettings>({} as ProjectSettings);
-    const [instance, setInstance] = useState(window.localStorage.getItem('visInstance'));
+    const [instance, setInstance] = useState('');
     /* eslint no-underscore-dangle: 0 */
     useEffect(() => {
         const _settings = { ...store.getState().visProject.___settings };
         if (_settings.reloadOnEdit === undefined) {
             _settings.reloadOnEdit = true;
         }
 
+        let _instance = (window.localStorage.getItem('visInstance') || '').replace(/^"/, '').replace(/"$/, '');
+        setInstance(_instance);
+
         // read project settings
         props.socket.readDir(`${props.adapterName}.${props.instance}`, props.projectName)
             .then(files => {

diff --git a/packages/iobroker.vis-2/src/src/Vis/visEngine.tsx b/packages/iobroker.vis-2/src/src/Vis/visEngine.tsx
@@ -588,7 +588,7 @@ class VisEngine extends React.Component<VisEngineProps, VisEngineState> {
             projectPrefix: this.props.projectName,
             _: translate,
             dateFormat: '',
-            instance: window.localStorage.getItem('visInstance'),
+            instance: (window.localStorage.getItem('visInstance') || '').replace(/^"/, '').replace(/"$/, ''),
             loginRequired: false,
             viewsActiveFilter: this.viewsActiveFilter,
             onChangeCallbacks: this.onChangeCallbacks,
@@ -1776,7 +1776,18 @@ class VisEngine extends React.Component<VisEngineProps, VisEngineState> {
     };
 
     onUserCommand(instance: string, command: string, data: any) {
-        const currentInstance = window.localStorage.getItem('visInstance');
+        const currentInstance = (window.localStorage.getItem('visInstance') || '').replace(/^"/, '').replace(/"$/, '');
+
+        if (instance === null || instance === undefined) {
+            instance = '';
+        } else {
+            instance = instance.toString();
+        }
+
+        if (instance && typeof instance === 'string') {
+            instance = instance.replace(/^"/, '').replace(/"$/, '');
+        }
+
         if (!instance || (instance !== currentInstance && instance !== 'FFFFFFFF' && !instance.includes('*'))) {
             return false;
         }