Add guards against invalid url to initial state loading

Author: Alenar

mithril-explorer/components/AggregatorSetter/AddAggregatorModal.js

@@ -2,6 +2,7 @@ import React, {useState} from 'react';
 import {Button, Form, FormGroup, Modal} from "react-bootstrap";
 import {useDispatch} from "react-redux";
 import {selectAggregator} from "../../store/settingsSlice";
+import {checkUrl} from "../../utils";
 
 export default function AddAggregatorModal(props) {
   const [value, setValue] = useState("");
@@ -18,13 +19,10 @@ export default function AddAggregatorModal(props) {
     // Avoid form submit if the enter key is pressed
     event.preventDefault();
 
-    try {
-      // Use the url constructor to check if the value is an url
-      new URL(value);
+    if (checkUrl(value)) {
       handleClose();
       dispatch(selectAggregator(value));
-    } catch (ex) {
-      console.warn("invalid url", ex);
+    } else {
       setIsInvalid(true);
     }
   }

mithril-explorer/store/settingsSlice.js

@@ -1,5 +1,6 @@
 import {createSlice} from "@reduxjs/toolkit";
 import default_available_aggregators from "../aggregators-list";
+import {checkUrl} from "../utils";
 
 export const initialState = {
   autoUpdate: true,
@@ -20,6 +21,10 @@ export const settingsSlice = createSlice({
       state.autoUpdate = !state.autoUpdate;
     },
     selectAggregator: (state, action) => {
+      if (!checkUrl(action.payload)) {
+        return state;
+      }
+
       const availableAggregators =
         state.availableAggregators.includes(action.payload)
           ? state.availableAggregators

mithril-explorer/store/store.js

@@ -2,6 +2,7 @@ import {configureStore} from "@reduxjs/toolkit";
 import {createWrapper} from "next-redux-wrapper";
 import {initialState as settingsInitialState, settingsSlice} from "./settingsSlice";
 import default_available_aggregators from "../aggregators-list";
+import {checkUrl} from "../utils";
 
 const SAVED_STATE_KEY = "Explorer_State";
 
@@ -24,10 +25,9 @@ function initStore() {
 
   if (location?.search) {
     const params = new URLSearchParams(location.search);
+    const aggregator = params.get('aggregator');
 
-    if (params.has('aggregator')) {
-      const aggregator = params.get('aggregator');
-
+    if (aggregator && checkUrl(aggregator)) {
       const settings = {
         selectedAggregator: aggregator,
         availableAggregators:

mithril-explorer/utils.js

@@ -0,0 +1,12 @@
+function checkUrl(url) {
+  try {
+    // Use the url constructor to check if the value is an url
+    return Boolean(new URL(url));
+  } catch (ex) {
+    return false;
+  }
+}
+
+module.exports = {
+  checkUrl
+}