Fix missing peer context in group network routes tab (#620)

package-lock.json

@@ -58,7 +58,6 @@
         "ip-address": "^10.1.0",
         "ip-cidr": "^3.1.0",
         "js-cookie": "^3.0.5",
-        "js-yaml": "^4.1.1",
         "lodash": "^4.17.23",
         "lucide-react": "^0.566.0",
         "next": "16.1.7",
@@ -86,7 +85,6 @@
         "@faker-js/faker": "^9.5.1",
         "@types/chroma-js": "^3.1.1",
         "@types/js-cookie": "^3.0.6",
-        "@types/js-yaml": "^4.0.9",
         "eslint": "^9.39.1",
         "eslint-config-next": "^16.1.6",
         "postcss": "^8",
@@ -170,6 +168,7 @@
       "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.29.0",
         "@babel/generator": "^7.29.0",
@@ -2999,13 +2998,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/js-yaml": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.9.tgz",
-      "integrity": "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
@@ -3039,6 +3031,7 @@
       "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.10.tgz",
       "integrity": "sha512-WPigyYuGhgZ/cTPRXB2EwUw+XvsRA3GqHlsP4qteqrnnjDrApbS7MxcGr/hke5iUoeB7E/gQtrs9I37zAJ0Vjw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "csstype": "^3.2.2"
       }
@@ -3048,6 +3041,7 @@
       "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.3.tgz",
       "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==",
       "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "@types/react": "^19.2.0"
       }
@@ -3106,6 +3100,7 @@
       "integrity": "sha512-BtE0k6cjwjLZoZixN0t5AKP0kSzlGu7FctRXYuPAm//aaiZhmfq1JwdYpYr1brzEspYyFeF+8XF5j2VK6oalrA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.54.0",
         "@typescript-eslint/types": "8.54.0",
@@ -3586,7 +3581,8 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0.tgz",
       "integrity": "sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@xyflow/react": {
       "version": "12.10.0",
@@ -3625,6 +3621,7 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4047,6 +4044,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -4669,6 +4667,7 @@
       "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
       "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
       "license": "ISC",
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -5197,6 +5196,7 @@
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.2.tgz",
       "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -5394,6 +5394,7 @@
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -6687,6 +6688,7 @@
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
       "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
       "license": "MIT",
+      "peer": true,
       "bin": {
         "jiti": "bin/jiti.js"
       }
@@ -7444,6 +7446,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -7651,6 +7654,7 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz",
       "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7691,6 +7695,7 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz",
       "integrity": "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "scheduler": "^0.27.0"
       },
@@ -8585,6 +8590,7 @@
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.19.tgz",
       "integrity": "sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
         "arg": "^5.0.2",
@@ -8751,6 +8757,7 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
       "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -8916,6 +8923,7 @@
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -9243,6 +9251,7 @@
       "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }

package.json

@@ -66,7 +66,6 @@
     "ip-address": "^10.1.0",
     "ip-cidr": "^3.1.0",
     "js-cookie": "^3.0.5",
-    "js-yaml": "^4.1.1",
     "lodash": "^4.17.23",
     "lucide-react": "^0.566.0",
     "next": "16.1.7",
@@ -97,7 +96,6 @@
     "@faker-js/faker": "^9.5.1",
     "@types/chroma-js": "^3.1.1",
     "@types/js-cookie": "^3.0.6",
-    "@types/js-yaml": "^4.0.9",
     "eslint": "^9.39.1",
     "eslint-config-next": "^16.1.6",
     "postcss": "^8",

src/app/(dashboard)/access-control/inspection-policies/layout.tsx

@@ -1,8 +0,0 @@
-import { globalMetaTitle } from "@utils/meta";
-import type { Metadata } from "next";
-import BlankLayout from "@/layouts/BlankLayout";
-
-export const metadata: Metadata = {
-  title: `Inspection Policies - ${globalMetaTitle}`,
-};
-export default BlankLayout;

src/app/(dashboard)/access-control/inspection-policies/page.tsx

@@ -1,61 +0,0 @@
-"use client";
-
-import Breadcrumbs from "@components/Breadcrumbs";
-import InlineLink from "@components/InlineLink";
-import Paragraph from "@components/Paragraph";
-import SkeletonTable from "@components/skeletons/SkeletonTable";
-import { RestrictedAccess } from "@components/ui/RestrictedAccess";
-import useFetchApi from "@utils/api";
-import { ExternalLinkIcon, ShieldCheck } from "lucide-react";
-import React, { lazy, Suspense } from "react";
-import AccessControlIcon from "@/assets/icons/AccessControlIcon";
-import { usePermissions } from "@/contexts/PermissionsProvider";
-import PoliciesProvider from "@/contexts/PoliciesProvider";
-import { InspectionPolicy } from "@/interfaces/Network";
-import PageContainer from "@/layouts/PageContainer";
-
-const InspectionPoliciesTable = lazy(
-  () =>
-    import(
-      "@/modules/networks/inspection/InspectionPoliciesTable"
-    ),
-);
-
-export default function InspectionPoliciesPage() {
-  const { permission } = usePermissions();
-  const { data: policies, isLoading } =
-    useFetchApi<InspectionPolicy[]>("/inspection-policies");
-
-  return (
-    <PageContainer>
-      <div className={"p-default py-6"}>
-        <Breadcrumbs>
-          <Breadcrumbs.Item
-            href={"/access-control"}
-            label={"Access Control"}
-            icon={<AccessControlIcon size={14} />}
-          />
-          <Breadcrumbs.Item
-            href={"/access-control/inspection-policies"}
-            label={"Inspection Policies"}
-            icon={<ShieldCheck size={15} />}
-          />
-        </Breadcrumbs>
-        <h1>Inspection Policies</h1>
-        <Paragraph>
-          Create reusable inspection rule sets for transparent proxy traffic
-          inspection. Attach them to access control policies to inspect traffic
-          flowing through routing peers.
-        </Paragraph>
-      </div>
-      <PoliciesProvider>
-        <Suspense fallback={<SkeletonTable />}>
-          <InspectionPoliciesTable
-            policies={policies ?? []}
-            isLoading={isLoading}
-          />
-        </Suspense>
-      </PoliciesProvider>
-    </PageContainer>
-  );
-}

src/app/(dashboard)/peer/page.tsx

@@ -2,6 +2,7 @@
 
 import Breadcrumbs from "@components/Breadcrumbs";
 import Button from "@components/Button";
+import { Callout } from "@components/Callout";
 import Card from "@components/Card";
 import HelpText from "@components/HelpText";
 import { Input } from "@components/Input";
@@ -71,7 +72,6 @@ import ReverseProxiesProvider, {
   useReverseProxies,
 } from "@/contexts/ReverseProxiesProvider";
 import { ReverseProxyFlatTargetsTabContent } from "@/modules/reverse-proxy/targets/flat/ReverseProxyFlatTargetsTabContent";
-import { PeerEditIPModal } from "@/modules/peer/PeerEditIPModal";
 import { PeerSSHToggle } from "@/modules/peer/PeerSSHToggle";
 import { RDPButton } from "@/modules/remote-access/rdp/RDPButton";
 import { SSHButton } from "@/modules/remote-access/ssh/SSHButton";
@@ -469,55 +469,31 @@ function PeerInformationCard({ peer }: Readonly<{ peer: Peer }>) {
   const { update } = usePeer();
   const { mutate } = useSWRConfig();
   const [showEditIPModal, setShowEditIPModal] = useState(false);
-  const [showEditIPv6Modal, setShowEditIPv6Modal] = useState(false);
   const { permission } = usePermissions();
 
   const countryText = useMemo(() => {
     return getRegionByPeer(peer);
   }, [getRegionByPeer, peer]);
 
-  const handleSaveIP = (newIP: string) => {
-    notify({
-      title: peer.name,
-      description: "NetBird Peer IP was successfully updated",
-      promise: update({ ip: newIP }).then(() => {
-        mutate("/peers/" + peer.id);
-        setShowEditIPModal(false);
-      }),
-      loadingMessage: "Updating peer IP...",
-    });
-  };
-
-  const handleSaveIPv6 = (newIPv6: string) => {
-    notify({
-      title: peer.name,
-      description: "NetBird Peer IPv6 was successfully updated",
-      promise: update({ ipv6: newIPv6 }).then(() => {
-        mutate("/peers/" + peer.id);
-        setShowEditIPv6Modal(false);
-      }),
-      loadingMessage: "Updating peer IPv6...",
-    });
-  };
-
   return (
     <>
-      <PeerEditIPModal
-        version="v4"
-        currentIP={peer.ip}
-        open={showEditIPModal}
-        onOpenChange={setShowEditIPModal}
-        onSave={handleSaveIP}
-        key={showEditIPModal ? "v4-open" : "v4-closed"}
-      />
-      <PeerEditIPModal
-        version="v6"
-        currentIP={peer.ipv6 || ""}
-        open={showEditIPv6Modal}
-        onOpenChange={setShowEditIPv6Modal}
-        onSave={handleSaveIPv6}
-        key={showEditIPv6Modal ? "v6-open" : "v6-closed"}
-      />
+      <Modal open={showEditIPModal} onOpenChange={setShowEditIPModal}>
+        <EditIPModal
+          onSuccess={(newIP) => {
+            notify({
+              title: peer.name,
+              description: "Peer IP was successfully updated",
+              promise: update({ ip: newIP }).then(() => {
+                mutate("/peers/" + peer.id);
+                setShowEditIPModal(false);
+              }),
+              loadingMessage: "Updating peer IP...",
+            });
+          }}
+          peer={peer}
+          key={showEditIPModal ? 1 : 0}
+        />
+      </Modal>
       <Card className={"w-full xl:w-1/2"}>
         <Card.List>
           <Card.ListItem
@@ -532,36 +508,23 @@ function PeerInformationCard({ peer }: Readonly<{ peer: Peer }>) {
             }
             valueToCopy={peer.ip}
             value={
-              <EditableValue
-                value={peer.ip}
-                canEdit={permission.peers.update}
-                onEdit={() => setShowEditIPModal(true)}
-              />
+              <div className="flex items-center gap-2 justify-between w-full">
+                <span>{peer.ip}</span>
+                {permission.peers.update && (
+                  <button
+                    className="flex w-7 h-7 items-center justify-center gap-2 text-nb-gray-400 hover:text-neutral-100 transition-all hover:bg-nb-gray-800/60 rounded-md cursor-pointer"
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      setShowEditIPModal(true);
+                    }}
+                  >
+                    <PencilIcon size={14} />
+                  </button>
+                )}
+              </div>
             }
           />
 
-          {peer.ipv6 && (
-            <Card.ListItem
-              copy
-              tooltip={false}
-              copyText={"NetBird IPv6 Address"}
-              label={
-                <>
-                  <MapPin size={16} />
-                  NetBird IPv6 Address
-                </>
-              }
-              valueToCopy={peer.ipv6}
-              value={
-                <EditableValue
-                  value={peer.ipv6}
-                  canEdit={permission.peers.update}
-                  onEdit={() => setShowEditIPv6Modal(true)}
-                />
-              }
-            />
-          )}
-
           <Card.ListItem
             copy
             copyText={"Public IP Address"}
@@ -802,29 +765,82 @@ function EditNameModal({ onSuccess, peer, initialName }: Readonly<ModalProps>) {
   );
 }
 
-function EditableValue({
-  value,
-  canEdit,
-  onEdit,
-}: {
-  value: string;
-  canEdit: boolean;
-  onEdit: () => void;
-}) {
+interface EditIPModalProps {
+  onSuccess: (ip: string) => void;
+  peer: Peer;
+}
+
+function EditIPModal({ onSuccess, peer }: Readonly<EditIPModalProps>) {
+  const [ip, setIP] = useState(peer.ip);
+  const [error, setError] = useState("");
+
+  const validateIP = (ipAddress: string) => {
+    const ipRegex =
+      /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
+    return ipRegex.test(ipAddress);
+  };
+
+  const isDisabled = useMemo(() => {
+    if (ip === peer.ip) return true;
+    const trimmedIP = trim(ip);
+    return trimmedIP.length === 0 || !validateIP(ip);
+  }, [ip, peer.ip]);
+
+  React.useEffect(() => {
+    switch (true) {
+      case ip === peer.ip:
+        setError("");
+        break;
+      case !validateIP(ip):
+        setError("Please enter a valid IP, e.g., 100.64.0.15");
+        break;
+      default:
+        setError("");
+        break;
+    }
+  }, [ip, peer.ip]);
+
   return (
-    <div className="flex items-center gap-2 justify-between w-full">
-      <span>{value}</span>
-      {canEdit && (
-        <button
-          className="flex w-7 h-7 items-center justify-center gap-2 text-nb-gray-400 hover:text-neutral-100 transition-all hover:bg-nb-gray-800/60 rounded-md cursor-pointer"
-          onClick={(e) => {
-            e.stopPropagation();
-            onEdit();
-          }}
-        >
-          <PencilIcon size={14} />
-        </button>
-      )}
-    </div>
+    <ModalContent maxWidthClass={"max-w-md"}>
+      <form>
+        <ModalHeader
+          title={"Edit Peer IP Address"}
+          description={"Update the NetBird IP address for this peer."}
+          color={"blue"}
+        />
+
+        <div className={"p-default flex flex-col gap-4"}>
+          <div>
+            <Input
+              placeholder={"e.g., 100.64.0.15"}
+              value={ip}
+              onChange={(e) => setIP(e.target.value)}
+              error={error}
+            />
+          </div>
+
+          <Callout>Changes take effect when the peer reconnects.</Callout>
+        </div>
+
+        <ModalFooter className={"items-center"} separator={false}>
+          <div className={"flex gap-3 w-full justify-end"}>
+            <ModalClose asChild={true}>
+              <Button variant={"secondary"} className={"w-full"}>
+                Cancel
+              </Button>
+            </ModalClose>
+
+            <Button
+              variant={"primary"}
+              className={"w-full"}
+              onClick={() => onSuccess(ip)}
+              disabled={isDisabled}
+            >
+              Save
+            </Button>
+          </div>
+        </ModalFooter>
+      </form>
+    </ModalContent>
   );
 }

src/app/(remote-access)/peer/ssh/page.tsx

@@ -18,7 +18,7 @@ import {
 } from "@utils/version";
 
 export default function SSHPage() {
-  const { peerId, username, port, ipVersion } = useSSHQueryParams();
+  const { peerId, username, port } = useSSHQueryParams();
 
   const {
     data: peer,
@@ -48,7 +48,6 @@ export default function SSHPage() {
           peer={peer}
           username={username}
           port={port}
-          ipVersion={ipVersion}
         />
       ) : (
         <LoadingMessage message={"Starting ssh session..."} />
@@ -61,10 +60,9 @@ type Props = {
   username: string;
   port: string;
   peer: Peer;
-  ipVersion: string | null;
 };
 
-function SSHTerminal({ username, port, peer, ipVersion }: Props) {
+function SSHTerminal({ username, port, peer }: Props) {
   const client = useNetBirdClient();
   const connected = useRef(false);
   const sshConnectedOnce = useRef(false);
@@ -83,12 +81,9 @@ function SSHTerminal({ username, port, peer, ipVersion }: Props) {
   const isClientDisconnected = client.status === NetBirdStatus.DISCONNECTED;
   const isClientConnecting = client.status === NetBirdStatus.CONNECTING;
 
-  // Use the FQDN when an IP version is specified so the dialer resolves to the correct address family.
-  const sshHost = ipVersion ? peer.dns_label || peer.ip : peer.ip;
-
   useEffect(() => {
-    document.title = `${username}@${sshHost} - ${peer.hostname}`;
-  }, [username, peer, client, sshHost]);
+    document.title = `${username}@${peer.ip} - ${peer.hostname}`;
+  }, [username, peer, client]);
 
   const handleReconnect = async () => {
     if (!peer?.id) return;
@@ -102,10 +97,9 @@ function SSHTerminal({ username, port, peer, ipVersion }: Props) {
       const rules = [`${protocol}/${aclPort}`];
       await client?.connectTemporary(peer.id, rules);
       await ssh({
-        hostname: sshHost,
+        hostname: peer.ip,
         port: Number(port),
         username,
-        ipVersion: ipVersion || undefined,
       });
     } catch (error) {
       console.error("Reconnection failed:", error);
@@ -129,10 +123,9 @@ function SSHTerminal({ username, port, peer, ipVersion }: Props) {
         const rules = [`${protocol}/${aclPort}`];
         await client?.connectTemporary(peer.id, rules);
         const res = await ssh({
-          hostname: sshHost,
+          hostname: peer.ip,
           port: Number(port),
           username,
-          ipVersion: ipVersion || undefined,
         });
         if (res === SSHStatus.CONNECTED) {
           sshConnectedOnce.current = true;

src/components/DeviceCard.tsx

@@ -28,13 +28,8 @@ export const DeviceCard = ({
   const descriptionText = useMemo(() => {
     return description !== undefined
       ? description
-      : address ||
-        (device?.ip
-          ? device.ipv6
-            ? `${device.ip}, ${device.ipv6}`
-            : device.ip
-          : resource?.address);
-  }, [description, address, device, resource]);
+      : address || device?.ip || resource?.address;
+  }, [description, address, device]);
 
   return (
     <div

src/components/PeerGroupSelector.tsx

@@ -968,8 +968,7 @@ const ResourcesList = ({
 const peersSearchPredicate = (item: Peer, query: string) => {
   const lowerCaseQuery = query.toLowerCase();
   if (item.name.toLowerCase().includes(lowerCaseQuery)) return true;
-  if (item.ip.toLowerCase().includes(lowerCaseQuery)) return true;
-  return item.ipv6?.toLowerCase().includes(lowerCaseQuery) ?? false;
+  return item.ip.toLowerCase().includes(lowerCaseQuery);
 };
 
 const PeersList = ({
@@ -1060,7 +1059,6 @@ const PeersList = ({
                   }
                 >
                   {res.ip}
-                  {res.ipv6 && `, ${res.ipv6}`}
                   <RadioItem value={res.id} />
                 </div>
               </div>

src/components/PeerSelector.tsx

@@ -30,8 +30,7 @@ const searchPredicate = (item: Peer, query: string) => {
   const lowerCaseQuery = query.toLowerCase();
   if (item.name.toLowerCase().includes(lowerCaseQuery)) return true;
   if (item.hostname.toLowerCase().includes(lowerCaseQuery)) return true;
-  if (item.ip.toLowerCase().startsWith(lowerCaseQuery)) return true;
-  return !!item.ipv6?.toLowerCase().startsWith(lowerCaseQuery);
+  return item.ip.toLowerCase().startsWith(lowerCaseQuery);
 };
 
 export function PeerSelector({
@@ -127,7 +126,6 @@ export function PeerSelector({
                 >
                   <MapPinIcon />
                   {value.ip}
-                  {value.ipv6 && `, ${value.ipv6}`}
                 </div>
               </div>
             ) : (
@@ -242,7 +240,6 @@ export function PeerSelector({
                     >
                       <MapPinIcon />
                       {option.ip}
-                      {option.ipv6 && `, ${option.ipv6}`}
                     </div>
                   </FullTooltip>
                 );

src/contexts/PeerProvider.tsx

@@ -30,7 +30,6 @@ const PeerContext = React.createContext(
       inactivityExpiration?: boolean;
       approval_required?: boolean;
       ip?: string;
-      ipv6?: string;
     }) => Promise<Peer>;
     toggleSSH: (newState: boolean) => Promise<void>;
     setSSHInstructionsModal: (open: boolean) => void;
@@ -81,7 +80,6 @@ export default function PeerProvider({
     inactivityExpiration?: boolean;
     approval_required?: boolean;
     ip?: string;
-    ipv6?: string;
   }) => {
     return peerRequest.put(
       {
@@ -101,7 +99,6 @@ export default function PeerProvider({
             ? undefined
             : props.approval_required,
         ip: props.ip != undefined ? props.ip : undefined,
-        ipv6: props.ipv6 != undefined ? props.ipv6 : undefined,
       },
       `/${peer.id}`,
     );

src/contexts/PoliciesProvider.tsx

@@ -83,9 +83,6 @@ export default function PoliciesProvider({ children }: Props) {
       source_posture_checks: (policy.source_posture_checks ?? []).map((c) =>
         typeof c === "string" ? c : c.id,
       ),
-      inspection_policies: (policy.inspection_policies ?? []).map((p) =>
-        typeof p === "string" ? p : p.id,
-      ),
       rules: [
         {
           ...rule,
@@ -157,10 +154,6 @@ export default function PoliciesProvider({ children }: Props) {
               toUpdate.source_posture_checks ??
               policy.source_posture_checks ??
               [],
-            inspection_policies:
-              toUpdate.inspection_policies ??
-              policy.inspection_policies ??
-              [],
           },
           `/${policy.id}`,
         )

src/interfaces/Account.ts

@@ -28,8 +28,6 @@ export interface Account {
     auto_update_version: string;
     auto_update_always: boolean;
     local_auth_disabled?: boolean;
-    ipv6_enabled_groups?: string[];
-    network_range_v6?: string;
   };
   onboarding?: AccountOnboarding;
 }

src/interfaces/Network.ts

@@ -17,90 +17,9 @@ export interface NetworkRouter {
   metric: number;
   masquerade: boolean;
   enabled: boolean;
-  inspection?: InspectionConfig;
   search?: string;
 }
 
-export type InspectionAction = "allow" | "block" | "inspect";
-export type InspectionMode = "builtin" | "envoy" | "external";
-
-export interface InspectionEnvoySnippets {
-  http_filters?: string;
-  network_filters?: string;
-  clusters?: string;
-}
-
-export interface InspectionConfig {
-  enabled: boolean;
-  mode?: InspectionMode;
-  external_url?: string;
-  default_action?: InspectionAction;
-  redirect_ports?: number[];
-  rules?: InspectionRule[];
-  icap?: InspectionICAPConfig;
-  ca_cert_pem?: string;
-  ca_key_pem?: string;
-  listen_port?: number;
-}
-
-export interface InspectionRule {
-  id?: string;
-  name: string;
-  enabled: boolean;
-  domains?: string[];
-  networks?: string[];
-  ports?: number[];
-  action: InspectionAction;
-  priority: number;
-}
-
-// Reusable inspection policy referenced from access control policies.
-// Contains both L7 rules and proxy infrastructure config (CA, ICAP, mode).
-export interface InspectionPolicy {
-  id?: string;
-  name: string;
-  description?: string;
-  enabled: boolean;
-  rules: InspectionPolicyRule[];
-
-  // Proxy infrastructure config
-  mode?: InspectionMode;
-  external_url?: string;
-  default_action?: InspectionAction;
-  redirect_ports?: number[];
-  ca_cert_pem?: string;
-  ca_key_pem?: string;
-  icap?: InspectionICAPConfig;
-
-  // Envoy sidecar config (mode "envoy" only)
-  envoy_binary_path?: string;
-  envoy_admin_port?: number;
-  envoy_snippets?: InspectionEnvoySnippets;
-}
-
-export interface InspectionPolicyRule {
-  domains?: string[];
-  networks?: string[];
-  protocols?: InspectionProtocol[];
-  paths?: string[];
-  action: InspectionAction;
-  priority: number;
-}
-
-export type InspectionProtocol =
-  | "http"
-  | "https"
-  | "h2"
-  | "h3"
-  | "websocket"
-  | "other";
-
-export interface InspectionICAPConfig {
-  reqmod_url?: string;
-  respmod_url?: string;
-  max_connections?: number;
-}
-
 export interface NetworkResource {
   id: string;
   name: string;

src/interfaces/Peer.ts

@@ -5,7 +5,6 @@ export interface Peer {
   id?: string;
   name: string;
   ip: string;
-  ipv6?: string;
   connected: boolean;
   created_at?: Date;
   last_seen: Date;

src/interfaces/Policy.ts

@@ -1,5 +1,4 @@
 import { Group } from "@/interfaces/Group";
-import { InspectionPolicy } from "@/interfaces/Network";
 import { PostureCheck } from "@/interfaces/PostureCheck";
 
 export interface Policy {
@@ -10,7 +9,6 @@ export interface Policy {
   query?: string;
   rules: PolicyRule[];
   source_posture_checks: string[] | PostureCheck[];
-  inspection_policies?: string[] | InspectionPolicy[];
 }
 
 export interface PolicyRule {

src/interfaces/ReverseProxy.ts

@@ -22,11 +22,20 @@ export interface ReverseProxy {
   meta?: ReverseProxyMeta;
 }
 
+export const CrowdSecMode = {
+  OFF: "off",
+  ENFORCE: "enforce",
+  OBSERVE: "observe",
+} as const;
+
+export type CrowdSecMode = (typeof CrowdSecMode)[keyof typeof CrowdSecMode];
+
 export interface AccessRestrictions {
   allowed_cidrs?: string[];
   blocked_cidrs?: string[];
   allowed_countries?: string[];
   blocked_countries?: string[];
+  crowdsec_mode?: CrowdSecMode;
 }
 
 export interface ReverseProxyMeta {
@@ -102,6 +111,7 @@ export interface ReverseProxyDomain {
   target_cluster?: string;
   supports_custom_ports?: boolean;
   require_subdomain?: boolean;
+  supports_crowdsec?: boolean;
 }
 
 export enum ReverseProxyDomainType {
@@ -149,6 +159,7 @@ export interface ReverseProxyEvent {
   bytes_upload: number;
   bytes_download: number;
   protocol?: EventProtocol;
+  metadata?: Record<string, string>;
 }
 
 export function isL4Event(event: ReverseProxyEvent): boolean {

src/layouts/Navigation.tsx

@@ -121,13 +121,6 @@ export default function Navigation({
                     href={"/groups"}
                     visible={permission.policies.read}
                   />
-                  <SidebarItem
-                    label="Inspection Policies"
-                    isChild
-                    href={"/access-control/inspection-policies"}
-                    exactPathMatch={true}
-                    visible={permission.policies.read}
-                  />
                   <SidebarItem
                     label="Posture Checks"
                     isChild

src/modules/access-control/AccessControlModal.tsx

@@ -50,9 +50,6 @@ import { NetworkResource } from "@/interfaces/Network";
 import { Policy, PolicyRuleResource, Protocol } from "@/interfaces/Policy";
 import { PostureCheck } from "@/interfaces/PostureCheck";
 import { useAccessControl } from "@/modules/access-control/useAccessControl";
-import { InspectionPolicy } from "@/interfaces/Network";
-import { InspectionTab } from "@/modules/networks/inspection/InspectionTab";
-import { InspectionTabTrigger } from "@/modules/networks/inspection/InspectionTabTrigger";
 import { PostureCheckTab } from "@/modules/posture-checks/ui/PostureCheckTab";
 import { PostureCheckTabTrigger } from "@/modules/posture-checks/ui/PostureCheckTabTrigger";
 import { SSHAccessType } from "@/modules/access-control/ssh/SSHAccessType";
@@ -189,9 +186,6 @@ export function AccessControlModalContent({
     setSshAccessType,
     sshAuthorizedGroups,
     setSshAuthorizedGroups,
-    inspectionPolicies,
-    setInspectionPolicies,
-    isInspectionPoliciesLoading,
   } = useAccessControl({
     policy,
     postureCheckTemplates,
@@ -208,7 +202,6 @@ export function AccessControlModalContent({
     if (initialTab && initialTab !== "") return initialTab;
     if (!cell) return "policy";
     if (cell == "posture_checks") return "posture_checks";
-    if (cell == "inspection_policies") return "inspection";
     return "policy";
   });
 
@@ -259,7 +252,6 @@ export function AccessControlModalContent({
             Policy
           </TabsTrigger>
           <PostureCheckTabTrigger disabled={!canContinueToPostureChecks} />
-          <InspectionTabTrigger disabled={!canContinueToPostureChecks} />
           <TabsTrigger value={"general"} disabled={!canContinueToPostureChecks}>
             <Text
               size={16}
@@ -526,11 +518,6 @@ export function AccessControlModalContent({
           postureChecks={postureChecks}
           setPostureChecks={setPostureChecks}
         />
-        <InspectionTab
-          isLoading={isInspectionPoliciesLoading}
-          inspectionPolicies={inspectionPolicies}
-          setInspectionPolicies={setInspectionPolicies}
-        />
         <TabsContent value={"general"} className={"px-8 pb-6"}>
           <div className={"flex flex-col gap-6"}>
             <div>
@@ -611,24 +598,6 @@ export function AccessControlModalContent({
                   >
                     Back
                   </Button>
-                  <Button
-                    variant={"primary"}
-                    onClick={() => setTab("inspection")}
-                    disabled={!canContinueToPostureChecks}
-                  >
-                    Continue
-                  </Button>
-                </>
-              )}
-
-              {tab == "inspection" && (
-                <>
-                  <Button
-                    variant={"secondary"}
-                    onClick={() => setTab("posture_checks")}
-                  >
-                    Back
-                  </Button>
                   <Button
                     variant={"primary"}
                     onClick={() => setTab("general")}
@@ -643,7 +612,7 @@ export function AccessControlModalContent({
                 <>
                   <Button
                     variant={"secondary"}
-                    onClick={() => setTab("inspection")}
+                    onClick={() => setTab("posture_checks")}
                   >
                     Back
                   </Button>

src/modules/access-control/table/AccessControlInspectionCell.tsx

@@ -1,39 +0,0 @@
-import Badge from "@components/Badge";
-import { IconCirclePlus } from "@tabler/icons-react";
-import { Eye } from "lucide-react";
-import React from "react";
-import { usePermissions } from "@/contexts/PermissionsProvider";
-import { Policy } from "@/interfaces/Policy";
-
-type Props = {
-  policy: Policy;
-};
-
-export default function AccessControlInspectionCell({ policy }: Props) {
-  const { permission } = usePermissions();
-  const isDisabled = !permission.policies.create || !permission.policies.update;
-  const count = policy.inspection_policies?.length ?? 0;
-
-  return count > 0 ? (
-    <div className="flex">
-      <Badge variant="gray" useHover={true}>
-        <Eye size={14} className="text-netbird" />
-        {count} Inspection
-      </Badge>
-    </div>
-  ) : (
-    <div className="flex">
-      <Badge
-        variant="gray"
-        useHover={!isDisabled}
-        onClick={(e) => {
-          if (isDisabled) e.stopPropagation();
-        }}
-        disabled={isDisabled}
-      >
-        <IconCirclePlus size={14} />
-        Add Inspection
-      </Badge>
-    </div>
-  );
-}