Added reset button

2022-07-20 21:19:22 +02:00
parent 1266aebe0e
commit d4cc2f566c
7 changed files with 186 additions and 66 deletions
--- a/frontend/src/components/Header/ResetModal.tsx
+++ b/frontend/src/components/Header/ResetModal.tsx
@@ -0,0 +1,64 @@
+import { Button, Group, Modal, Notification, Space, Switch, Text } from "@mantine/core";
+import { useForm } from "@mantine/hooks";
+import React, { useState } from "react"
+import { ImCross } from "react-icons/im";
+import { okNotify, resetfiregex } from "../../js/utils";
+
+function ResetModal({ opened, onClose }:{ opened: boolean, onClose: () => void }) {
+    const form = useForm({
+        initialValues: {
+            delete_data:false,
+        }
+      })
+
+      const [loadingBtn, setLoadingBtn] = useState(false)
+      const [error, setError] = useState<null|string>(null)
+
+      const close = () => {
+        setError(null)
+        setLoadingBtn(false)
+        form.reset()
+        onClose()
+      }
+
+      const submitRequest = async ({ delete_data }:{ delete_data:boolean }) => {
+        setLoadingBtn(true)
+        await resetfiregex(delete_data).then(res => {
+          if(!res){
+            okNotify("Firegex Resetted!","Firegex has been resetted!")
+            setError(null);
+            close()
+            form.reset()
+          }else{
+            setError(res)
+          }
+        }).catch( err => setError(err.toString()))
+        setLoadingBtn(false)
+      }
+      return <Modal size="xl" title="Reset Firegex" opened={opened} onClose={close} closeOnClickOutside={false} centered>
+      <b>Resetting firegex will trigger the reloading of the firewall rules in nftables and the restarting
+      of all services filters</b> (technically the c++ filter processes).<br />
+      This will only cause the stop of the filters for a second and then restore them, during this time the services will continue to be available without interruptions.<br />
+      <b><Text color="red">Enabling the option below you will totaly reset firegex like you started it for the first time.</Text></b>
+      <form onSubmit={form.onSubmit(submitRequest)}>
+          <Space h="md" />
+          <Switch
+              label="Delete all data, including the firewall rules"
+              {...form.getInputProps('delete_data', { type: 'checkbox' })}
+          />
+          <Space h="md" />
+          <Group position="right" mt="md">
+            <Button loading={loadingBtn} onClick={close} >Cancel</Button>
+            <Button loading={loadingBtn} type="submit" color="red">Reset</Button>
+          </Group>
+        </form>
+        <Space h="xl" />
+        {error?<>
+          <Notification icon={<ImCross size={14} />} color="red" onClose={()=>{setError(null)}}>
+              Error: {error}
+          </Notification><Space h="md" /></>:null}
+    </Modal>
+
+}
+
+export default ResetModal;
--- a/frontend/src/components/Header/ResetPasswordModal.tsx
+++ b/frontend/src/components/Header/ResetPasswordModal.tsx
@@ -0,0 +1,62 @@
+import { Button, Group, Modal, Notification, PasswordInput, Space, Switch } from "@mantine/core";
+import { useForm } from "@mantine/hooks";
+import React, { useState } from "react"
+import { ImCross } from "react-icons/im";
+import { ChangePassword } from "../../js/models";
+import { changepassword, okNotify } from "../../js/utils";
+
+function ResetPasswordModal({ opened, onClose }:{ opened: boolean, onClose: () => void }) {
+    const form = useForm({
+        initialValues: {
+            password:"",
+            expire:true
+        },
+        validationRules:{
+          password: (value) => value !== ""
+        }
+      })
+      const [loadingBtn, setLoadingBtn] = useState(false)
+      const [error, setError] = useState<null|string>(null)
+
+      const submitRequest = async (values:ChangePassword) => {
+        setLoadingBtn(true)
+        await changepassword(values).then(res => {
+          if(!res){
+            okNotify("Password change done!","The password of the firewall has been changed!")
+            onClose()
+            form.reset()
+          }else{
+            setError(res)
+          }
+        }).catch( err => setError(err.toString()))
+        setLoadingBtn(false)
+      }
+      return <Modal size="xl" title="Change Firewall Password" opened={opened} onClose={onClose} closeOnClickOutside={false} centered>
+
+      <form onSubmit={form.onSubmit(submitRequest)}>
+          <Space h="md" />
+          <PasswordInput
+              label="New Password"
+              placeholder="$3cr3t"
+              {...form.getInputProps('password')}
+          />
+          <Space h="md" />
+          <Switch
+              label="Expire the login status to all connections"
+              {...form.getInputProps('expire', { type: 'checkbox' })}
+          />
+          <Space h="md" />
+          <Group position="right" mt="md">
+            <Button loading={loadingBtn} type="submit">Change Password</Button>
+          </Group>
+        </form>
+        <Space h="xl" />
+        {error?<>
+          <Notification icon={<ImCross size={14} />} color="red" onClose={()=>{setError(null)}}>
+              Error: {error}
+          </Notification><Space h="md" /></>:null}
+    </Modal>
+
+}
+
+export default ResetPasswordModal;
--- a/frontend/src/components/Header/index.tsx
+++ b/frontend/src/components/Header/index.tsx
@@ -1,16 +1,19 @@
 import React, { useState } from 'react';
-import { ActionIcon, Badge, Button, Divider, Group, Image, Menu, Modal, Notification, Space, Switch, Tooltip, FloatingTooltip, MediaQuery, PasswordInput } from '@mantine/core';
+import { ActionIcon, Badge, Divider, Image, Menu, Space, Tooltip, FloatingTooltip, MediaQuery } from '@mantine/core';
 import style from "./index.module.scss";
-import { changepassword, errorNotify, eventUpdateName, generalstats, logout, okNotify } from '../../js/utils';
-import { ChangePassword, GeneralStats } from '../../js/models';
+import { errorNotify, eventUpdateName, generalstats, logout } from '../../js/utils';
+import { GeneralStats } from '../../js/models';
 import { BsPlusLg } from "react-icons/bs"
 import { AiFillHome } from "react-icons/ai"
 import { useLocation, useNavigate, useParams } from 'react-router-dom';
 import AddNewRegex from '../AddNewRegex';
 import AddNewService from '../AddNewService';
 import { FaLock } from 'react-icons/fa';
-import { ImCross, ImExit } from 'react-icons/im';
-import { useForm, useWindowEvent } from '@mantine/hooks';
+import { MdOutlineSettingsBackupRestore } from 'react-icons/md';
+import { ImExit } from 'react-icons/im';
+import { useWindowEvent } from '@mantine/hooks';
+import ResetPasswordModal from './ResetPasswordModal';
+import ResetModal from './ResetModal';


 function Header() {
@@ -38,37 +41,11 @@ function Header() {
    })
  } 

-
-  const form = useForm({
-    initialValues: {
-        password:"",
-        expire:true
-    },
-    validationRules:{
-      password: (value) => value !== ""
-    }
-  })
-
-  const [loadingBtn, setLoadingBtn] = useState(false)
-  const [error, setError] = useState<null|string>(null)
  const [changePasswordModal, setChangePasswordModal] = useState(false);
+  const [resetFiregexModal, setResetFiregexModal] = useState(false);
  const [tooltipAddOpened, setTooltipAddOpened] = useState(false);
  const [tooltipHomeOpened, setTooltipHomeOpened] = useState(false);

-  const submitRequest = async (values:ChangePassword) => {
-    setLoadingBtn(true)
-    await changepassword(values).then(res => {
-      if(!res){
-        okNotify("Password change done!","The password of the firewall has been changed!")
-        setChangePasswordModal(false)
-        form.reset()
-      }else{
-        setError(res)
-      }
-    }).catch( err => setError(err.toString()))
-    setLoadingBtn(false)
-  }
-
  const {srv} = useParams()

  const [open, setOpen] = useState(false);
@@ -108,8 +85,11 @@ function Header() {
        <Menu>
          <Menu.Label>Firewall Access</Menu.Label>
          <Menu.Item icon={<ImExit size={14} />} onClick={logout_action}>Logout</Menu.Item>
-          <Divider />
          <Menu.Item color="red" icon={<FaLock size={14} />} onClick={() => setChangePasswordModal(true)}>Change Password</Menu.Item>
+          <Divider />
+          <Menu.Label>Actions</Menu.Label>
+          <Menu.Item color="red" icon={<MdOutlineSettingsBackupRestore size={18} />} onClick={() => setResetFiregexModal(true)}>Reset Firegex</Menu.Item>
+          
        </Menu>
        <div style={{marginLeft:"20px"}}></div>
        { location.pathname !== "/"?
@@ -143,31 +123,9 @@ function Header() {
            <AddNewRegex opened={open} onClose={closeModal} service={srv} />:
            <AddNewService opened={open} onClose={closeModal} />
        }
-        <Modal size="xl" title="Change Firewall Password" opened={changePasswordModal} onClose={()=>setChangePasswordModal(false)} closeOnClickOutside={false} centered>
-
-          <form onSubmit={form.onSubmit(submitRequest)}>
-              <Space h="md" />
-              <PasswordInput
-                  label="New Password"
-                  placeholder="$3cr3t"
-                  {...form.getInputProps('password')}
-              />
-              <Space h="md" />
-              <Switch
-                  label="Expire the login status to all connections"
-                  {...form.getInputProps('expire', { type: 'checkbox' })}
-              />
-              <Space h="md" />
-              <Group position="right" mt="md">
-                <Button loading={loadingBtn} type="submit">Change Password</Button>
-              </Group>
-            </form>
-            <Space h="xl" />
-            {error?<>
-              <Notification icon={<ImCross size={14} />} color="red" onClose={()=>{setError(null)}}>
-                  Error: {error}
-              </Notification><Space h="md" /></>:null}
-        </Modal>
+        <ResetPasswordModal opened={changePasswordModal} onClose={() => setChangePasswordModal(false)} />
+        <ResetModal opened={resetFiregexModal} onClose={() => setResetFiregexModal(false)} />
+        
        <div style={{marginLeft:"40px"}}></div>
  </div>
 }
--- a/frontend/src/js/utils.tsx
+++ b/frontend/src/js/utils.tsx
@@ -54,6 +54,11 @@ export function fireUpdateRequest(){
    window.dispatchEvent(new Event(eventUpdateName))
 }

+export async function resetfiregex(delete_data:boolean = false){
+    const { status } = await postapi("reset",{delete:delete_data}) as ServerResponse;
+    return (status === "ok"?undefined:status)
+}
+
 export async function getipinterfaces(){
    return await getapi("interfaces") as IpInterface[];
 }
@@ -87,7 +92,6 @@ export async function setpassword(data:PasswordSend) {

 export async function changepassword(data:ChangePassword) {
    const { status, access_token } = await postapi("change-password",data) as ServerResponseToken;
-    console.log(access_token)
    if (access_token)
        window.localStorage.setItem("access_token", access_token);
        return status === "ok"?undefined:status