Try to adapt webadmin to the new firewall structure

YunoHost · Dec 12, 2024 · 231a6dc · 231a6dc
1 parent 17b0a81
commit 231a6dc
Show file tree

Hide file tree

Showing 3 changed files with 137 additions and 158 deletions.
diff --git a/app/components.d.ts b/app/components.d.ts
@@ -9,67 +9,67 @@ declare module 'vue' {
   export interface GlobalComponents {
     AdressItem: typeof import('./src/components/globals/formItems/AdressItem.vue')['default']
     AppCatalogSkeleton: typeof import('./src/components/globals/skeletons/AppCatalogSkeleton.vue')['default']
-    BAccordion: typeof import('bootstrap-vue-next')['BAccordion']
-    BAccordionItem: typeof import('bootstrap-vue-next')['BAccordionItem']
-    BBadge: typeof import('bootstrap-vue-next')['BBadge']
-    BBreadcrumb: typeof import('bootstrap-vue-next')['BBreadcrumb']
-    BBreadcrumbItem: typeof import('bootstrap-vue-next')['BBreadcrumbItem']
-    BButton: typeof import('bootstrap-vue-next')['BButton']
-    BButtonGroup: typeof import('bootstrap-vue-next')['BButtonGroup']
-    BButtonToolbar: typeof import('bootstrap-vue-next')['BButtonToolbar']
-    BCard: typeof import('bootstrap-vue-next')['BCard']
-    BCardBody: typeof import('bootstrap-vue-next')['BCardBody']
-    BCardGroup: typeof import('bootstrap-vue-next')['BCardGroup']
-    BCardHeader: typeof import('bootstrap-vue-next')['BCardHeader']
-    BCardText: typeof import('bootstrap-vue-next')['BCardText']
-    BCardTitle: typeof import('bootstrap-vue-next')['BCardTitle']
-    BCol: typeof import('bootstrap-vue-next')['BCol']
-    BCollapse: typeof import('bootstrap-vue-next')['BCollapse']
-    BDropdown: typeof import('bootstrap-vue-next')['BDropdown']
-    BDropdownDivider: typeof import('bootstrap-vue-next')['BDropdownDivider']
-    BDropdownForm: typeof import('bootstrap-vue-next')['BDropdownForm']
-    BDropdownGroup: typeof import('bootstrap-vue-next')['BDropdownGroup']
-    BDropdownItem: typeof import('bootstrap-vue-next')['BDropdownItem']
-    BDropdownItemButton: typeof import('bootstrap-vue-next')['BDropdownItemButton']
-    BDropdownText: typeof import('bootstrap-vue-next')['BDropdownText']
-    BForm: typeof import('bootstrap-vue-next')['BForm']
-    BFormCheckbox: typeof import('bootstrap-vue-next')['BFormCheckbox']
-    BFormCheckboxGroup: typeof import('bootstrap-vue-next')['BFormCheckboxGroup']
-    BFormFile: typeof import('bootstrap-vue-next')['BFormFile']
-    BFormGroup: typeof import('bootstrap-vue-next')['BFormGroup']
-    BFormInput: typeof import('bootstrap-vue-next')['BFormInput']
-    BFormInvalidFeedback: typeof import('bootstrap-vue-next')['BFormInvalidFeedback']
-    BFormRadio: typeof import('bootstrap-vue-next')['BFormRadio']
-    BFormRadioGroup: typeof import('bootstrap-vue-next')['BFormRadioGroup']
-    BFormSelect: typeof import('bootstrap-vue-next')['BFormSelect']
-    BFormSelectOption: typeof import('bootstrap-vue-next')['BFormSelectOption']
-    BFormTag: typeof import('bootstrap-vue-next')['BFormTag']
-    BFormTags: typeof import('bootstrap-vue-next')['BFormTags']
-    BFormTextarea: typeof import('bootstrap-vue-next')['BFormTextarea']
-    BImg: typeof import('bootstrap-vue-next')['BImg']
-    BInputGroup: typeof import('bootstrap-vue-next')['BInputGroup']
-    BInputGroupText: typeof import('bootstrap-vue-next')['BInputGroupText']
-    BLink: typeof import('bootstrap-vue-next')['BLink']
-    BListGroup: typeof import('bootstrap-vue-next')['BListGroup']
-    BListGroupItem: typeof import('bootstrap-vue-next')['BListGroupItem']
-    BModal: typeof import('bootstrap-vue-next')['BModal']
-    BModalOrchestrator: typeof import('bootstrap-vue-next')['BModalOrchestrator']
-    BNav: typeof import('bootstrap-vue-next')['BNav']
-    BNavbar: typeof import('bootstrap-vue-next')['BNavbar']
-    BNavbarBrand: typeof import('bootstrap-vue-next')['BNavbarBrand']
-    BNavbarNav: typeof import('bootstrap-vue-next')['BNavbarNav']
-    BNavItem: typeof import('bootstrap-vue-next')['BNavItem']
-    BNavText: typeof import('bootstrap-vue-next')['BNavText']
-    BOverlay: typeof import('bootstrap-vue-next')['BOverlay']
-    BPopover: typeof import('bootstrap-vue-next')['BPopover']
-    BProgress: typeof import('bootstrap-vue-next')['BProgress']
-    BProgressBar: typeof import('bootstrap-vue-next')['BProgressBar']
-    BRow: typeof import('bootstrap-vue-next')['BRow']
+    BAccordion: typeof import('bootstrap-vue-next/components/BAccordion')['BAccordion']
+    BAccordionItem: typeof import('bootstrap-vue-next/components/BAccordion')['BAccordionItem']
+    BBadge: typeof import('bootstrap-vue-next/components/BBadge')['BBadge']
+    BBreadcrumb: typeof import('bootstrap-vue-next/components/BBreadcrumb')['BBreadcrumb']
+    BBreadcrumbItem: typeof import('bootstrap-vue-next/components/BBreadcrumb')['BBreadcrumbItem']
+    BButton: typeof import('bootstrap-vue-next/components/BButton')['BButton']
+    BButtonGroup: typeof import('bootstrap-vue-next/components/BButton')['BButtonGroup']
+    BButtonToolbar: typeof import('bootstrap-vue-next/components/BButton')['BButtonToolbar']
+    BCard: typeof import('bootstrap-vue-next/components/BCard')['BCard']
+    BCardBody: typeof import('bootstrap-vue-next/components/BCard')['BCardBody']
+    BCardGroup: typeof import('bootstrap-vue-next/components/BCard')['BCardGroup']
+    BCardHeader: typeof import('bootstrap-vue-next/components/BCard')['BCardHeader']
+    BCardText: typeof import('bootstrap-vue-next/components/BCard')['BCardText']
+    BCardTitle: typeof import('bootstrap-vue-next/components/BCard')['BCardTitle']
+    BCol: typeof import('bootstrap-vue-next/components/BContainer')['BCol']
+    BCollapse: typeof import('bootstrap-vue-next/components/BCollapse')['BCollapse']
+    BDropdown: typeof import('bootstrap-vue-next/components/BDropdown')['BDropdown']
+    BDropdownDivider: typeof import('bootstrap-vue-next/components/BDropdown')['BDropdownDivider']
+    BDropdownForm: typeof import('bootstrap-vue-next/components/BDropdown')['BDropdownForm']
+    BDropdownGroup: typeof import('bootstrap-vue-next/components/BDropdown')['BDropdownGroup']
+    BDropdownItem: typeof import('bootstrap-vue-next/components/BDropdown')['BDropdownItem']
+    BDropdownItemButton: typeof import('bootstrap-vue-next/components/BDropdown')['BDropdownItemButton']
+    BDropdownText: typeof import('bootstrap-vue-next/components/BDropdown')['BDropdownText']
+    BForm: typeof import('bootstrap-vue-next/components/BForm')['BForm']
+    BFormCheckbox: typeof import('bootstrap-vue-next/components/BFormCheckbox')['BFormCheckbox']
+    BFormCheckboxGroup: typeof import('bootstrap-vue-next/components/BFormCheckbox')['BFormCheckboxGroup']
+    BFormFile: typeof import('bootstrap-vue-next/components/BFormFile')['BFormFile']
+    BFormGroup: typeof import('bootstrap-vue-next/components/BFormGroup')['BFormGroup']
+    BFormInput: typeof import('bootstrap-vue-next/components/BFormInput')['BFormInput']
+    BFormInvalidFeedback: typeof import('bootstrap-vue-next/components/BForm')['BFormInvalidFeedback']
+    BFormRadio: typeof import('bootstrap-vue-next/components/BFormRadio')['BFormRadio']
+    BFormRadioGroup: typeof import('bootstrap-vue-next/components/BFormRadio')['BFormRadioGroup']
+    BFormSelect: typeof import('bootstrap-vue-next/components/BFormSelect')['BFormSelect']
+    BFormSelectOption: typeof import('bootstrap-vue-next/components/BFormSelect')['BFormSelectOption']
+    BFormTag: typeof import('bootstrap-vue-next/components/BFormTags')['BFormTag']
+    BFormTags: typeof import('bootstrap-vue-next/components/BFormTags')['BFormTags']
+    BFormTextarea: typeof import('bootstrap-vue-next/components/BFormTextarea')['BFormTextarea']
+    BImg: typeof import('bootstrap-vue-next/components/BImg')['BImg']
+    BInputGroup: typeof import('bootstrap-vue-next/components/BInputGroup')['BInputGroup']
+    BInputGroupText: typeof import('bootstrap-vue-next/components/BInputGroup')['BInputGroupText']
+    BLink: typeof import('bootstrap-vue-next/components/BLink')['BLink']
+    BListGroup: typeof import('bootstrap-vue-next/components/BListGroup')['BListGroup']
+    BListGroupItem: typeof import('bootstrap-vue-next/components/BListGroup')['BListGroupItem']
+    BModal: typeof import('bootstrap-vue-next/components/BModal')['BModal']
+    BModalOrchestrator: typeof import('bootstrap-vue-next/components/BModal')['BModalOrchestrator']
+    BNav: typeof import('bootstrap-vue-next/components/BNav')['BNav']
+    BNavbar: typeof import('bootstrap-vue-next/components/BNavbar')['BNavbar']
+    BNavbarBrand: typeof import('bootstrap-vue-next/components/BNavbar')['BNavbarBrand']
+    BNavbarNav: typeof import('bootstrap-vue-next/components/BNavbar')['BNavbarNav']
+    BNavItem: typeof import('bootstrap-vue-next/components/BNav')['BNavItem']
+    BNavText: typeof import('bootstrap-vue-next/components/BNav')['BNavText']
+    BOverlay: typeof import('bootstrap-vue-next/components/BOverlay')['BOverlay']
+    BPopover: typeof import('bootstrap-vue-next/components/BPopover')['BPopover']
+    BProgress: typeof import('bootstrap-vue-next/components/BProgress')['BProgress']
+    BProgressBar: typeof import('bootstrap-vue-next/components/BProgress')['BProgressBar']
+    BRow: typeof import('bootstrap-vue-next/components/BContainer')['BRow']
     BSkeleton: typeof import('./src/components/globals/skeletons/BSkeleton.vue')['default']
     BSkeletonWrapper: typeof import('./src/components/globals/skeletons/BSkeletonWrapper.vue')['default']
-    BTab: typeof import('bootstrap-vue-next')['BTab']
-    BTable: typeof import('bootstrap-vue-next')['BTable']
-    BTabs: typeof import('bootstrap-vue-next')['BTabs']
+    BTab: typeof import('bootstrap-vue-next/components/BTabs')['BTab']
+    BTable: typeof import('bootstrap-vue-next/components/BTable')['BTable']
+    BTabs: typeof import('bootstrap-vue-next/components/BTabs')['BTabs']
     ButtonItem: typeof import('./src/components/globals/formItems/ButtonItem.vue')['default']
     CardCollapse: typeof import('./src/components/CardCollapse.vue')['default']
     CardDeckFeed: typeof import('./src/components/CardDeckFeed.vue')['default']
@@ -118,9 +118,7 @@ declare module 'vue' {
     YSpinner: typeof import('./src/components/globals/YSpinner.vue')['default']
   }
   export interface ComponentCustomProperties {
-    vBModal: typeof import('bootstrap-vue-next')['vBModal']
-    vBPopover: typeof import('bootstrap-vue-next')['vBPopover']
-    vBToggle: typeof import('bootstrap-vue-next')['vBToggle']
-    vBTooltip: typeof import('bootstrap-vue-next')['vBTooltip']
+    vBModal: typeof import('bootstrap-vue-next/directives/BModal')['vBModal']
+    vBToggle: typeof import('bootstrap-vue-next/directives/BToggle')['vBToggle']
   }
 }
diff --git a/app/src/types/core/api.ts b/app/src/types/core/api.ts
@@ -232,15 +232,11 @@ export type Diagnosis = {
 
 // FIREWALL
 
-type Protocols = { TCP: number[]; UDP: number[] }
+type PortInfo = { open: boolean; upnp: boolean; comment: string }
 export type Firewall = {
-  ipv4: Protocols
-  ipv6: Protocols
-  uPnP: Protocols & {
-    TCP_TO_CLOSE: number[]
-    UDP_TO_CLOSE: number[]
-    enabled: boolean
-  }
+  router_forwarding_upnp: boolean
+  tcp: Record<number, PortInfo>
+  udp: Record<number, PortInfo>
 }
 
 // LOGS