Include all settings in put request to prevent overwrite (#405)

* update regex to allow one char domains in DNS routing modal

* update regex

next.config.js

@@ -5,6 +5,9 @@ const nextConfig = {
     unoptimized: true,
   },
   reactStrictMode: false,
+  env: {
+    APP_ENV: process.env.APP_ENV || "production",
+  },
 };
 
 module.exports = nextConfig;

package-lock.json

@@ -48,7 +48,7 @@
         "framer-motion": "^10.16.4",
         "ip-cidr": "^3.1.0",
         "lodash": "^4.17.21",
-        "lucide-react": "^0.287.0",
+        "lucide-react": "^0.383.0",
         "next": "13.5.5",
         "next-themes": "^0.2.1",
         "punycode": "^2.3.1",
@@ -5351,9 +5351,9 @@
       }
     },
     "node_modules/lucide-react": {
-      "version": "0.287.0",
-      "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.287.0.tgz",
-      "integrity": "sha512-auxP2bTGiMoELzX+6ItTeNzLmhGd/O+PHBsrXV2YwPXYCxarIFJhiMOSzFT9a1GWeYPSZtnWdLr79IVXr/5JqQ==",
+      "version": "0.383.0",
+      "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.383.0.tgz",
+      "integrity": "sha512-13xlG0CQCJtzjSQYwwJ3WRqMHtRj3EXmLlorrARt7y+IHnxUCp3XyFNL1DfaGySWxHObDvnu1u1dV+0VMKHUSg==",
       "peerDependencies": {
         "react": "^16.5.1 || ^17.0.0 || ^18.0.0"
       }

package.json

@@ -53,7 +53,7 @@
     "framer-motion": "^10.16.4",
     "ip-cidr": "^3.1.0",
     "lodash": "^4.17.21",
-    "lucide-react": "^0.287.0",
+    "lucide-react": "^0.383.0",
     "next": "13.5.5",
     "next-themes": "^0.2.1",
     "punycode": "^2.3.1",

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

@@ -23,6 +23,7 @@ import Separator from "@components/Separator";
 import FullScreenLoading from "@components/ui/FullScreenLoading";
 import LoginExpiredBadge from "@components/ui/LoginExpiredBadge";
 import TextWithTooltip from "@components/ui/TextWithTooltip";
+import useRedirect from "@hooks/useRedirect";
 import { IconCloudLock, IconInfoCircle } from "@tabler/icons-react";
 import useFetchApi from "@utils/api";
 import dayjs from "dayjs";
@@ -66,8 +67,11 @@ import PeerRoutesTable from "@/modules/peer/PeerRoutesTable";
 export default function PeerPage() {
   const queryParameter = useSearchParams();
   const peerId = queryParameter.get("id");
-  const { data: peer } = useFetchApi<Peer>("/peers/" + peerId);
-  return peer ? (
+  const { data: peer, isLoading } = useFetchApi<Peer>("/peers/" + peerId, true);
+
+  useRedirect("/peers", false, !peerId);
+
+  return peer && !isLoading ? (
     <PeerProvider peer={peer}>
       <PeerOverview />
     </PeerProvider>

src/app/(dashboard)/team/user/page.tsx

@@ -10,6 +10,7 @@ import Paragraph from "@components/Paragraph";
 import { PeerGroupSelector } from "@components/PeerGroupSelector";
 import Separator from "@components/Separator";
 import FullScreenLoading from "@components/ui/FullScreenLoading";
+import useRedirect from "@hooks/useRedirect";
 import { IconCirclePlus, IconSettings2 } from "@tabler/icons-react";
 import useFetchApi, { useApiCall } from "@utils/api";
 import { generateColorFromString } from "@utils/helpers";
@@ -42,6 +43,8 @@ export default function UserPage() {
     return users?.find((u) => u.id === userId);
   }, [users, userId]);
 
+  useRedirect("/team/users", false, !userId);
+
   return !isLoading && user ? (
     <UserOverview user={user} />
   ) : (

src/app/not-found.tsx

@@ -1,14 +1,40 @@
 "use client";
 
 import FullScreenLoading from "@components/ui/FullScreenLoading";
-import { useRouter } from "next/navigation";
-import { useEffect } from "react";
+import { useLocalStorage } from "@hooks/useLocalStorage";
+import { useRedirect } from "@hooks/useRedirect";
+import { useEffect, useState } from "react";
 
+type Props = {
+  url: string;
+  queryParams?: string;
+};
 export default function NotFound() {
-  const router = useRouter();
-  useEffect(() => {
-    router.push("/peers");
-  });
+  const [mounted, setMounted] = useState(false);
+  const [tempQueryParams, setTempQueryParams] = useLocalStorage(
+    "netbird-query-params",
+    "",
+  );
+  const [queryParams, setQueryParams] = useState("");
 
-  return <FullScreenLoading />;
+  useEffect(() => {
+    setQueryParams(tempQueryParams);
+    setTempQueryParams("");
+    setMounted(true);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  return mounted ? (
+    <Redirect
+      url={window?.location?.pathname || "/"}
+      queryParams={queryParams}
+    />
+  ) : (
+    <FullScreenLoading />
+  );
 }
+
+const Redirect = ({ url, queryParams }: Props) => {
+  useRedirect("/peers" + (queryParams && `?${queryParams}`));
+  return <FullScreenLoading />;
+};

src/assets/icons/CircleIcon.tsx

@@ -16,6 +16,8 @@ export default function CircleIcon({
   return (
     <span
       style={{ width: size + "px", height: size + "px" }}
+      data-cy="circle-icon"
+      data-cy-status={active ? "active" : "inactive"}
       className={cn(
         "rounded-full",
         active

src/components/ButtonGroup.tsx

@@ -5,14 +5,16 @@ import React, { forwardRef } from "react";
 type Props = {
   children: React.ReactNode;
   disabled?: boolean;
+  className?: string;
 };
 
-function ButtonGroup({ children, disabled }: Props) {
+function ButtonGroup({ children, disabled, className }: Props) {
   return (
     <div
       className={cn(
         "rounded-lg border-[1px] dark:border-nb-gray-900 border-neutral-200 overflow-hidden flex items-center justify-center shrink-0 border-separate",
         disabled ? "opacity-100 !border-nb-gray-900/20" : "",
+        className,
       )}
     >
       {children}
@@ -21,7 +23,10 @@ function ButtonGroup({ children, disabled }: Props) {
 }
 
 const ButtonGroupButton = forwardRef(
-  ({ ...props }: ButtonProps, ref: React.ForwardedRef<HTMLButtonElement>) => {
+  (
+    { className, ...props }: ButtonProps,
+    ref: React.ForwardedRef<HTMLButtonElement>,
+  ) => {
     return (
       <Button
         ref={ref}
@@ -31,6 +36,7 @@ const ButtonGroupButton = forwardRef(
         className={cn(
           "first:border-l-0 last:border-r-0 border-t-0 border-b-0 h-[41px]",
           "!py-2.5 !px-4",
+          className,
         )}
       />
     );

src/components/Input.tsx

@@ -13,6 +13,7 @@ export interface InputProps
   icon?: React.ReactNode;
   error?: string;
   errorTooltip?: boolean;
+  errorTooltipPosition?: "top" | "top-right";
 }
 
 const inputVariants = cva("", {
@@ -49,6 +50,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
       maxWidthClass = "",
       error,
       errorTooltip = false,
+      errorTooltipPosition = "top",
       ...props
     },
     ref,
@@ -105,9 +107,12 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
           </div>
           {error && errorTooltip && (
             <div
-              className={
-                "absolute right-0 top-2 h-[0px] w-full flex items-center pr-3 justify-center"
-              }
+              className={cn(
+                errorTooltipPosition == "top" &&
+                  "absolute right-0 top-2 h-[0px] w-full flex items-center pr-3 justify-center",
+                errorTooltipPosition == "top-right" &&
+                  "absolute -right-6 top-2 h-[0px] w-full flex items-center pr-3 justify-end",
+              )}
             >
               <FullTooltip
                 content={
@@ -120,7 +125,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
                   </div>
                 }
                 interactive={false}
-                align={"center"}
+                align={errorTooltipPosition == "top" ? "center" : "end"}
                 side={"top"}
                 keepOpen={true}
               >

src/components/NetworkRouteSelector.tsx

@@ -1,4 +1,5 @@
 import { CommandItem } from "@components/Command";
+import FullTooltip from "@components/FullTooltip";
 import { Popover, PopoverContent, PopoverTrigger } from "@components/Popover";
 import { IconArrowBack } from "@tabler/icons-react";
 import useFetchApi from "@utils/api";
@@ -62,8 +63,13 @@ export function NetworkRouteSelector({
     const isSearching = search.length > 0;
     const found =
       dropdownOptions.filter((item) => {
+        const hasDomains = item?.domains ? item.domains.length > 0 : false;
+        const domains =
+          hasDomains && item?.domains ? item?.domains.join(" ") : "";
         return (
-          item.network_id.includes(search) || item.network.includes(search)
+          item.network_id.includes(search) ||
+          item.network?.includes(search) ||
+          domains.includes(search)
         );
       }).length > 0;
     return isSearching && !found;
@@ -117,6 +123,7 @@ export function NetworkRouteSelector({
                 >
                   {value.network}
                 </div>
+                <DomainList domains={value?.domains} />
               </div>
             ) : (
               <span>Select an existing network...</span>
@@ -208,7 +215,11 @@ export function NetworkRouteSelector({
                     return (
                       <CommandItem
                         key={option.network + option.network_id}
-                        value={option.network + option.network_id}
+                        value={
+                          option.network +
+                          option.network_id +
+                          option?.domains?.join(", ")
+                        }
                         onSelect={() => {
                           togglePeer(option);
                           setOpen(false);
@@ -226,6 +237,7 @@ export function NetworkRouteSelector({
                         >
                           {option.network}
                         </div>
+                        <DomainList domains={option?.domains} />
                       </CommandItem>
                     );
                   })}
@@ -238,3 +250,19 @@ export function NetworkRouteSelector({
     </Popover>
   );
 }
+
+function DomainList({ domains }: { domains?: string[] }) {
+  const firstDomain = domains ? domains[0] : "";
+  return (
+    domains &&
+    domains.length > 0 && (
+      <FullTooltip
+        content={<div className={"text-xs max-w-sm"}>{domains.join(", ")}</div>}
+      >
+        <div className={"text-xs text-nb-gray-300"}>
+          {firstDomain} {domains.length > 1 && "+" + (domains.length - 1)}
+        </div>
+      </FullTooltip>
+    )
+  );
+}

src/components/PeerGroupSelector.tsx

@@ -198,6 +198,7 @@ export function PeerGroupSelector({
           <CommandList className={"w-full"}>
             <div className={"relative"}>
               <CommandInput
+                data-cy={"group-search-input"}
                 className={cn(
                   "min-h-[42px] w-full relative",
                   "border-b-0 border-t-0 border-r-0 border-l-0 border-neutral-200 dark:border-nb-gray-700 items-center",

src/components/SegmentedTabs.tsx

@@ -21,12 +21,19 @@ function SegmentedTabs({ value, onChange, children }: Props) {
   );
 }
 
-function List({ children }: { children: React.ReactNode }) {
+function List({
+  children,
+  className = "",
+}: {
+  children: React.ReactNode;
+  className?: string;
+}) {
   return (
     <TabsList
-      className={
-        "bg-nb-gray-930/70 p-1.5 rounded-t-lg flex justify-center gap-1 border border-b-0 border-nb-gray-900"
-      }
+      className={cn(
+        "bg-nb-gray-930/70 p-1.5 rounded-t-lg flex justify-center gap-1 border border-b-0 border-nb-gray-900",
+        className,
+      )}
     >
       {children}
     </TabsList>

src/components/modal/Modal.tsx

@@ -75,7 +75,10 @@ const ModalContent = React.forwardRef<
           <>
             {children}
             {showClose && (
-              <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-white transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-neutral-950 focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-neutral-100 data-[state=open]:text-neutral-500 dark:ring-offset-neutral-950 dark:focus:ring-neutral-300 dark:data-[state=open]:bg-neutral-800 dark:data-[state=open]:text-neutral-400">
+              <DialogPrimitive.Close
+                data-cy={"modal-close"}
+                className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-white transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-neutral-950 focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-neutral-100 data-[state=open]:text-neutral-500 dark:ring-offset-neutral-950 dark:focus:ring-neutral-300 dark:data-[state=open]:bg-neutral-800 dark:data-[state=open]:text-neutral-400"
+              >
                 <X className="h-4 w-4" />
                 <span className="sr-only">Close</span>
               </DialogPrimitive.Close>

src/components/modal/ModalHeader.tsx

@@ -10,6 +10,7 @@ interface Props extends IconVariant {
   className?: string;
   margin?: string;
   truncate?: boolean;
+  children?: React.ReactNode;
 }
 export default function ModalHeader({
   icon,
@@ -19,6 +20,7 @@ export default function ModalHeader({
   className = "pb-6 px-8",
   margin = "mt-0",
   truncate = false,
+  children,
 }: Props) {
   return (
     <div className={cn(className, "min-w-0")}>
@@ -26,11 +28,15 @@ export default function ModalHeader({
         {icon && <SquareIcon color={color} icon={icon} />}
         <div className={"min-w-0"}>
           <h2 className={"text-lg my-0 leading-[1.5]"}>{title}</h2>
-          <Paragraph
-            className={cn("text-sm", margin, truncate && "!block truncate")}
-          >
-            {description}
-          </Paragraph>
+          {children ? (
+            <>{children}</>
+          ) : (
+            <Paragraph
+              className={cn("text-sm", margin, truncate && "!block truncate")}
+            >
+              {description}
+            </Paragraph>
+          )}
         </div>
       </div>
     </div>

src/components/table/DataTableRowsPerPage.tsx

@@ -28,9 +28,10 @@ export function DataTableRowsPerPage<TData>({
             role="combobox"
             aria-expanded={open}
             disabled={disabled}
+            data-cy={"rows-per-page"}
             className="w-[200px] justify-between"
           >
-            <RowsIcon size={15} className={"text-nb-gray-300"} />
+            <RowsIcon size={15} className={"text-nb-gray-300 shrink-0"} />
             <div>
               <span className={"text-white"}>
                 {table.getState().pagination.pageSize}
@@ -47,6 +48,7 @@ export function DataTableRowsPerPage<TData>({
                 <CommandItem
                   key={val}
                   value={val.toString()}
+                  data-cy={`rows-per-page-value`}
                   onSelect={(currentValue) => {
                     table.setPageSize(Number(currentValue));
                     setOpen(false);

src/components/ui/DomainListBadge.tsx

@@ -0,0 +1,70 @@
+import Badge from "@components/Badge";
+import FullTooltip from "@components/FullTooltip";
+import { GlobeIcon } from "lucide-react";
+import * as React from "react";
+
+type Props = {
+  domains: string[];
+};
+export const DomainListBadge = ({ domains }: Props) => {
+  const firstDomain = domains.length > 0 ? domains[0] : undefined;
+
+  return (
+    <DomainsTooltip domains={domains}>
+      <div className={"inline-flex items-center gap-2"}>
+        {firstDomain && (
+          <Badge variant={"gray"}>
+            <GlobeIcon size={10} />
+            {firstDomain}
+          </Badge>
+        )}
+        {domains && domains.length > 1 && (
+          <Badge variant={"gray"}>+ {domains.length - 1}</Badge>
+        )}
+      </div>
+    </DomainsTooltip>
+  );
+};
+
+export const DomainsTooltip = ({
+  domains,
+  children,
+  className,
+}: {
+  domains: string[];
+  children: React.ReactNode;
+  className?: string;
+}) => {
+  return (
+    <FullTooltip
+      interactive={false}
+      className={className}
+      content={
+        <div className={"flex flex-col gap-2 items-start"}>
+          {domains.map((domain) => {
+            return (
+              domain && (
+                <div
+                  key={domain}
+                  className={"flex gap-2 items-center justify-between w-full"}
+                >
+                  <div
+                    className={
+                      "flex gap-2 items-center text-nb-gray-300 text-xs"
+                    }
+                  >
+                    <GlobeIcon size={11} />
+                    {domain}
+                  </div>
+                </div>
+              )
+            );
+          })}
+        </div>
+      }
+      disabled={domains.length <= 1}
+    >
+      {children}
+    </FullTooltip>
+  );
+};

src/components/ui/InputDomain.tsx

@@ -0,0 +1,88 @@
+import Button from "@components/Button";
+import { Input } from "@components/Input";
+import { validator } from "@utils/helpers";
+import { uniqueId } from "lodash";
+import { GlobeIcon, MinusCircleIcon } from "lucide-react";
+import * as React from "react";
+import { useEffect, useMemo, useState } from "react";
+import { Domain } from "@/interfaces/Domain";
+
+type Props = {
+  value: Domain;
+  onChange: (d: Domain) => void;
+  onRemove: () => void;
+  onError?: (error: boolean) => void;
+  error?: string;
+};
+enum ActionType {
+  ADD = "ADD",
+  REMOVE = "REMOVE",
+  UPDATE = "UPDATE",
+}
+
+export const domainReducer = (state: Domain[], action: any): Domain[] => {
+  switch (action.type) {
+    case ActionType.ADD:
+      return [...state, { name: "", id: uniqueId("domain") }];
+    case ActionType.REMOVE:
+      return state.filter((_, i) => i !== action.index);
+    case ActionType.UPDATE:
+      return state.map((n, i) => (i === action.index ? action.d : n));
+    default:
+      return state;
+  }
+};
+
+export default function InputDomain({
+  value,
+  onChange,
+  onRemove,
+  onError,
+}: Readonly<Props>) {
+  const [name, setName] = useState(value?.name || "");
+
+  const handleNameChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    setName(e.target.value);
+    onChange({ ...value, name: e.target.value });
+  };
+
+  const domainError = useMemo(() => {
+    if (name == "") {
+      return "";
+    }
+    const valid = validator.isValidDomain(name);
+    if (!valid) {
+      return "Please enter a valid domain, e.g. example.com or intra.example.com";
+    }
+  }, [name]);
+
+  useEffect(() => {
+    const hasError = domainError !== "" && domainError !== undefined;
+    onError?.(hasError);
+    return () => onError?.(false);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [domainError]);
+
+  return (
+    <div className={"flex gap-2 w-full"}>
+      <div className={"w-full"}>
+        <Input
+          customPrefix={<GlobeIcon size={15} />}
+          placeholder={"e.g., example.com"}
+          maxWidthClass={"w-full"}
+          value={name}
+          error={domainError}
+          onChange={handleNameChange}
+        />
+      </div>
+
+      <Button
+        className={"h-[42px]"}
+        variant={"default-outline"}
+        onClick={onRemove}
+      >
+        <MinusCircleIcon size={15} />
+      </Button>
+    </div>
+  );
+}

src/contexts/DialogProvider.tsx

@@ -94,6 +94,7 @@ export default function DialogProvider({ children }: Props) {
                   className={"w-full"}
                   size={"sm"}
                   tabIndex={-1}
+                  data-cy={"confirmation.cancel"}
                   onClick={() => fn.current && fn.current(false)}
                 >
                   {dialogOptions.cancelText || "Cancel"}
@@ -109,6 +110,7 @@ export default function DialogProvider({ children }: Props) {
                 }
                 className={"w-full"}
                 size={"sm"}
+                data-cy={"confirmation.confirm"}
                 onClick={() => fn.current && fn.current(true)}
               >
                 {dialogOptions.confirmText || "Confirm"}

src/contexts/PeerProvider.tsx

@@ -77,9 +77,7 @@ export default function PeerProvider({ children, peer }: Props) {
             ? loginExpiration
             : peer.login_expiration_enabled,
         approval_required:
-          approval_required != undefined
-            ? approval_required
-            : peer.approval_required,
+          approval_required == undefined ? undefined : approval_required,
       },
       `/${peer.id}`,
     );

src/contexts/RoutesProvider.tsx

@@ -34,6 +34,8 @@ export default function RoutesProvider({ children }: Props) {
     onSuccess?: (route: Route) => void,
     message?: string,
   ) => {
+    const hasDomains = route.domains ? route.domains.length > 0 : false;
+
     notify({
       title: "Network " + route.network_id + "-" + route.network,
       description: message
@@ -48,7 +50,9 @@ export default function RoutesProvider({ children }: Props) {
             peer: toUpdate.peer ?? (route.peer || undefined),
             peer_groups:
               toUpdate.peer_groups ?? (route.peer_groups || undefined),
-            network: route.network,
+            network: !hasDomains ? route.network : undefined,
+            domains: hasDomains ? route.domains : undefined,
+            keep_route: route.keep_route,
             metric: toUpdate.metric ?? route.metric ?? 9999,
             masquerade: toUpdate.masquerade ?? route.masquerade ?? true,
             groups: toUpdate.groups ?? route.groups ?? [],
@@ -80,7 +84,9 @@ export default function RoutesProvider({ children }: Props) {
           enabled: route.enabled,
           peer: route.peer || undefined,
           peer_groups: route.peer_groups || undefined,
-          network: route.network,
+          network: route?.network || undefined,
+          domains: route?.domains || undefined,
+          keep_route: route?.keep_route || false,
           metric: route.metric || 9999,
           masquerade: route.masquerade,
           groups: route.groups || [],

src/hooks/useOperatingSystem.ts

@@ -19,6 +19,8 @@ export const getOperatingSystem = (os: string) => {
   if (os.toLowerCase().includes("android"))
     return OperatingSystem.ANDROID as const;
   if (os.toLowerCase().includes("ios")) return OperatingSystem.IOS as const;
+  if (os.toLowerCase().includes("ipad")) return OperatingSystem.IOS as const;
+  if (os.toLowerCase().includes("iphone")) return OperatingSystem.IOS as const;
   if (os.toLowerCase().includes("windows"))
     return OperatingSystem.WINDOWS as const;
   return OperatingSystem.LINUX as const;

src/hooks/useRedirect.tsx

@@ -1,8 +1,9 @@
 import loadConfig from "@utils/config";
 import { usePathname, useRouter } from "next/navigation";
-import { useEffect } from "react";
+import { useEffect, useRef } from "react";
 
 const config = loadConfig();
+
 export const useRedirect = (
   url: string,
   replace: boolean = false,
@@ -10,24 +11,43 @@ export const useRedirect = (
 ) => {
   const router = useRouter();
   const currentPath = usePathname();
-  const callBackUrls = [config.redirectURI, config.silentRedirectURI];
+  const callBackUrls = useRef([config.redirectURI, config.silentRedirectURI]);
+  const isRedirecting = useRef(false);
+  const intervalRef = useRef<NodeJS.Timeout | null>(null);
 
   useEffect(() => {
-    if (!enable) return;
-    if (callBackUrls.includes(url)) return; // Don't redirect to the callback urls to avoid infinite loop
-    if (url === currentPath) return; // Don't redirect to the current page
+    // If redirect is disabled or the url is already in the callback urls or the url is the current path then do not redirect
+    if (!enable || callBackUrls.current.includes(url) || url === currentPath)
+      return;
 
-    const redirect = replace ? router.replace : router.push; // Replace the current history or add a new one
+    const performRedirect = () => {
+      if (!isRedirecting.current) {
+        isRedirecting.current = true;
+        router.refresh();
+        if (replace) {
+          router.replace(url);
+        } else {
+          router.push(url);
+        }
+        isRedirecting.current = false;
+      }
+    };
 
-    router.refresh();
-    redirect(url);
+    performRedirect();
 
-    // Timer in case the user has his browser tab open but not focused
-    const interval = setInterval(() => {
-      router.refresh();
-      redirect(url);
-    }, 1000);
+    // Try to redirect after 1.25 seconds if for whatever reason the redirect did not happen (network change, browser tab open but not focused etc.)
+    intervalRef.current = setInterval(() => {
+      if (!isRedirecting.current) {
+        performRedirect();
+      }
+    }, 1250);
 
-    return () => clearInterval(interval);
-  }, [replace, router, url, enable]);
+    return () => {
+      if (intervalRef.current) {
+        clearInterval(intervalRef.current);
+      }
+    };
+  }, [replace, router, url, enable, currentPath]);
 };
+
+export default useRedirect;

src/interfaces/Domain.ts

@@ -0,0 +1,4 @@
+export interface Domain {
+  id?: string;
+  name: string;
+}

src/interfaces/Nameserver.ts

@@ -17,11 +17,6 @@ export interface Nameserver {
   id?: string;
 }
 
-export interface Domain {
-  id?: string;
-  name: string;
-}
-
 export const NameserverPresets: Record<string, NameserverGroup> = {
   Default: {
     name: "",

src/interfaces/PostureCheck.ts

@@ -10,6 +10,7 @@ export interface PostureCheck {
     os_version_check?: OperatingSystemVersionCheck;
     geo_location_check?: GeoLocationCheck;
     peer_network_range_check?: PeerNetworkRangeCheck;
+    process_check?: ProcessCheck;
   };
   policies?: Policy[];
   active?: boolean;
@@ -53,6 +54,17 @@ export interface PeerNetworkRangeCheck {
   action: "allow" | "deny";
 }
 
+export interface ProcessCheck {
+  processes: Process[];
+}
+
+export interface Process {
+  id: string;
+  linux_path?: string;
+  mac_path?: string;
+  windows_path?: string;
+}
+
 export const windowsKernelVersions: SelectOption[] = [
   { value: "5.0", label: "Windows 2000" },
   { value: "5.1", label: "Windows XP" },

src/interfaces/Route.ts

@@ -3,26 +3,34 @@ export interface Route {
   description: string;
   enabled: boolean;
   peer?: string;
-  network: string;
+  network?: string;
+  domains?: string[];
   network_id: string;
   network_type?: string;
   metric?: number;
   masquerade: boolean;
   groups: string[];
+  keep_route?: boolean;
+  // Frontend only
   peer_groups?: string[];
   routesGroups?: string[];
   groupedRoutes?: GroupedRoute[];
   group_names?: string[];
+  domain_search?: string;
 }
 
 export interface GroupedRoute {
   id: string;
   enabled: boolean;
-  network: string;
+  network?: string;
+  domains?: string[];
+  keep_route?: boolean;
   network_id: string;
   high_availability_count: number;
   is_using_route_groups: boolean;
   routes?: Route[];
   group_names?: string[];
   description?: string;
+  description_search?: string;
+  domain_search?: string;
 }

src/modules/access-control/AccessControlModal.tsx

@@ -239,12 +239,6 @@ export function AccessControlModalContent({
 
   const portAndDirectionDisabled = protocol == "icmp" || protocol == "all";
 
-  const buttonDisabled = useMemo(() => {
-    if (sourceGroups.length == 0 || destinationGroups.length == 0) return true;
-    if (name.length == 0) return true;
-    if (direction != "bi" && ports.length == 0) return true;
-  }, [sourceGroups, destinationGroups, direction, ports, name]);
-
   const [postureChecks, setPostureChecks] = useState<PostureCheck[]>([]);
   const postureChecksLoaded = useRef(false);
 
@@ -268,6 +262,16 @@ export function AccessControlModalContent({
     }
   }, [initialPostureChecks]);
 
+  const continuePostureChecksDisabled = useMemo(() => {
+    if (sourceGroups.length == 0 || destinationGroups.length == 0) return true;
+    if (direction != "bi" && ports.length == 0) return true;
+  }, [sourceGroups, destinationGroups, direction, ports]);
+
+  const submitDisabled = useMemo(() => {
+    if (name.length == 0) return true;
+    if (continuePostureChecksDisabled) return true;
+  }, [name, continuePostureChecksDisabled]);
+
   return (
     <ModalContent maxWidthClass={"max-w-2xl"}>
       <ModalHeader
@@ -283,14 +287,17 @@ export function AccessControlModalContent({
         color={"netbird"}
       />
 
-      <Tabs defaultValue={tab} onValueChange={(v) => setTab(v)}>
+      <Tabs defaultValue={tab} onValueChange={(v) => setTab(v)} value={tab}>
         <TabsList justify={"start"} className={"px-8"}>
           <TabsTrigger value={"policy"}>
             <ArrowRightLeft size={16} />
             Policy
           </TabsTrigger>
-          <PostureCheckTabTrigger />
-          <TabsTrigger value={"general"}>
+          <PostureCheckTabTrigger disabled={continuePostureChecksDisabled} />
+          <TabsTrigger
+            value={"general"}
+            disabled={continuePostureChecksDisabled}
+          >
             <Text
               size={16}
               className={
@@ -456,24 +463,74 @@ export function AccessControlModalContent({
           </Paragraph>
         </div>
         <div className={"flex gap-3 w-full justify-end"}>
-          <ModalClose asChild={true}>
-            <Button variant={"secondary"}>Cancel</Button>
-          </ModalClose>
+          {!policy ? (
+            <>
+              {tab == "policy" && (
+                <ModalClose asChild={true}>
+                  <Button variant={"secondary"}>Cancel</Button>
+                </ModalClose>
+              )}
 
-          <Button
-            variant={"primary"}
-            disabled={buttonDisabled}
-            onClick={submit}
-          >
-            {policy ? (
-              <>Save Changes</>
-            ) : (
-              <>
-                <PlusCircle size={16} />
-                Add Policy
-              </>
-            )}
-          </Button>
+              {tab == "posture_checks" && (
+                <Button variant={"secondary"} onClick={() => setTab("policy")}>
+                  Back
+                </Button>
+              )}
+
+              {tab == "policy" && (
+                <Button
+                  variant={"primary"}
+                  onClick={() => setTab("posture_checks")}
+                  disabled={continuePostureChecksDisabled}
+                >
+                  Continue
+                </Button>
+              )}
+
+              {tab == "posture_checks" && (
+                <Button
+                  variant={"primary"}
+                  onClick={() => setTab("general")}
+                  disabled={continuePostureChecksDisabled}
+                >
+                  Continue
+                </Button>
+              )}
+
+              {tab == "general" && (
+                <>
+                  <Button
+                    variant={"secondary"}
+                    onClick={() => setTab("posture_checks")}
+                  >
+                    Back
+                  </Button>
+
+                  <Button
+                    variant={"primary"}
+                    disabled={submitDisabled}
+                    onClick={submit}
+                  >
+                    <PlusCircle size={16} />
+                    Add Policy
+                  </Button>
+                </>
+              )}
+            </>
+          ) : (
+            <>
+              <ModalClose asChild={true}>
+                <Button variant={"secondary"}>Cancel</Button>
+              </ModalClose>
+              <Button
+                variant={"primary"}
+                disabled={submitDisabled}
+                onClick={submit}
+              >
+                Save Changes
+              </Button>
+            </>
+          )}
         </div>
       </ModalFooter>
     </ModalContent>

src/modules/activity/ActivityDescription.tsx

@@ -3,7 +3,11 @@ import { Label } from "@components/Label";
 import { IconInfoCircle } from "@tabler/icons-react";
 import { cn } from "@utils/helpers";
 import { isLocalDev, isProduction } from "@utils/netbird";
+import { isEmpty } from "lodash";
+import { GlobeIcon } from "lucide-react";
 import React, { useMemo } from "react";
+import RoundedFlag from "@/assets/countries/RoundedFlag";
+import { useCountries } from "@/contexts/CountryProvider";
 import { ActivityEvent } from "@/interfaces/ActivityEvent";
 
 type Props = {
@@ -54,7 +58,8 @@ export default function ActivityDescription({ event }: Props) {
   if (event.activity_code == "setupkey.peer.add")
     return (
       <div className={"inline"}>
-        Peer <Value>{m.name}</Value> with ip <Value>{m.ip}</Value> was added
+        Peer <Value>{m.name}</Value> <PeerConnectionInfo meta={m} /> was added
+        with the NetBird IP <Value>{m.ip}</Value>
       </div>
     );
 
@@ -113,29 +118,38 @@ export default function ActivityDescription({ event }: Props) {
    * Route
    */
 
-  if (event.activity_code == "route.delete")
+  if (event.activity_code == "route.delete") {
+    let hasDomains = m?.domains && m?.domains.length > 0;
     return (
       <div className={"inline"}>
-        Route <Value>{m.name}</Value> with the <Value>{m.network_range}</Value>{" "}
-        range was deleted
+        Route <Value>{m.name}</Value> with the {hasDomains ? "domain(s)" : ""}{" "}
+        <Value>{hasDomains ? m?.domains : m.network_range}</Value>{" "}
+        {hasDomains ? "" : "range"} was deleted
       </div>
     );
+  }
 
-  if (event.activity_code == "route.update")
+  if (event.activity_code == "route.update") {
+    let hasDomains = m?.domains && m?.domains.length > 0;
     return (
       <div className={"inline"}>
-        Route <Value>{m.name}</Value> with the <Value>{m.network_range}</Value>{" "}
-        range was updated
+        Route <Value>{m.name}</Value> with the {hasDomains ? "domain(s)" : ""}{" "}
+        <Value>{hasDomains ? m?.domains : m.network_range}</Value>{" "}
+        {hasDomains ? "" : "range"} was updated
       </div>
     );
+  }
 
-  if (event.activity_code == "route.add")
+  if (event.activity_code == "route.add") {
+    let hasDomains = m?.domains && m?.domains.length > 0;
     return (
       <div className={"inline"}>
-        Route <Value>{m.name}</Value> with the <Value>{m.network_range}</Value>{" "}
-        range was created
+        Route <Value>{m.name}</Value> with the {hasDomains ? "domain(s)" : ""}{" "}
+        <Value>{hasDomains ? m?.domains : m.network_range}</Value>{" "}
+        {hasDomains ? "" : "range"} was created
       </div>
     );
+  }
 
   /**
    * User
@@ -144,21 +158,24 @@ export default function ActivityDescription({ event }: Props) {
   if (event.activity_code == "user.peer.delete")
     return (
       <div className={"inline"}>
-        Peer <Value>{m.name}</Value> with ip <Value>{m.ip}</Value> was deleted
+        Peer <Value>{m.name}</Value> <PeerConnectionInfo meta={m} /> with
+        NetBird IP <Value>{m.ip}</Value> was deleted
       </div>
     );
 
   if (event.activity_code == "user.peer.add")
     return (
       <div className={"inline"}>
-        Peer <Value>{m.name}</Value> with ip <Value>{m.ip}</Value> was added
+        Peer <Value>{m.name}</Value> <PeerConnectionInfo meta={m} /> was added
+        with the NetBird IP <Value>{m.ip}</Value>
       </div>
     );
 
   if (event.activity_code == "user.peer.update")
     return (
       <div className={"inline"}>
-        Peer <Value>{m.name}</Value> with ip <Value>{m.ip}</Value> was updated
+        Peer <Value>{m.name}</Value> <PeerConnectionInfo meta={m} /> with
+        NetBird IP <Value>{m.ip}</Value> was updated
       </div>
     );
 
@@ -252,15 +269,15 @@ export default function ActivityDescription({ event }: Props) {
   if (event.activity_code == "peer.group.delete")
     return (
       <div className={"inline"}>
-        Group <Value>{m.group}</Value> was removed from the peer with the ip{" "}
-        <Value>{m.peer_ip}</Value>
+        Group <Value>{m.group}</Value> was removed from the peer with the
+        NetBird IP <Value>{m.peer_ip}</Value>
       </div>
     );
 
   if (event.activity_code == "peer.group.add")
     return (
       <div className={"inline"}>
-        Group <Value>{m.group}</Value> was added to the peer with the ip{" "}
+        Group <Value>{m.group}</Value> was added to the peer with the NetBird IP{" "}
         <Value>{m.peer_ip}</Value>
       </div>
     );
@@ -303,7 +320,7 @@ export default function ActivityDescription({ event }: Props) {
   if (event.activity_code == "peer.rename")
     return (
       <div className={"inline"}>
-        Peer with the ip <Value>{m.ip}</Value> was renamed to{" "}
+        Peer with the NetBird IP <Value>{m.ip}</Value> was renamed to{" "}
         <Value>{m.name}</Value>
       </div>
     );
@@ -311,7 +328,7 @@ export default function ActivityDescription({ event }: Props) {
   if (event.activity_code == "peer.approve")
     return (
       <div className={"inline"}>
-        Peer with the ip <Value>{m.ip}</Value> was approved
+        Peer with the NetBird IP <Value>{m.ip}</Value> was approved
       </div>
     );
 
@@ -559,7 +576,7 @@ function Value({
   return children ? (
     <span
       className={cn(
-        "text-nb-gray-200 inline font-medium bg-nb-gray-900 py-[3px] text-[11px] px-[5px] border border-nb-gray-800 rounded-[4px]",
+        "text-nb-gray-200 inline-flex gap-1 items-center max-h-[22px] font-medium bg-nb-gray-900 py-[3px] text-[11px] px-[5px] border border-nb-gray-800 rounded-[4px]",
         className,
       )}
     >
@@ -567,3 +584,40 @@ function Value({
     </span>
   ) : null;
 }
+
+function PeerConnectionInfo({ meta }: { meta: any }) {
+  const hasMeta =
+    !isEmpty(meta?.location_country_code) ||
+    !isEmpty(meta?.location_connection_ip);
+  const { countries } = useCountries();
+
+  const countryText = useMemo(() => {
+    if (!countries) return "Unknown";
+    const country = countries.find(
+      (c) => c.country_code === meta?.location_country_code,
+    );
+    if (!country) return "Unknown";
+    if (!meta?.location_city_name) return country.country_name;
+    return `${country.country_name}, ${meta?.location_city_name}`;
+  }, [countries, meta]);
+
+  return hasMeta ? (
+    <>
+      {" "}
+      from{" "}
+      {meta?.location_connection_ip && (
+        <Value>{meta?.location_connection_ip}</Value>
+      )}{" "}
+      {meta?.location_country_code && (
+        <Value>
+          {isEmpty(meta?.location_country_code) ? (
+            <GlobeIcon size={9} className={"text-nb-gray-300"} />
+          ) : (
+            <RoundedFlag country={meta?.location_country_code} size={9} />
+          )}
+          {countryText}
+        </Value>
+      )}
+    </>
+  ) : null;
+}

src/modules/common-table-rows/GroupsRow.tsx

@@ -1,3 +1,4 @@
+import Badge from "@components/Badge";
 import Button from "@components/Button";
 import {
   Modal,
@@ -10,6 +11,7 @@ import ModalHeader from "@components/modal/ModalHeader";
 import { PeerGroupSelector } from "@components/PeerGroupSelector";
 import Separator from "@components/Separator";
 import MultipleGroups from "@components/ui/MultipleGroups";
+import { IconCirclePlus } from "@tabler/icons-react";
 import { FolderGit2 } from "lucide-react";
 import * as React from "react";
 import { useMemo } from "react";
@@ -27,6 +29,7 @@ type Props = {
   label?: string;
   description?: string;
   peer?: Peer;
+  showAddGroupButton?: boolean;
 };
 
 export default function GroupsRow({
@@ -37,6 +40,7 @@ export default function GroupsRow({
   label = "Assigned Groups",
   description = "Use groups to control what this peer can access",
   peer,
+  showAddGroupButton = false,
 }: Props) {
   const { groups: allGroups } = useGroups();
   const { isUser } = useLoggedInUser();
@@ -59,7 +63,14 @@ export default function GroupsRow({
           setModal && !isUser && setModal(true);
         }}
       >
-        <MultipleGroups groups={foundGroups} label={label} />
+        {foundGroups?.length == 0 && showAddGroupButton ? (
+          <Badge variant={"gray"} useHover={true}>
+            <IconCirclePlus size={14} />
+            Add Groups
+          </Badge>
+        ) : (
+          <MultipleGroups groups={foundGroups} label={label} />
+        )}
       </ModalTrigger>
       <EditGroupsModal
         groups={foundGroups}

src/modules/dns-nameservers/NameserverModal.tsx

@@ -17,8 +17,9 @@ import Paragraph from "@components/Paragraph";
 import { PeerGroupSelector } from "@components/PeerGroupSelector";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@components/Tabs";
 import { Textarea } from "@components/Textarea";
+import InputDomain, { domainReducer } from "@components/ui/InputDomain";
 import { useApiCall } from "@utils/api";
-import { cn, validator } from "@utils/helpers";
+import { cn } from "@utils/helpers";
 import cidr from "ip-cidr";
 import { uniqueId } from "lodash";
 import {
@@ -35,7 +36,7 @@ import {
 import React, { useEffect, useMemo, useReducer, useState } from "react";
 import { useSWRConfig } from "swr";
 import DNSIcon from "@/assets/icons/DNSIcon";
-import { Domain, Nameserver, NameserverGroup } from "@/interfaces/Nameserver";
+import { Nameserver, NameserverGroup } from "@/interfaces/Nameserver";
 import useGroupHelper from "@/modules/groups/useGroupHelper";
 
 type Props = {
@@ -97,19 +98,6 @@ enum ActionType {
   UPDATE = "UPDATE",
 }
 
-export const domainReducer = (state: Domain[], action: any) => {
-  switch (action.type) {
-    case ActionType.ADD:
-      return [...state, { name: "", id: uniqueId("ns") }];
-    case ActionType.REMOVE:
-      return state.filter((_, i) => i !== action.index);
-    case ActionType.UPDATE:
-      return state.map((n, i) => (i === action.index ? action.d : n));
-    default:
-      return state;
-  }
-};
-
 export function NameserverModalContent({
   onSuccess,
   preset,
@@ -199,7 +187,7 @@ export function NameserverModalContent({
   // Domains
   const [domains, setDomains] = useReducer(domainReducer, [], () => {
     if (preset?.domains?.length) {
-      return preset.domains.map((d) => ({ name: d, id: uniqueId("ns") }));
+      return preset.domains.map((d) => ({ name: d, id: uniqueId("domain") }));
     }
     return [];
   });
@@ -238,27 +226,22 @@ export function NameserverModalContent({
     return "";
   }, [name]);
 
-  const hasAnyError = useMemo(() => {
-    return (
+  const canContinueToDomains = useMemo(() => {
+    return !(
       hasNSErrors ||
       nsError ||
-      domainError ||
       nameservers.length == 0 ||
-      hasDomainErrors ||
-      groups.length == 0 ||
-      nameLengthError !== "" ||
-      name == ""
+      groups.length == 0
     );
-  }, [
-    nsError,
-    domainError,
-    nameservers,
-    groups,
-    hasNSErrors,
-    hasDomainErrors,
-    nameLengthError,
-    name,
-  ]);
+  }, [hasNSErrors, nsError, nameservers.length, groups.length]);
+
+  const canContinueToGeneral = useMemo(() => {
+    return !(!canContinueToDomains || domainError || hasDomainErrors);
+  }, [canContinueToDomains, domainError, hasDomainErrors]);
+
+  const canSubmit = useMemo(() => {
+    return !(!canContinueToGeneral || nameLengthError !== "" || name == "");
+  }, [canContinueToGeneral, nameLengthError, name]);
 
   return (
     <ModalContent maxWidthClass={"max-w-xl"}>
@@ -269,7 +252,7 @@ export function NameserverModalContent({
         color={"netbird"}
       />
 
-      <Tabs defaultValue={tab} onValueChange={(v) => setTab(v)}>
+      <Tabs defaultValue={tab} onValueChange={(v) => setTab(v)} value={tab}>
         <TabsList justify={"start"} className={"px-8"}>
           <TabsTrigger value={"nameserver"}>
             <ServerIcon
@@ -280,7 +263,7 @@ export function NameserverModalContent({
             />
             Nameserver
           </TabsTrigger>
-          <TabsTrigger value={"domains"}>
+          <TabsTrigger value={"domains"} disabled={!canContinueToDomains}>
             <GlobeIcon
               size={16}
               className={
@@ -289,7 +272,7 @@ export function NameserverModalContent({
             />
             Domains
           </TabsTrigger>
-          <TabsTrigger value={"general"}>
+          <TabsTrigger value={"general"} disabled={!canContinueToGeneral}>
             <Text
               size={16}
               className={
@@ -375,7 +358,7 @@ export function NameserverModalContent({
                     <div className={"flex flex-col gap-2 w-full"}>
                       {domains.map((domain, i) => {
                         return (
-                          <DomainInput
+                          <InputDomain
                             key={domain.id}
                             value={domain}
                             onChange={(d) =>
@@ -473,20 +456,77 @@ export function NameserverModalContent({
           </Paragraph>
         </div>
         <div className={"flex gap-3 w-full justify-end"}>
-          <ModalClose asChild={true}>
-            <Button variant={"secondary"}>Cancel</Button>
-          </ModalClose>
+          {!isUpdate ? (
+            <>
+              {tab == "nameserver" && (
+                <ModalClose asChild={true}>
+                  <Button variant={"secondary"}>Cancel</Button>
+                </ModalClose>
+              )}
 
-          <Button variant={"primary"} disabled={hasAnyError} onClick={submit}>
-            {isUpdate ? (
-              <>Save Changes</>
-            ) : (
-              <>
-                <PlusCircle size={16} />
-                Add Nameserver
-              </>
-            )}
-          </Button>
+              {tab == "domains" && (
+                <Button
+                  variant={"secondary"}
+                  onClick={() => setTab("nameserver")}
+                >
+                  Back
+                </Button>
+              )}
+
+              {tab == "nameserver" && (
+                <Button
+                  variant={"primary"}
+                  onClick={() => setTab("domains")}
+                  disabled={!canContinueToDomains}
+                >
+                  Continue
+                </Button>
+              )}
+
+              {tab == "domains" && (
+                <Button
+                  variant={"primary"}
+                  onClick={() => setTab("general")}
+                  disabled={!canContinueToGeneral}
+                >
+                  Continue
+                </Button>
+              )}
+
+              {tab == "general" && (
+                <>
+                  <Button
+                    variant={"secondary"}
+                    onClick={() => setTab("domains")}
+                  >
+                    Back
+                  </Button>
+
+                  <Button
+                    variant={"primary"}
+                    disabled={!canSubmit}
+                    onClick={submit}
+                  >
+                    <PlusCircle size={16} />
+                    Add Nameserver
+                  </Button>
+                </>
+              )}
+            </>
+          ) : (
+            <>
+              <ModalClose asChild={true}>
+                <Button variant={"secondary"}>Cancel</Button>
+              </ModalClose>
+              <Button
+                variant={"primary"}
+                disabled={!canSubmit}
+                onClick={submit}
+              >
+                Save Changes
+              </Button>
+            </>
+          )}
         </div>
       </ModalFooter>
     </ModalContent>
@@ -567,63 +607,3 @@ function NameserverInput({
     </div>
   );
 }
-
-function DomainInput({
-  value,
-  onChange,
-  onRemove,
-  onError,
-}: {
-  value: Domain;
-  onChange: (d: Domain) => void;
-  onRemove: () => void;
-  onError?: (error: boolean) => void;
-  error?: string;
-}) {
-  const [name, setName] = useState(value.name);
-
-  const handleNameChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setName(e.target.value);
-    onChange({ ...value, name: e.target.value });
-  };
-
-  const domainError = useMemo(() => {
-    if (name == "") {
-      return "";
-    }
-    const valid = validator.isValidDomain(name);
-    if (!valid) {
-      onError && onError(true);
-      return "Please enter a valid domain, e.g. example.com or intra.example.com";
-    }
-    onError && onError(false);
-  }, [name, onError]);
-
-  useEffect(() => {
-    return () => onError && onError(false);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  return (
-    <div className={"flex gap-2 w-full"}>
-      <div className={"w-full"}>
-        <Input
-          customPrefix={<GlobeIcon size={15} />}
-          placeholder={"e.g., example.com"}
-          maxWidthClass={"w-full"}
-          value={name}
-          error={domainError}
-          onChange={handleNameChange}
-        />
-      </div>
-
-      <Button
-        className={"h-[42px]"}
-        variant={"default-outline"}
-        onClick={onRemove}
-      >
-        <MinusCircleIcon size={15} />
-      </Button>
-    </div>
-  );
-}

src/modules/exit-node/AddExitNodeButton.tsx

@@ -26,7 +26,7 @@ export const AddExitNodeButton = ({ peer, firstTime = false }: Props) => {
           ) : (
             <>
               <IconDirectionSign size={16} className={"text-yellow-400"} />
-              Setup Exit Node
+              Set Up Exit Node
             </>
           )}
         </Button>

src/modules/exit-node/ExitNodeDropdownButton.tsx

@@ -1,11 +1,13 @@
 import { DropdownMenuItem } from "@components/DropdownMenu";
 import { Modal } from "@components/modal/Modal";
 import { getOperatingSystem } from "@hooks/useOperatingSystem";
-import { IconDirectionSign } from "@tabler/icons-react";
+import { IconCirclePlus, IconDirectionSign } from "@tabler/icons-react";
 import * as React from "react";
 import { useState } from "react";
+import RoutesProvider from "@/contexts/RoutesProvider";
 import { OperatingSystem } from "@/interfaces/OperatingSystem";
 import { Peer } from "@/interfaces/Peer";
+import { useHasExitNodes } from "@/modules/exit-node/useHasExitNodes";
 import { RouteModalContent } from "@/modules/routes/RouteModal";
 
 type Props = {
@@ -15,24 +17,41 @@ type Props = {
 export const ExitNodeDropdownButton = ({ peer }: Props) => {
   const [modal, setModal] = useState(false);
   const isLinux = getOperatingSystem(peer.os) === OperatingSystem.LINUX;
+  const hasExitNodes = useHasExitNodes(peer);
 
   return isLinux ? (
     <>
       <DropdownMenuItem onClick={() => setModal(true)}>
         <div className={"flex gap-3 items-center w-full"}>
-          <IconDirectionSign size={14} className={"shrink-0"} />
-          <div className={"flex justify-between items-center w-full"}>
-            Add Exit Node
-          </div>
+          {hasExitNodes ? (
+            <>
+              <IconCirclePlus size={14} className={"shrink-0"} />
+              <div className={"flex justify-between items-center w-full"}>
+                Add Exit Node
+              </div>
+            </>
+          ) : (
+            <>
+              <IconDirectionSign
+                size={14}
+                className={"shrink-0 text-yellow-400"}
+              />
+              <div className={"flex justify-between items-center w-full"}>
+                Set Up Exit Node
+              </div>
+            </>
+          )}
         </div>
       </DropdownMenuItem>
       <Modal open={modal} onOpenChange={setModal}>
         {modal && (
-          <RouteModalContent
-            onSuccess={() => setModal(false)}
-            peer={peer}
-            exitNode={true}
-          />
+          <RoutesProvider>
+            <RouteModalContent
+              onSuccess={() => setModal(false)}
+              peer={peer}
+              exitNode={true}
+            />
+          </RoutesProvider>
         )}
       </Modal>
     </>

src/modules/exit-node/useHasExitNodes.tsx

@@ -13,8 +13,7 @@ export const useHasExitNodes = (peer?: Peer) => {
   );
   return peer
     ? routes?.some(
-        (route) =>
-          route?.peer === peer.id && route?.network.includes("0.0.0.0"),
+        (route) => route?.peer === peer.id && route?.network === "0.0.0.0/0",
       ) || false
     : false;
 };

src/modules/peer/PeerRoutesTable.tsx

@@ -12,8 +12,8 @@ import { Route } from "@/interfaces/Route";
 import PeerRouteActionCell from "@/modules/peer/PeerRouteActionCell";
 import PeerRouteActiveCell from "@/modules/peer/PeerRouteActiveCell";
 import PeerRouteNameCell from "@/modules/peer/PeerRouteNameCell";
-import PeerRouteNetworkCell from "@/modules/peer/PeerRouteNetworkCell";
 import usePeerRoutes from "@/modules/peer/usePeerRoutes";
+import GroupedRouteNetworkRangeCell from "@/modules/route-group/GroupedRouteNetworkRangeCell";
 import RouteDistributionGroupsCell from "@/modules/routes/RouteDistributionGroupsCell";
 
 type Props = {
@@ -32,9 +32,14 @@ export const RouteTableColumns: ColumnDef<Route>[] = [
   {
     accessorKey: "network",
     header: ({ column }) => {
-      return <DataTableHeader column={column}>Network Range</DataTableHeader>;
+      return <DataTableHeader column={column}>Network</DataTableHeader>;
     },
-    cell: ({ row }) => <PeerRouteNetworkCell route={row.original} />,
+    cell: ({ row }) => (
+      <GroupedRouteNetworkRangeCell
+        domains={row.original?.domains}
+        network={row.original?.network}
+      />
+    ),
   },
   {
     id: "groups",

src/modules/posture-checks/checks/PostureCheckProcess.tsx

@@ -0,0 +1,310 @@
+import Button from "@components/Button";
+import HelpText from "@components/HelpText";
+import InlineLink from "@components/InlineLink";
+import { Input } from "@components/Input";
+import { Label } from "@components/Label";
+import { ModalClose, ModalFooter } from "@components/modal/Modal";
+import Paragraph from "@components/Paragraph";
+import { cn, validator } from "@utils/helpers";
+import { isEmpty, uniqueId } from "lodash";
+import {
+  ExternalLinkIcon,
+  MinusCircleIcon,
+  PlusCircle,
+  ServerCogIcon,
+  TerminalIcon,
+} from "lucide-react";
+import * as React from "react";
+import { useMemo, useState } from "react";
+import AppleIcon from "@/assets/icons/AppleIcon";
+import WindowsIcon from "@/assets/icons/WindowsIcon";
+import { Process, ProcessCheck } from "@/interfaces/PostureCheck";
+import { PostureCheckCard } from "@/modules/posture-checks/ui/PostureCheckCard";
+
+type Props = {
+  value?: ProcessCheck;
+  onChange: (value: ProcessCheck | undefined) => void;
+};
+
+export const PostureCheckProcess = ({ value, onChange }: Props) => {
+  const [open, setOpen] = useState(false);
+
+  return (
+    <PostureCheckCard
+      open={open}
+      setOpen={setOpen}
+      key={open ? 1 : 0}
+      active={value?.processes && value?.processes?.length > 0}
+      title={"Process"}
+      description={
+        "Restrict access in your network based on running processes of a peer."
+      }
+      icon={<ServerCogIcon size={18} />}
+      iconClass={"bg-gradient-to-tr from-nb-gray-500 to-nb-gray-300"}
+      modalWidthClass={"max-w-xl"}
+      onReset={() => onChange(undefined)}
+    >
+      <CheckContent
+        value={value}
+        onChange={(v) => {
+          onChange(v);
+          setOpen(false);
+        }}
+      />
+    </PostureCheckCard>
+  );
+};
+
+const CheckContent = ({ value, onChange }: Props) => {
+  const [processes, setProcesses] = useState<Process[]>(
+    value?.processes
+      ? value.processes.map((p) => {
+          return {
+            id: uniqueId("process"),
+            linux_path: p?.linux_path || "",
+            mac_path: p?.mac_path || "",
+            windows_path: p?.windows_path || "",
+          };
+        })
+      : [
+          {
+            id: uniqueId("process"),
+            linux_path: "",
+            mac_path: "",
+            windows_path: "",
+          },
+        ],
+  );
+
+  const handleProcessChange = (
+    id: string,
+    linux_path: string,
+    mac_path: string,
+    windows_path: string,
+  ) => {
+    const newProcesses = processes.map((p) =>
+      p.id === id ? { ...p, linux_path, mac_path, windows_path } : p,
+    );
+    setProcesses(newProcesses);
+  };
+
+  const removeProcess = (id: string) => {
+    const newProcesses = processes.filter((p) => p.id !== id);
+    setProcesses(newProcesses);
+  };
+
+  const addProcess = () => {
+    setProcesses([
+      ...processes,
+      {
+        id: uniqueId("process"),
+        linux_path: "",
+        mac_path: "",
+        windows_path: "",
+      },
+    ]);
+  };
+
+  const pathErrors = useMemo(() => {
+    if (processes && processes.length > 0) {
+      return processes.map((p) => {
+        return {
+          id: p.id,
+          errorMacPath: p?.mac_path
+            ? validator.isValidUnixFilePath(p?.mac_path || "")
+              ? ""
+              : "Please enter a valid macOS file path"
+            : "",
+          errorLinuxPath: p?.linux_path
+            ? validator.isValidUnixFilePath(p?.linux_path || "")
+              ? ""
+              : "Please enter a valid Unix file path"
+            : "",
+          errorWindowsPath: p?.windows_path
+            ? validator.isValidWindowsFilePath(p?.windows_path || "")
+              ? ""
+              : "Please enter a valid Windows file path"
+            : "",
+        };
+      });
+    } else {
+      return [];
+    }
+  }, [processes]);
+
+  const hasErrorsOrIsEmpty = useMemo(() => {
+    if (processes.length === 0) return true;
+    const hasOnlyEmptyPaths = processes.some(
+      (p) => p.linux_path === "" && p.mac_path === "" && p.windows_path === "",
+    );
+    const hasPathErrors = pathErrors.some(
+      (e) =>
+        e.errorLinuxPath !== "" ||
+        e.errorMacPath !== "" ||
+        e.errorWindowsPath !== "",
+    );
+    return hasOnlyEmptyPaths || hasPathErrors;
+  }, [processes, pathErrors]);
+
+  return (
+    <>
+      <div className={"flex flex-col px-8 gap-2 pb-6"}>
+        <div className={"flex justify-between items-start gap-10 mt-2"}>
+          <div>
+            <Label>Processes</Label>
+            <HelpText className={""}>
+              Add the path of an executable file of the process. You can define
+              a path for Linux, macOS and Windows. Peers will only be allowed to
+              connect if the process is running on their system.
+            </HelpText>
+          </div>
+        </div>
+        {processes.length > 0 && (
+          <div className={"mb-2 flex flex-col gap-4 w-full "}>
+            {processes.map((p) => {
+              return (
+                <div key={p.id} className={"flex gap-2 items-center"}>
+                  <div className={"w-full flex flex-col gap-1.5"}>
+                    <Input
+                      customPrefix={<TerminalIcon size={16} />}
+                      placeholder={"/usr/local/bin/netbird"}
+                      value={p.linux_path}
+                      error={
+                        pathErrors.find((e) => e.id === p.id)?.errorLinuxPath
+                      }
+                      errorTooltip={true}
+                      errorTooltipPosition={"top-right"}
+                      className={"w-full"}
+                      onChange={(e) =>
+                        handleProcessChange(
+                          p.id,
+                          e.target.value,
+                          p?.mac_path || "",
+                          p?.windows_path || "",
+                        )
+                      }
+                    />
+                    <Input
+                      customPrefix={
+                        <AppleIcon
+                          size={16}
+                          className={cn(
+                            pathErrors.find((e) => e.id === p.id)
+                              ?.errorMacPath && "fill-red-500",
+                          )}
+                        />
+                      }
+                      placeholder={
+                        "/Applications/NetBird.app/Contents/MacOS/netbird"
+                      }
+                      value={p.mac_path}
+                      error={
+                        pathErrors.find((e) => e.id === p.id)?.errorMacPath
+                      }
+                      errorTooltip={true}
+                      errorTooltipPosition={"top-right"}
+                      className={"w-full"}
+                      onChange={(e) =>
+                        handleProcessChange(
+                          p.id,
+                          p?.linux_path || "",
+                          e.target.value,
+                          p?.windows_path || "",
+                        )
+                      }
+                    />
+                    <Input
+                      customPrefix={
+                        <WindowsIcon
+                          size={16}
+                          className={cn(
+                            pathErrors.find((e) => e.id === p.id)
+                              ?.errorWindowsPath && "fill-red-500",
+                          )}
+                        />
+                      }
+                      placeholder={`C:\\ProgramData\\NetBird\\netbird.exe`}
+                      value={p.windows_path}
+                      errorTooltip={true}
+                      errorTooltipPosition={"top-right"}
+                      error={
+                        pathErrors.find((e) => e.id === p.id)?.errorWindowsPath
+                      }
+                      className={"w-full"}
+                      onChange={(e) =>
+                        handleProcessChange(
+                          p.id,
+                          p?.linux_path || "",
+                          p?.mac_path || "",
+                          e.target.value,
+                        )
+                      }
+                    />
+                  </div>
+
+                  <Button
+                    className={"h-[42px]"}
+                    variant={"default-outline"}
+                    onClick={() => removeProcess(p.id)}
+                  >
+                    <MinusCircleIcon size={15} />
+                  </Button>
+                </div>
+              );
+            })}
+          </div>
+        )}
+        <Button
+          variant={"dotted"}
+          size={"sm"}
+          onClick={addProcess}
+          className={"mt-1"}
+        >
+          <PlusCircle size={16} />
+          Add Process
+        </Button>
+      </div>
+      <ModalFooter className={"items-center"}>
+        <div className={"w-full"}>
+          <Paragraph className={"text-sm mt-auto"}>
+            Learn more about
+            <InlineLink
+              href={
+                "https://docs.netbird.io/how-to/manage-posture-checks#process-check"
+              }
+              target={"_blank"}
+            >
+              Process Check
+              <ExternalLinkIcon size={12} />
+            </InlineLink>
+          </Paragraph>
+        </div>
+        <div className={"flex gap-3 w-full justify-end"}>
+          <ModalClose asChild={true}>
+            <Button variant={"secondary"}>Cancel</Button>
+          </ModalClose>
+          <Button
+            variant={"primary"}
+            disabled={hasErrorsOrIsEmpty}
+            onClick={() => {
+              if (isEmpty(processes)) {
+                onChange(undefined);
+              } else {
+                onChange({
+                  processes: processes.filter(
+                    (p) =>
+                      p.linux_path !== "" ||
+                      p.mac_path !== "" ||
+                      p.windows_path !== "",
+                  ),
+                });
+              }
+            }}
+          >
+            Save
+          </Button>
+        </div>
+      </ModalFooter>
+    </>
+  );
+};

src/modules/posture-checks/checks/tooltips/ProcessTooltip.tsx

@@ -0,0 +1,112 @@
+import Badge from "@components/Badge";
+import FullTooltip from "@components/FullTooltip";
+import { ScrollArea } from "@components/ScrollArea";
+import { tryGetProcessNameFromPath } from "@utils/helpers";
+import { TerminalIcon } from "lucide-react";
+import * as React from "react";
+import AppleIcon from "@/assets/icons/AppleIcon";
+import WindowsIcon from "@/assets/icons/WindowsIcon";
+import { ProcessCheck } from "@/interfaces/PostureCheck";
+
+type Props = {
+  check?: ProcessCheck;
+  children?: React.ReactNode;
+};
+export const ProcessTooltip = ({ check, children }: Props) => {
+  return check ? (
+    <FullTooltip
+      className={"w-full min-w-0"}
+      interactive={true}
+      contentClassName={"p-0"}
+      content={
+        <div
+          className={
+            "text-neutral-300 text-sm max-w-xs flex flex-col gap-1 min-w-0"
+          }
+        >
+          <div className={"px-4 pt-3"}>
+            <span>
+              <span className={"text-green-500 font-semibold"}>Allow only</span>{" "}
+              peers which are running the following processes
+            </span>
+          </div>
+
+          <ScrollArea
+            className={
+              "max-h-[275px] overflow-y-auto flex flex-col px-4 min-w-0"
+            }
+          >
+            <div className={"flex flex-col gap-3 mt-1 text-xs mb-3.5 min-w-0"}>
+              {check.processes.map((p, index) => {
+                return (
+                  <div className={"flex-col flex gap-1 min-w-0"} key={index}>
+                    {p?.linux_path && (
+                      <Badge
+                        variant={"gray"}
+                        useHover={false}
+                        className={"justify-start font-medium text-xs min-w-0"}
+                      >
+                        <span className={"mr-1.5"}>
+                          <TerminalIcon size={12} />
+                        </span>
+                        <span
+                          className={"truncate inline-block "}
+                          title={p?.linux_path}
+                        >
+                          {tryGetProcessNameFromPath(p?.linux_path) ||
+                            "Unknown path"}
+                        </span>
+                      </Badge>
+                    )}
+
+                    {p?.mac_path && (
+                      <Badge
+                        variant={"gray"}
+                        useHover={false}
+                        className={"justify-start font-medium text-xs min-w-0"}
+                      >
+                        <span className={"mr-1.5"}>
+                          <AppleIcon size={12} />
+                        </span>
+                        <span
+                          className={"truncate inline-block "}
+                          title={p?.mac_path}
+                        >
+                          {tryGetProcessNameFromPath(p?.mac_path) ||
+                            "Unknown path"}
+                        </span>
+                      </Badge>
+                    )}
+
+                    {p?.windows_path && (
+                      <Badge
+                        variant={"gray"}
+                        useHover={false}
+                        className={"justify-start font-medium text-xs min-w-0"}
+                      >
+                        <span className={"mr-1.5"}>
+                          <WindowsIcon size={12} />
+                        </span>
+                        <span
+                          className={"truncate inline-block"}
+                          title={p?.windows_path}
+                        >
+                          {tryGetProcessNameFromPath(p?.windows_path) ||
+                            "Unknown path"}
+                        </span>
+                      </Badge>
+                    )}
+                  </div>
+                );
+              })}
+            </div>
+          </ScrollArea>
+        </div>
+      }
+    >
+      {children}
+    </FullTooltip>
+  ) : (
+    children
+  );
+};

src/modules/posture-checks/modal/PostureCheckModal.tsx

@@ -24,6 +24,7 @@ import { PostureCheckGeoLocation } from "@/modules/posture-checks/checks/Posture
 import { PostureCheckNetBirdVersion } from "@/modules/posture-checks/checks/PostureCheckNetBirdVersion";
 import { PostureCheckOperatingSystem } from "@/modules/posture-checks/checks/PostureCheckOperatingSystem";
 import { PostureCheckPeerNetworkRange } from "@/modules/posture-checks/checks/PostureCheckPeerNetworkRange";
+import { PostureCheckProcess } from "@/modules/posture-checks/checks/PostureCheckProcess";
 
 type Props = {
   open: boolean;
@@ -58,6 +59,9 @@ export default function PostureCheckModal({
   const [peerNetworkRangeCheck, setPeerNetworkRangeCheck] = useState(
     postureCheck?.checks.peer_network_range_check || undefined,
   );
+  const [processCheck, setProcessCheck] = useState(
+    postureCheck?.checks.process_check || undefined,
+  );
 
   const validateOSCheck = (osCheck?: OperatingSystemVersionCheck) => {
     if (!osCheck) return;
@@ -98,6 +102,7 @@ export default function PostureCheckModal({
         geo_location_check: validateLocationCheck(geoLocationCheck),
         os_version_check: validateOSCheck(osVersionCheck),
         peer_network_range_check: peerNetworkRangeCheck,
+        process_check: processCheck,
       },
     };
 
@@ -133,7 +138,8 @@ export default function PostureCheckModal({
     !!nbVersionCheck ||
     !!geoLocationCheck ||
     !!osVersionCheck ||
-    !!peerNetworkRangeCheck;
+    !!peerNetworkRangeCheck ||
+    !!processCheck;
   const canCreate = !isEmpty(name) && isAtLeastOneCheckEnabled;
 
   const [tab, setTab] = useState("checks");
@@ -163,7 +169,10 @@ export default function PostureCheckModal({
                 Checks
               </TabsTrigger>
 
-              <TabsTrigger value={"general"}>
+              <TabsTrigger
+                value={"general"}
+                disabled={!isAtLeastOneCheckEnabled}
+              >
                 <Text
                   size={16}
                   className={
@@ -184,13 +193,17 @@ export default function PostureCheckModal({
                   value={geoLocationCheck}
                   onChange={setGeoLocationCheckCheck}
                 />
+                <PostureCheckPeerNetworkRange
+                  value={peerNetworkRangeCheck}
+                  onChange={setPeerNetworkRangeCheck}
+                />
                 <PostureCheckOperatingSystem
                   value={osVersionCheck}
                   onChange={setOsVersionCheck}
                 />
-                <PostureCheckPeerNetworkRange
-                  value={peerNetworkRangeCheck}
-                  onChange={setPeerNetworkRangeCheck}
+                <PostureCheckProcess
+                  value={processCheck}
+                  onChange={setProcessCheck}
                 />
               </>
             </TabsContent>
@@ -243,12 +256,23 @@ export default function PostureCheckModal({
             </div>
             <div className={"flex gap-3 w-full justify-end"}>
               <>
-                <Button
-                  variant={"secondary"}
-                  onClick={() => onOpenChange(false)}
-                >
-                  Cancel
-                </Button>
+                {tab == "checks" && (
+                  <Button
+                    variant={"secondary"}
+                    onClick={() => onOpenChange(false)}
+                  >
+                    Cancel
+                  </Button>
+                )}
+
+                {tab == "general" && (
+                  <Button
+                    variant={"secondary"}
+                    onClick={() => setTab("checks")}
+                  >
+                    Back
+                  </Button>
+                )}
 
                 {!postureCheck && tab == "checks" && (
                   <Button

src/modules/posture-checks/table/cells/PostureCheckChecksCell.tsx

@@ -1,5 +1,5 @@
 import { cn } from "@utils/helpers";
-import { Disc3Icon, FlagIcon, NetworkIcon } from "lucide-react";
+import { Disc3Icon, FlagIcon, NetworkIcon, ServerCogIcon } from "lucide-react";
 import * as React from "react";
 import NetBirdIcon from "@/assets/icons/NetBirdIcon";
 import { PostureCheck } from "@/interfaces/PostureCheck";
@@ -7,6 +7,7 @@ import { GeoLocationTooltip } from "@/modules/posture-checks/checks/tooltips/Geo
 import { NetBirdVersionTooltip } from "@/modules/posture-checks/checks/tooltips/NetBirdVersionTooltip";
 import { OperatingSystemTooltip } from "@/modules/posture-checks/checks/tooltips/OperatingSystemTooltip";
 import { PeerNetworkRangeTooltip } from "@/modules/posture-checks/checks/tooltips/PeerNetworkRangeTooltip";
+import { ProcessTooltip } from "@/modules/posture-checks/checks/tooltips/ProcessTooltip";
 
 type Props = {
   check: PostureCheck;
@@ -71,6 +72,18 @@ export const PostureCheckChecksCell = ({ check }: Props) => {
               </div>
             </PeerNetworkRangeTooltip>
           )}
+
+          {check.checks.process_check && (
+            <ProcessTooltip check={check.checks.process_check}>
+              <div
+                className={cn(
+                  "bg-gradient-to-tr from-nb-gray-500 to-nb-gray-300 h-8 w-8 rounded-full flex items-center justify-center relative z-[8] hover:scale-[1.1] transition-all",
+                )}
+              >
+                <ServerCogIcon size={14} />
+              </div>
+            </ProcessTooltip>
+          )}
         </div>
       </div>
     </div>

src/modules/posture-checks/table/cells/PostureCheckPolicyUsageCell.tsx

@@ -49,7 +49,10 @@ export const PostureCheckPolicyUsageCell = ({ check }: Props) => {
         interactive={false}
       >
         <Badge
-          onClick={() => router.push("/access-control")}
+          onClick={(e) => {
+            e.stopPropagation();
+            router.push("/access-control");
+          }}
           variant={"gray"}
           useHover={!!(check.policies && check.policies?.length > 0)}
           className={cn(

src/modules/posture-checks/ui/PostureCheckTabTrigger.tsx

@@ -2,9 +2,13 @@ import { TabsTrigger } from "@components/Tabs";
 import { ShieldCheck } from "lucide-react";
 import * as React from "react";
 
-export const PostureCheckTabTrigger = () => {
+type Props = {
+  disabled?: boolean;
+};
+
+export const PostureCheckTabTrigger = ({ disabled = false }: Props) => {
   return (
-    <TabsTrigger value={"posture_checks"}>
+    <TabsTrigger value={"posture_checks"} disabled={disabled}>
       <ShieldCheck size={16} />
       Posture Checks
     </TabsTrigger>

src/modules/route-group/GroupedRouteNetworkRangeCell.tsx

@@ -1,15 +1,23 @@
+import { DomainListBadge } from "@components/ui/DomainListBadge";
 import { IconDirectionSign } from "@tabler/icons-react";
 import { InfoIcon } from "lucide-react";
 import * as React from "react";
 import { ExitNodeHelpTooltip } from "@/modules/exit-node/ExitNodeHelpTooltip";
 
 type Props = {
-  network: string;
+  network?: string;
+  domains?: string[];
 };
-export default function GroupedRouteNetworkRangeCell({ network }: Props) {
+export default function GroupedRouteNetworkRangeCell({
+  network,
+  domains,
+}: Props) {
   const isExitNode = network === "0.0.0.0/0";
+  const hasDomains = domains ? domains.length > 0 : false;
 
-  return isExitNode ? (
+  return hasDomains && domains ? (
+    <DomainListBadge domains={domains} />
+  ) : isExitNode ? (
     <ExitNodeHelpTooltip>
       <div className={"flex gap-2 items-center dark:text-nb-gray-300 group"}>
         <IconDirectionSign size={16} className={"text-yellow-400"} />

src/modules/route-group/NetworkRoutesTable.tsx

@@ -39,6 +39,14 @@ export const GroupedRouteTableColumns: ColumnDef<GroupedRoute>[] = [
     accessorKey: "description",
     sortingFn: "text",
   },
+  {
+    accessorKey: "description_search",
+    sortingFn: "text",
+  },
+  {
+    accessorKey: "domain_search",
+    sortingFn: "text",
+  },
   {
     id: "enabled",
     accessorKey: "enabled",
@@ -50,13 +58,22 @@ export const GroupedRouteTableColumns: ColumnDef<GroupedRoute>[] = [
       return row.group_names?.map((name) => name).join(", ");
     },
   },
+  {
+    id: "domains",
+    accessorFn: (row) => {
+      return row.domains?.map((name) => name).join(", ");
+    },
+  },
   {
     accessorKey: "network",
     header: ({ column }) => {
-      return <DataTableHeader column={column}>Network Range</DataTableHeader>;
+      return <DataTableHeader column={column}>Network</DataTableHeader>;
     },
     cell: ({ row }) => (
-      <GroupedRouteNetworkRangeCell network={row.original.network} />
+      <GroupedRouteNetworkRangeCell
+        network={row.original.network}
+        domains={row.original?.domains}
+      />
     ),
   },
   {
@@ -132,7 +149,10 @@ export default function NetworkRoutesTable({
       columnVisibility={{
         enabled: false,
         description: false,
+        description_search: false,
         group_names: false,
+        domains: false,
+        domain_search: false,
       }}
       renderExpandedRow={(row) => {
         const data = cloneDeep(row);

src/modules/route-group/useGroupedRoutes.tsx

@@ -53,15 +53,26 @@ export default function useGroupedRoutes({ routes }: Props) {
       });
 
       const allGroupNames = [...peerGroupNames, ...distributionGroupNames];
+      const hasDomains = routes[0].domains
+        ? routes[0].domains.length > 0
+        : false;
+
+      const childDescriptions =
+        routes?.map((r) => r?.description).join(", ") || "";
+      const domainString = routes?.map((r) => r.domains?.join(", ")).join(", ");
 
       results.push({
         id,
         enabled: routes.find((r) => r.enabled) != undefined,
-        network: routes[0].network,
+        network: !hasDomains ? routes[0].network : undefined,
+        domains: hasDomains ? routes[0].domains || undefined : undefined,
+        domain_search: domainString,
+        keep_route: routes[0].keep_route || false,
         network_id: routes[0].network_id,
         high_availability_count: allPeers,
         is_using_route_groups: !!groupPeerRoute,
         description: groupPeerRoute ? groupPeerRoute?.description : undefined,
+        description_search: childDescriptions,
         routes: routes,
         group_names: allGroupNames,
       });

src/modules/routes/RouteAddRoutingPeerModal.tsx

@@ -89,6 +89,13 @@ function Content({ onSuccess, groupedRoute, peer }: ModalProps) {
       .map((g) => g.id)
       .filter((id) => id !== undefined) as string[];
 
+    let useRange = false;
+    if (routeNetwork?.domains) {
+      useRange = routeNetwork.domains.length <= 0;
+    } else {
+      useRange = true;
+    }
+
     createRoute(
       {
         network_id: routeNetwork.network_id,
@@ -96,7 +103,9 @@ function Content({ onSuccess, groupedRoute, peer }: ModalProps) {
         enabled: true,
         peer: routingPeer?.id || undefined,
         peer_groups: undefined,
-        network: routeNetwork.network,
+        network: useRange ? routeNetwork.network : undefined,
+        domains: useRange ? undefined : routeNetwork.domains,
+        keep_route: routeNetwork.keep_route || false,
         metric: 9999,
         masquerade: true,
         groups: groupIds,
@@ -139,7 +148,7 @@ function Content({ onSuccess, groupedRoute, peer }: ModalProps) {
         <div>
           <Label>Routing Peer</Label>
           <HelpText>
-            Assign a single peer as a routing peer for the Network CIDR.
+            Assign a single peer as a routing peer for the network route.
           </HelpText>
           <PeerSelector
             onChange={setRoutingPeer}

src/modules/routes/RouteModal.tsx

@@ -1,7 +1,9 @@
 "use client";
 
 import Button from "@components/Button";
+import ButtonGroup from "@components/ButtonGroup";
 import FancyToggleSwitch from "@components/FancyToggleSwitch";
+import FullTooltip from "@components/FullTooltip";
 import HelpText from "@components/HelpText";
 import InlineLink from "@components/InlineLink";
 import { Input } from "@components/Input";
@@ -20,24 +22,29 @@ import { PeerSelector } from "@components/PeerSelector";
 import { SegmentedTabs } from "@components/SegmentedTabs";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@components/Tabs";
 import { Textarea } from "@components/Textarea";
+import InputDomain, { domainReducer } from "@components/ui/InputDomain";
 import { IconDirectionSign } from "@tabler/icons-react";
 import { cn } from "@utils/helpers";
 import cidr from "ip-cidr";
 import { uniqBy } from "lodash";
 import {
   ArrowDownWideNarrow,
+  CircleHelp,
   ExternalLinkIcon,
   FolderGit2,
+  GlobeIcon,
+  GlobeLockIcon,
   MonitorSmartphoneIcon,
   NetworkIcon,
   PlusCircle,
+  PlusIcon,
   Power,
   RouteIcon,
   Settings2,
   Text,
   VenetianMask,
 } from "lucide-react";
-import React, { useMemo, useRef, useState } from "react";
+import React, { useEffect, useMemo, useReducer, useRef, useState } from "react";
 import NetworkRoutesIcon from "@/assets/icons/NetworkRoutesIcon";
 import { useRoutes } from "@/contexts/RoutesProvider";
 import { Peer } from "@/interfaces/Peer";
@@ -102,6 +109,32 @@ export function RouteModalContent({
     initial: [],
   });
 
+  /**
+   * DNS Routes
+   * IP Range or Domain Tab = ip-range or domains
+   */
+  const [domainRoutes, setDomainRoutes] = useReducer(domainReducer, []);
+  const [domainError, setDomainError] = useState<boolean>(false);
+  const [routeType, setRouteTyp] = useState<string>("ip-range");
+  const [keepRoute, setKeepRoute] = useState<boolean>(true);
+
+  const isMasqueradeDisabled = useMemo(() => {
+    if (exitNode) return true;
+    return routeType === "domains";
+  }, [exitNode, routeType]);
+
+  const isDomainOrRangeEntered = useMemo(() => {
+    if (routeType === "ip-range") return networkRange !== "";
+    const isEmptyDomain = domainRoutes.some((d) => d.name === "");
+    const isAtLeastOneDomain = domainRoutes.length > 0;
+    return !isEmptyDomain && isAtLeastOneDomain && !domainError;
+  }, [domainRoutes, routeType, networkRange, domainError]);
+
+  // Enable Masquerade if domain route type is selected
+  useEffect(() => {
+    if (routeType === "domains") setMasquerade(true);
+  }, [routeType]);
+
   /**
    * Distribution Groups
    */
@@ -142,6 +175,11 @@ export function RouteModalContent({
       .filter((g) => g !== undefined) as string[];
 
     const useSinglePeer = peerTab === "routing-peer";
+    const domainRouteNames =
+      routeType === "domains"
+        ? domainRoutes.map((d) => d.name).filter((d) => d !== "")
+        : undefined;
+    const useKeepRoute = routeType === "domains" ? keepRoute : undefined;
 
     createRoute(
       {
@@ -150,7 +188,9 @@ export function RouteModalContent({
         enabled: enabled,
         peer: useSinglePeer ? routingPeer?.id : undefined,
         peer_groups: useSinglePeer ? undefined : peerGroups || undefined,
-        network: networkRange,
+        network: routeType === "ip-range" ? networkRange : undefined,
+        domains: domainRouteNames,
+        keep_route: useKeepRoute,
         metric: Number(metric) || 9999,
         masquerade: masquerade,
         groups: groupIds,
@@ -184,7 +224,7 @@ export function RouteModalContent({
       (peerTab === "peer-group" && routingPeerGroups.length == 0) ||
       (peerTab === "routing-peer" && !routingPeer) ||
       groups.length == 0 ||
-      networkRange == ""
+      !isDomainOrRangeEntered
     );
   }, [
     cidrError,
@@ -192,7 +232,7 @@ export function RouteModalContent({
     routingPeerGroups.length,
     routingPeer,
     groups,
-    networkRange,
+    isDomainOrRangeEntered,
   ]);
 
   const networkIdentifierError = useMemo(() => {
@@ -228,7 +268,7 @@ export function RouteModalContent({
         title={
           exitNode
             ? isFirstExitNode
-              ? "Setup Exit Node"
+              ? "Set Up Exit Node"
               : "Add Exit Node"
             : "Create New  Route"
         }
@@ -286,18 +326,136 @@ export function RouteModalContent({
         <TabsContent value={"network"} className={"pb-8"}>
           <div className={"px-8 flex-col flex gap-6"}>
             <div className={cn(exitNode && "hidden")}>
-              <Label>Network Range</Label>
-              <HelpText>Add a private IP address range</HelpText>
-              <Input
-                ref={networkRangeRef}
-                customPrefix={<NetworkIcon size={16} />}
-                placeholder={"e.g., 172.16.0.0/16"}
-                value={networkRange}
-                className={"font-mono !text-[13px]"}
-                error={cidrError}
-                onChange={(e) => setNetworkRange(e.target.value)}
-              />
+              <Label>Route Type</Label>
+              <HelpText>
+                Select your route type to add either a network range or a list
+                of domains.
+              </HelpText>
+              <div className={"flex justify-between items-center w-full"}>
+                <ButtonGroup className={"w-full"}>
+                  <ButtonGroup.Button
+                    variant={routeType == "ip-range" ? "tertiary" : "secondary"}
+                    onClick={() => setRouteTyp("ip-range")}
+                    className={"w-full"}
+                  >
+                    <NetworkIcon size={16} />
+                    Network Range
+                  </ButtonGroup.Button>
+                  <ButtonGroup.Button
+                    variant={routeType == "domains" ? "tertiary" : "secondary"}
+                    onClick={() => setRouteTyp("domains")}
+                    className={"w-full"}
+                  >
+                    <GlobeIcon size={16} />
+                    Domains
+                  </ButtonGroup.Button>
+                </ButtonGroup>
+              </div>
+
+              <div
+                className={cn(
+                  "mt-5 mb-3",
+                  routeType !== "ip-range" && "hidden",
+                )}
+              >
+                <Label>Network Range</Label>
+                <HelpText>Add a private IPv4 address range</HelpText>
+                <Input
+                  ref={networkRangeRef}
+                  customPrefix={<NetworkIcon size={16} />}
+                  placeholder={"e.g., 172.16.0.0/16"}
+                  value={networkRange}
+                  className={"font-mono !text-[13px]"}
+                  error={cidrError}
+                  onChange={(e) => setNetworkRange(e.target.value)}
+                />
+              </div>
+
+              <div
+                className={cn("mt-5 mb-3", routeType !== "domains" && "hidden")}
+              >
+                <Label>Domains</Label>
+                <HelpText>
+                  Add domains that dynamically resolve to one or more IPv4
+                  addresses
+                </HelpText>
+                <div>
+                  {domainRoutes.length > 0 && (
+                    <div className={"flex gap-3 w-full mb-3"}>
+                      <div className={"flex flex-col gap-2 w-full"}>
+                        {domainRoutes.map((domain, i) => {
+                          return (
+                            <InputDomain
+                              key={domain.id}
+                              value={domain}
+                              onChange={(d) =>
+                                setDomainRoutes({
+                                  type: "UPDATE",
+                                  index: i,
+                                  d,
+                                })
+                              }
+                              onError={setDomainError}
+                              onRemove={() =>
+                                setDomainRoutes({
+                                  type: "REMOVE",
+                                  index: i,
+                                })
+                              }
+                            />
+                          );
+                        })}
+                      </div>
+                    </div>
+                  )}
+                  <Button
+                    variant={"dotted"}
+                    className={"w-full"}
+                    size={"sm"}
+                    onClick={() => setDomainRoutes({ type: "ADD" })}
+                  >
+                    <PlusIcon size={14} />
+                    Add Domain
+                  </Button>
+                </div>
+                <div className={cn("mt-6 w-full")}>
+                  <FullTooltip
+                    side={"top"}
+                    content={
+                      <div className={"text-xs max-w-xs"}>
+                        DNS records for load-balanced systems often change.
+                        Keeping resolved addresses ensures ongoing connections
+                        to active resources remain uninterrupted.
+                      </div>
+                    }
+                  >
+                    <FancyToggleSwitch
+                      value={keepRoute}
+                      onChange={setKeepRoute}
+                      label={
+                        <>
+                          <div className={"flex gap-2"}>
+                            <GlobeLockIcon size={14} />
+                            Keep Routes
+                            <CircleHelp
+                              size={12}
+                              className={"top-[1px] relative text-nb-gray-300"}
+                            />
+                          </div>
+                        </>
+                      }
+                      helpText={
+                        <div>
+                          Retain previously resolved routes after IP address
+                          updates to maintain stable connections.
+                        </div>
+                      }
+                    />
+                  </FullTooltip>
+                </div>
+              </div>
             </div>
+
             {exitNode && peer ? (
               <></>
             ) : (
@@ -317,7 +475,7 @@ export function RouteModalContent({
                   <div>
                     <HelpText>
                       Assign a single peer as a routing peer for the
-                      {exitNode ? " exit node." : " Network CIDR."}
+                      {exitNode ? " exit node." : " network route."}
                     </HelpText>
                     <PeerSelector
                       onChange={setRoutingPeer}
@@ -330,7 +488,7 @@ export function RouteModalContent({
                   <div>
                     <HelpText>
                       Assign a peer group with Linux machines to be used as
-                      {exitNode ? " exit nodes." : "routing peers."}
+                      {exitNode ? " exit nodes." : " routing peers."}
                     </HelpText>
                     <PeerGroupSelector
                       max={1}
@@ -419,9 +577,9 @@ export function RouteModalContent({
 
             <div className={cn("flex justify-between")}>
               <div>
-                <Label>Metrics</Label>
+                <Label>Metric</Label>
                 <HelpText className={"max-w-[200px]"}>
-                  Lower metrics indicating higher priority routes.
+                  A lower metric indicates a higher priority route.
                 </HelpText>
               </div>
 

src/modules/routes/RouteTable.tsx

@@ -9,7 +9,6 @@ import RouteActiveCell from "@/modules/routes/RouteActiveCell";
 import RouteDistributionGroupsCell from "@/modules/routes/RouteDistributionGroupsCell";
 import RouteMetricCell from "@/modules/routes/RouteMetricCell";
 import RoutePeerCell from "@/modules/routes/RoutePeerCell";
-import RouteUpdateModal from "@/modules/routes/RouteUpdateModal";
 
 type Props = {
   row: GroupedRoute;
@@ -23,6 +22,20 @@ export const RouteTableColumns: ColumnDef<Route>[] = [
     sortingFn: "text",
     cell: ({ row }) => <RoutePeerCell route={row.original} />,
   },
+  {
+    accessorKey: "description",
+    sortingFn: "text",
+  },
+  {
+    accessorKey: "domain_search",
+    sortingFn: "text",
+  },
+  {
+    id: "domains",
+    accessorFn: (row) => {
+      return row.domains?.map((name) => name).join(", ");
+    },
+  },
   {
     accessorKey: "metric",
     header: ({ column }) => {
@@ -78,10 +91,6 @@ export default function RouteTable({ row }: Props) {
     },
   ]);
 
-  const [editModal, setEditModal] = useState(false);
-  const [currentRow, setCurrentRow] = useState<Route>();
-  const [currentCellClicked, setCurrentCellClicked] = useState("");
-
   const data = useMemo(() => {
     if (!row.routes) return [];
     // Get the group names for better search results
@@ -95,23 +104,17 @@ export default function RouteTable({ row }: Props) {
           return groups?.find((g) => g.id === id)?.name || "";
         }) || [];
       const allGroupNames = [...distributionGroupNames, ...peerGroupNames];
+      const domainString = route?.domains?.join(", ") || "";
       return {
         ...route,
         group_names: allGroupNames,
+        domain_search: domainString,
       } as Route;
     });
   }, [row.routes, groups]);
 
   return (
     <>
-      {editModal && currentRow && (
-        <RouteUpdateModal
-          route={currentRow}
-          open={editModal}
-          onOpenChange={setEditModal}
-          cell={currentCellClicked}
-        />
-      )}
       <DataTable
         tableClassName={"mt-0"}
         minimal={true}
@@ -122,11 +125,9 @@ export default function RouteTable({ row }: Props) {
         sorting={sorting}
         columnVisibility={{
           group_names: false,
-        }}
-        onRowClick={(row, cell) => {
-          setCurrentRow(row.original);
-          setEditModal(true);
-          setCurrentCellClicked(cell);
+          description: false,
+          domains: false,
+          domain_search: false,
         }}
         setSorting={setSorting}
         columns={RouteTableColumns}

src/modules/routes/RouteUpdateModal.tsx

@@ -18,6 +18,7 @@ import { PeerGroupSelector } from "@components/PeerGroupSelector";
 import { PeerSelector } from "@components/PeerSelector";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@components/Tabs";
 import { Textarea } from "@components/Textarea";
+import { DomainsTooltip } from "@components/ui/DomainListBadge";
 import { cn } from "@utils/helpers";
 import { uniqBy } from "lodash";
 import {
@@ -84,6 +85,23 @@ function RouteUpdateModalContent({ onSuccess, route, cell }: ModalProps) {
   // General
   const [description, setDescription] = useState(route.description || "");
 
+  const isExitNode = useMemo(() => {
+    return route?.network === "0.0.0.0/0";
+  }, [route]);
+
+  const isUsingDomains = useMemo(() => {
+    try {
+      return route?.domains && route.domains.length > 0;
+    } catch (e) {
+      return false;
+    }
+  }, [route]);
+
+  const routeType = useMemo(() => {
+    if (isUsingDomains) return "domains";
+    return "ip-range";
+  }, [isUsingDomains]);
+
   // Network
   const [routingPeer, setRoutingPeer] = useState<Peer | undefined>(() => {
     if (route.peer && peers) {
@@ -92,6 +110,11 @@ function RouteUpdateModalContent({ onSuccess, route, cell }: ModalProps) {
     return undefined;
   });
 
+  const isMasqueradeDisabled = useMemo(() => {
+    if (isExitNode) return true;
+    return routeType === "domains";
+  }, [isExitNode, routeType]);
+
   const initialRoutingPeerGroups = useMemo(() => {
     if (!route) return [];
     if (route?.peer_groups && allGroups) {
@@ -217,14 +240,36 @@ function RouteUpdateModalContent({ onSuccess, route, cell }: ModalProps) {
     cell && cell == "metric" ? "settings" : "network",
   );
 
+  const routeInfo = useMemo(() => {
+    let hasDomains = route?.domains ? route.domains.length > 0 : false;
+    try {
+      if (hasDomains && route?.domains) {
+        return route?.domains.join(", ");
+      } else {
+        return route.network;
+      }
+    } catch (e) {
+      return route.network;
+    }
+  }, [route]);
+
   return (
     <ModalContent maxWidthClass={"max-w-xl"}>
       <ModalHeader
         icon={<NetworkRoutesIcon className={"fill-netbird"} />}
         title={"Update " + route.network_id}
-        description={route.network}
+        description={routeInfo}
         color={"netbird"}
-      />
+        truncate={true}
+      >
+        {route?.domains && (
+          <DomainsTooltip domains={route.domains} className={"block"}>
+            <Paragraph className={cn("text-sm", "!block truncate")}>
+              {routeInfo}
+            </Paragraph>
+          </DomainsTooltip>
+        )}
+      </ModalHeader>
 
       <Tabs defaultValue={tab} onValueChange={(v) => setTab(v)}>
         <TabsList justify={"start"} className={"px-8"}>
@@ -269,7 +314,8 @@ function RouteUpdateModalContent({ onSuccess, route, cell }: ModalProps) {
               <div>
                 <Label>Routing Peer</Label>
                 <HelpText>
-                  Assign a single peer as a routing peer for the Network CIDR.
+                  Assign a single peer as a routing peer for the
+                  {isExitNode ? " exit node." : " network route."}
                 </HelpText>
                 <PeerSelector
                   onChange={setRoutingPeer}
@@ -281,8 +327,8 @@ function RouteUpdateModalContent({ onSuccess, route, cell }: ModalProps) {
               <div>
                 <Label>Peer Group</Label>
                 <HelpText>
-                  Assign peer group with Linux machines to be used as routing
-                  peers.
+                  Assign a peer group with Linux machines to be used as
+                  {isExitNode ? " exit nodes." : "routing peers."}
                 </HelpText>
                 <PeerGroupSelector
                   max={1}
@@ -333,24 +379,26 @@ function RouteUpdateModalContent({ onSuccess, route, cell }: ModalProps) {
               }
               helpText={"Use this switch to enable or disable the route."}
             />
-            <FancyToggleSwitch
-              value={masquerade}
-              onChange={setMasquerade}
-              label={
-                <>
-                  <VenetianMask size={15} />
-                  Masquerade
-                </>
-              }
-              helpText={
-                "Allow access to your private networks without configuring routes on your local routers or other devices."
-              }
-            />
+            {!isExitNode && (
+              <FancyToggleSwitch
+                value={masquerade}
+                onChange={setMasquerade}
+                label={
+                  <>
+                    <VenetianMask size={15} />
+                    Masquerade
+                  </>
+                }
+                helpText={
+                  "Allow access to your private networks without configuring routes on your local routers or other devices."
+                }
+              />
+            )}
             <div className={cn("flex justify-between")}>
               <div>
-                <Label>Metrics</Label>
+                <Label>Metric</Label>
                 <HelpText className={"max-w-[200px]"}>
-                  Lower metrics indicating higher priority routes.
+                  A lower metric indicates a higher priority route.
                 </HelpText>
               </div>
 

src/modules/settings/AuthenticationTab.tsx

@@ -99,6 +99,7 @@ export default function AuthenticationTab({ account }: Props) {
         .put({
           id: account.id,
           settings: {
+            ...account.settings,
             peer_login_expiration_enabled: loginExpiration,
             peer_login_expiration: loginExpiration ? expiration : 86400,
             extra: {

src/modules/settings/GroupsTab.tsx

@@ -108,10 +108,8 @@ export default function GroupsTab({ account }: Props) {
         .put({
           id: account.id,
           settings: {
+            ...account.settings,
             groups_propagation_enabled: groupsPropagation,
-            peer_login_expiration_enabled:
-              account.settings.peer_login_expiration_enabled,
-            peer_login_expiration: account.settings.peer_login_expiration,
             jwt_groups_enabled: jwtGroupSync,
             jwt_groups_claim_name: isEmpty(jwtGroupsClaimName)
               ? undefined

src/modules/settings/PermissionsTab.tsx

@@ -33,15 +33,8 @@ export default function PermissionsTab({ account }: Props) {
         .put({
           id: account.id,
           settings: {
+            ...account.settings,
             regular_users_view_blocked: userViewBlocked,
-            groups_propagation_enabled:
-              account.settings?.groups_propagation_enabled,
-            peer_login_expiration_enabled:
-              account.settings?.peer_login_expiration_enabled,
-            peer_login_expiration: account.settings?.peer_login_expiration,
-            jwt_groups_enabled: account.settings?.jwt_groups_enabled,
-            jwt_groups_claim_name: account.settings?.jwt_groups_claim_name,
-            jwt_allow_groups: account.settings?.jwt_allow_groups,
           },
         })
         .then(() => {

src/modules/setup-keys/SetupKeyEphemeralCell.tsx

@@ -0,0 +1,37 @@
+import Badge from "@components/Badge";
+import FullTooltip from "@components/FullTooltip";
+import { cn } from "@utils/helpers";
+import { HelpCircle } from "lucide-react";
+import * as React from "react";
+import EmptyRow from "@/modules/common-table-rows/EmptyRow";
+
+type Props = {
+  ephemeral: boolean;
+};
+export default function SetupKeyEphemeralCell({ ephemeral }: Props) {
+  return ephemeral ? (
+    <FullTooltip
+      interactive={false}
+      content={
+        <div className={"max-w-xs text-xs"}>
+          Peers that are offline for over 10 minutes will be removed
+          automatically.
+        </div>
+      }
+      disabled={!ephemeral}
+    >
+      <Badge variant={"gray"}>
+        <span
+          className={cn(
+            "h-2 w-2 rounded-full mr-0.5",
+            ephemeral ? "bg-yellow-500" : "bg-nb-gray-400",
+          )}
+        ></span>
+        Ephemeral
+        <HelpCircle size={12} />
+      </Badge>
+    </FullTooltip>
+  ) : (
+    <EmptyRow />
+  );
+}

src/modules/setup-keys/SetupKeyGroupsCell.tsx

@@ -46,6 +46,7 @@ export default function SetupKeyGroupsCell({ setupKey }: Props) {
       }
       groups={setupKey.auto_groups || []}
       onSave={handleSave}
+      showAddGroupButton={true}
       modal={modal}
       setModal={setModal}
     />

src/modules/setup-keys/SetupKeyModal.tsx

@@ -87,7 +87,11 @@ export default function SetupKeyModal({ children, open, setOpen }: Props) {
             </div>
           </div>
 
-          <div className={"px-8 pb-6"}>
+          <div
+            className={"px-8 pb-6"}
+            data-cy={"setup-key-copy-input"}
+            data-cy-setup-key-value={setupKey?.key || ""}
+          >
             <Code message={copyMessage}>
               <Code.Line>
                 {setupKey?.key || "Setup key could not be created..."}
@@ -101,6 +105,7 @@ export default function SetupKeyModal({ children, open, setOpen }: Props) {
                   variant={"secondary"}
                   className={"w-full"}
                   tabIndex={-1}
+                  data-cy={"setup-key-close"}
                 >
                   Close
                 </Button>
@@ -108,6 +113,7 @@ export default function SetupKeyModal({ children, open, setOpen }: Props) {
               <Button
                 variant={"primary"}
                 className={"w-full"}
+                data-cy={"setup-key-copy"}
                 onClick={() => copy(copyMessage)}
               >
                 <CopyIcon size={14} />
@@ -202,6 +208,7 @@ export function SetupKeyModalContent({ onSuccess }: ModalProps) {
           <Input
             placeholder={"e.g., AWS Servers"}
             value={name}
+            data-cy={"setup-key-name"}
             onChange={(e) => setName(e.target.value)}
           />
         </div>
@@ -233,6 +240,7 @@ export function SetupKeyModalContent({ onSuccess }: ModalProps) {
             disabled={!reusable}
             value={usageLimit}
             type={"number"}
+            data-cy={"setup-key-usage-limit"}
             onChange={(e) => setUsageLimit(e.target.value)}
             placeholder={usageLimitPlaceholder}
             customPrefix={
@@ -256,6 +264,7 @@ export function SetupKeyModalContent({ onSuccess }: ModalProps) {
             error={expiresInError}
             errorTooltip={true}
             type={"number"}
+            data-cy={"setup-key-expire-in-days"}
             onChange={(e) => setExpiresIn(e.target.value)}
             customPrefix={
               <AlarmClock size={16} className={"text-nb-gray-300"} />
@@ -312,7 +321,12 @@ export function SetupKeyModalContent({ onSuccess }: ModalProps) {
             <Button variant={"secondary"}>Cancel</Button>
           </ModalClose>
 
-          <Button variant={"primary"} onClick={submit} disabled={isDisabled}>
+          <Button
+            variant={"primary"}
+            onClick={submit}
+            disabled={isDisabled}
+            data-cy={"create-setup-key"}
+          >
             <PlusCircle size={16} />
             Create Setup Key
           </Button>

src/modules/setup-keys/SetupKeyNameCell.tsx

@@ -3,7 +3,20 @@ import ActiveInactiveRow from "@/modules/common-table-rows/ActiveInactiveRow";
 type Props = {
   name: string;
   valid: boolean;
+  secret?: string;
 };
-export default function SetupKeyNameCell({ valid, name }: Props) {
-  return <ActiveInactiveRow active={valid} inactiveDot={"red"} text={name} />;
+export default function SetupKeyNameCell({ name, valid, secret }: Props) {
+  return (
+    <ActiveInactiveRow
+      active={valid || false}
+      inactiveDot={"red"}
+      text={name || ""}
+    >
+      {secret && (
+        <span className={"font-mono text-xs text-nb-gray-400 mt-1"}>
+          {secret.substring(0, 5) + "****"}
+        </span>
+      )}
+    </ActiveInactiveRow>
+  );
 }

src/modules/setup-keys/SetupKeyUsageCell.tsx

@@ -1,4 +1,5 @@
-import { MonitorSmartphoneIcon } from "lucide-react";
+import { IconRepeat } from "@tabler/icons-react";
+import { Repeat1 } from "lucide-react";
 
 type Props = {
   current: number;
@@ -7,14 +8,16 @@ type Props = {
 };
 export default function SetupKeyUsageCell({ current, limit, reusable }: Props) {
   return reusable ? (
-    <div className={"flex gap-1 flex-col"}>
-      <div className={"flex items-center gap-2"}>
-        <MonitorSmartphoneIcon size={14} />
-        {current} of {limit} Peers
-      </div>
-      <div></div>
+    <div className={"flex items-center text-[13px] text-nb-gray-300 gap-2"}>
+      <IconRepeat size={14} className={"text-green-400"} />
+      <span>
+        <span className={"font-medium text-nb-gray-200"}> {current} </span> of{" "}
+        {limit == 0 ? <>Unlimited</> : limit} Peers
+      </span>
     </div>
   ) : (
-    <div className={"text-nb-gray-800"}>-</div>
+    <div className={"flex items-center text-[13px] text-nb-gray-300 gap-2"}>
+      <Repeat1 size={14} /> One-off
+    </div>
   );
 }

src/modules/setup-keys/SetupKeysTable.tsx

@@ -3,10 +3,11 @@ import ButtonGroup from "@components/ButtonGroup";
 import InlineLink from "@components/InlineLink";
 import SquareIcon from "@components/SquareIcon";
 import { DataTable } from "@components/table/DataTable";
+import DataTableHeader from "@components/table/DataTableHeader";
 import DataTableRefreshButton from "@components/table/DataTableRefreshButton";
 import { DataTableRowsPerPage } from "@components/table/DataTableRowsPerPage";
 import GetStartedTest from "@components/ui/GetStartedTest";
-import { SortingState } from "@tanstack/react-table";
+import { ColumnDef, SortingState } from "@tanstack/react-table";
 import { ExternalLinkIcon, PlusCircle } from "lucide-react";
 import { usePathname } from "next/navigation";
 import React, { useState } from "react";
@@ -14,8 +15,96 @@ import { useSWRConfig } from "swr";
 import SetupKeysIcon from "@/assets/icons/SetupKeysIcon";
 import { useLocalStorage } from "@/hooks/useLocalStorage";
 import { SetupKey } from "@/interfaces/SetupKey";
+import ExpirationDateRow from "@/modules/common-table-rows/ExpirationDateRow";
+import LastTimeRow from "@/modules/common-table-rows/LastTimeRow";
+import SetupKeyActionCell from "@/modules/setup-keys/SetupKeyActionCell";
+import SetupKeyEphemeralCell from "@/modules/setup-keys/SetupKeyEphemeralCell";
+import SetupKeyGroupsCell from "@/modules/setup-keys/SetupKeyGroupsCell";
 import SetupKeyModal from "@/modules/setup-keys/SetupKeyModal";
-import { SetupKeysTableColumns } from "@/modules/setup-keys/SetupKeysTableColumns";
+import SetupKeyNameCell from "@/modules/setup-keys/SetupKeyNameCell";
+import SetupKeyUsageCell from "@/modules/setup-keys/SetupKeyUsageCell";
+
+export const SetupKeysTableColumns: ColumnDef<SetupKey>[] = [
+  {
+    accessorKey: "name",
+    header: ({ column }) => {
+      return <DataTableHeader column={column}>Name & Key</DataTableHeader>;
+    },
+    sortingFn: "text",
+    cell: ({ row }) => (
+      <SetupKeyNameCell
+        name={row.original.name}
+        valid={row.original.valid}
+        secret={row.original.key}
+      />
+    ),
+  },
+  {
+    id: "valid",
+    accessorKey: "valid",
+    sortingFn: "basic",
+  },
+  {
+    accessorKey: "usage_limit",
+    header: ({ column }) => {
+      return <DataTableHeader column={column}>Usage</DataTableHeader>;
+    },
+    cell: ({ row }) => (
+      <SetupKeyUsageCell
+        current={row.original.used_times}
+        limit={row.original.usage_limit || 0}
+        reusable={row.original.type == "reusable"}
+      />
+    ),
+  },
+  {
+    accessorKey: "last_used",
+    header: ({ column }) => {
+      return <DataTableHeader column={column}>Last used</DataTableHeader>;
+    },
+    sortingFn: "datetime",
+    cell: ({ row }) => (
+      <LastTimeRow date={row.original.last_used} text={"Last used on"} />
+    ),
+  },
+  {
+    id: "group_strings",
+    accessorKey: "group_strings",
+    accessorFn: (s) => s.groups?.map((g) => g?.name || "").join(", "),
+  },
+  {
+    accessorFn: (item) => item.auto_groups?.length,
+    id: "groups",
+    header: ({ column }) => {
+      return <DataTableHeader column={column}>Groups</DataTableHeader>;
+    },
+    cell: ({ row }) => <SetupKeyGroupsCell setupKey={row.original} />,
+  },
+  {
+    accessorKey: "ephemeral",
+    header: ({ column }) => {
+      return <DataTableHeader column={column}>Ephemeral</DataTableHeader>;
+    },
+    cell: ({ row }) => (
+      <SetupKeyEphemeralCell ephemeral={row.original.ephemeral} />
+    ),
+  },
+  {
+    accessorKey: "expires",
+    header: ({ column }) => {
+      return <DataTableHeader column={column}>Expires</DataTableHeader>;
+    },
+    cell: ({ row }) => <ExpirationDateRow date={row.original.expires} />,
+  },
+
+  {
+    accessorKey: "id",
+    header: "",
+    cell: ({ row }) => {
+      return <SetupKeyActionCell setupKey={row.original} />;
+    },
+  },
+];
 
 type Props = {
   setupKeys?: SetupKey[];
@@ -33,10 +122,6 @@ export default function SetupKeysTable({ setupKeys, isLoading }: Props) {
         id: "valid",
         desc: true,
       },
-      {
-        id: "type",
-        desc: true,
-      },
       {
         id: "last_used",
         desc: true,

src/modules/setup-keys/SetupKeysTableColumns.tsx

@@ -1,107 +0,0 @@
-"use client";
-
-import DataTableHeader from "@components/table/DataTableHeader";
-import { ColumnDef } from "@tanstack/react-table";
-import * as React from "react";
-import { SetupKey } from "@/interfaces/SetupKey";
-import ExpirationDateRow from "@/modules/common-table-rows/ExpirationDateRow";
-import LastTimeRow from "@/modules/common-table-rows/LastTimeRow";
-import SetupKeyActionCell from "@/modules/setup-keys/SetupKeyActionCell";
-import SetupKeyGroupsCell from "@/modules/setup-keys/SetupKeyGroupsCell";
-import SetupKeyKeyCell from "@/modules/setup-keys/SetupKeyKeyCell";
-import SetupKeyNameCell from "@/modules/setup-keys/SetupKeyNameCell";
-import SetupKeyTypeCell from "@/modules/setup-keys/SetupKeyTypeCell";
-
-export const SetupKeysTableColumns: ColumnDef<SetupKey>[] = [
-  /*  {
-  id: "select",
-    header: ({ table }) => (
-      <Checkbox
-        checked={table.getIsAllPageRowsSelected()}
-        onCheckedChange={(value) => table.toggleAllRowsSelected(!!value)}
-        aria-label="Select all"
-      />
-    ),
-    cell: ({ row }) => (
-      <Checkbox
-        checked={row.getIsSelected()}
-        onCheckedChange={(value) => row.toggleSelected(!!value)}
-        aria-label="Select row"
-      />
-    ),
-    enableSorting: false,
-    enableHiding: false,
-  },*/
-  {
-    accessorKey: "name",
-    header: ({ column }) => {
-      return <DataTableHeader column={column}>Name</DataTableHeader>;
-    },
-    sortingFn: "text",
-    cell: ({ row }) => (
-      <SetupKeyNameCell
-        valid={row.original.valid}
-        name={row.original?.name || ""}
-      />
-    ),
-  },
-  {
-    id: "valid",
-    accessorKey: "valid",
-    sortingFn: "basic",
-  },
-  {
-    accessorKey: "type",
-    header: ({ column }) => {
-      return <DataTableHeader column={column}>Reusable</DataTableHeader>;
-    },
-    cell: ({ row }) => (
-      <SetupKeyTypeCell reusable={row.original.type === "reusable"} />
-    ),
-  },
-  {
-    accessorKey: "key",
-    header: ({ column }) => {
-      return <DataTableHeader column={column}>Key</DataTableHeader>;
-    },
-    cell: ({ row }) => <SetupKeyKeyCell text={row.original.key} />,
-  },
-  {
-    id: "group_strings",
-    accessorKey: "group_strings",
-    accessorFn: (s) => s.groups?.map((g) => g?.name || "").join(", "),
-  },
-  {
-    accessorKey: "last_used",
-    header: ({ column }) => {
-      return <DataTableHeader column={column}>Last used</DataTableHeader>;
-    },
-    sortingFn: "datetime",
-    cell: ({ row }) => (
-      <LastTimeRow date={row.original.last_used} text={"Last used on"} />
-    ),
-  },
-  {
-    accessorFn: (item) => item.auto_groups?.length,
-    id: "groups",
-    header: ({ column }) => {
-      return <DataTableHeader column={column}>Groups</DataTableHeader>;
-    },
-    cell: ({ row }) => <SetupKeyGroupsCell setupKey={row.original} />,
-  },
-  {
-    accessorKey: "expires",
-    header: ({ column }) => {
-      return <DataTableHeader column={column}>Expires</DataTableHeader>;
-    },
-    cell: ({ row }) => <ExpirationDateRow date={row.original.expires} />,
-  },
-
-  {
-    accessorKey: "id",
-    header: "",
-    cell: ({ row }) => {
-      return <SetupKeyActionCell setupKey={row.original} />;
-    },
-  },
-];

src/utils/config.ts

@@ -27,9 +27,11 @@ const loadConfig = (): Config => {
   let silentRedirectURI = "/#silent-callback";
   let tokenSource = "accessToken";
 
-  if (process.env.NODE_ENV !== "production") {
+  if (process.env.APP_ENV === "test") {
+    configJson = require("@/config/test");
+  } else if (process.env.NODE_ENV === "development") {
     configJson = require("@/config/local");
-  } else {
+  } else if (process.env.NODE_ENV === "production") {
     configJson = require("@/config/production");
   }
 

src/utils/helpers.ts

@@ -41,10 +41,20 @@ export const sleep = (ms: number) => {
 
 export const validator = {
   isValidDomain: (domain: string) => {
-    const regExp =
-      /^(?!.*\s)[a-zA-Z0-9](?!.*\s$)(?!.*\.$)(?:(?!-)[a-zA-Z0-9-]{1,63}(?<!-)\.){1,126}(?!-)[a-zA-Z0-9-]{1,63}(?<!-)$/;
+    const unicodeDomain =
+        /^(?!.*\.\.)(?!.*\.$)(?!.*\s)(?:(?!-)(?!.*--)[a-zA-Z0-9\u00A1-\uFFFF-]{1,63}(?<!-)\.)+(?!-)(?!.*--)[a-zA-Z0-9\u00A1-\uFFFF-]{2,63}$/u;
     try {
-      return domain.match(regExp);
+      const minMaxChars = [1, 255];
+      const isValidDomainLength =
+        domain.length >= minMaxChars[0] && domain.length <= minMaxChars[1];
+      const includesDot = domain.includes(".");
+      const hasNoWhitespace = !domain.includes(" ");
+      return (
+        unicodeDomain.test(domain) &&
+        includesDot &&
+        hasNoWhitespace &&
+        isValidDomainLength
+      );
     } catch (e) {
       return false;
     }
@@ -60,7 +70,7 @@ export const validator = {
   isValidUrl: (urlString: string) => {
     const urlPattern = new RegExp(
       "^(https?:\\/\\/)?" + // validate protocol
-        "((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|" + // validate domain name
+        "((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|localhost|" + // validate domain name
         "((\\d{1,3}\\.){3}\\d{1,3}))" + // validate OR ip (v4) address
         "(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*" + // validate port and path
         "(\\?[;&a-z\\d%_.~+=-]*)?" + // validate query string
@@ -74,8 +84,37 @@ export const validator = {
       /^(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?$/;
     return semverRegex.test(version);
   },
+  isValidUnixFilePath: (path: string) => {
+    const endsWithSlash = path.endsWith("/");
+    const unixPathRegex = /^\/(?:[^/]+\/)*[^/]+$/;
+    const isValid = unixPathRegex.test(path);
+    return isValid && !endsWithSlash;
+  },
+  isValidWindowsFilePath: (path: string) => {
+    const endsWithBackSlash = path.endsWith("\\");
+    const windowsPathRegex =
+      /^[a-zA-Z]:\\(?:[^\\/:*?"<>|\r\n]+\\)*[^\\/:*?"<>|\r\n]*$/;
+    const isValid = windowsPathRegex.test(path);
+    return isValid && !endsWithBackSlash;
+  },
 };
 
 export function isInt(n: number) {
   return n % 1 === 0;
 }
+
+export function tryGetProcessNameFromPath(path: string) {
+  try {
+    const canSplitByForwardSlash = path.includes("/");
+    const canSplitByBackSlash = path.includes("\\");
+    const byForwardSlash = canSplitByForwardSlash
+      ? path.split("/").pop()
+      : undefined;
+    const byBackSlash = canSplitByBackSlash
+      ? path.split("\\").pop()
+      : undefined;
+    return byForwardSlash || byBackSlash || path;
+  } catch (e) {
+    return path;
+  }
+}

tsconfig.json

@@ -34,6 +34,9 @@
       "@/config/local": [
         "./.local-config.json"
       ],
+      "@/config/test": [
+        "./.test-config.json"
+      ],
       "@components/*": [
         "./src/components/*"
       ],