New translations en-us.json (Norwegian Bokmal)

[ci skip]

README.md

@@ -99,6 +99,19 @@ Access private resources like SSH servers, databases, RDP, and entire network ra
 
 <img src="public/screenshots/private-resources.png" alt="Private resources" width="100%" />
 
+### Identity-aware AI gateway
+
+Put an identity-aware proxy in front of public cloud (OpenAI, Anthropic, Gemini, etc.) and self-hosted model servers (Ollama, vLLM, Mistral, etc.) so coding agents and AI clients call a single Pangolin URL. Publish it as a public resource with personal API keys, or keep it private on a client tunnel where the connected client is the credential for keyless access. Budgets, session history, and usage analytics sit in front of every call.
+
+* Access self-hosted models (vLLM, Ollama, etc) alongside cloud models (OpenAI, Anthropic, etc) in one place
+* Keyless access by authenticating users with the Pangolin desktop client
+* Or, provide users with personal API keys
+* Control costs and token usage by setting budgets
+* Audit with detailed session history and analytics
+* Integrate AI clients and coding agents (Claude Code, Codex, OpenCode, etc)
+
+<img src="public/screenshots/expanded-session-logs.png" alt="AI Session Logs" width="100%" />
+
 ### Give users and roles access to resources
 
 Use Pangolin's built-in users or bring your own identity provider and set up role-based access control (RBAC). Grant users access to specific resources, not entire networks. Unlike traditional VPNs that expose full network access, Pangolin's zero-trust model ensures users can only reach the applications, services, and routes you explicitly define.

install/config/crowdsec/traefik_config.yml

@@ -16,7 +16,7 @@ experimental:
       version: "{{.BadgerVersion}}"
     crowdsec: # CrowdSec plugin configuration added
       moduleName: "github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
-      version: "v1.4.4"
+      version: "v1.7.1"
 
 log:
   level: "INFO"

messages/bg-BG.json

@@ -1573,6 +1573,8 @@
     "search": "Търси…",
     "searchPlaceholder": "Търсене...",
     "emptySearchOptions": "Няма намерени опции",
+    "ipFilterSearchPlaceholder": "Enter an IP address…",
+    "ipFilterEmptyMessage": "Enter an IP address to filter by",
     "create": "Създаване",
     "orgs": "Организации",
     "loginError": "Възникна неочаквана грешка. Моля, опитайте отново.",
@@ -2596,6 +2598,7 @@
     "createDomainType": "Тип:",
     "createDomainName": "Име:",
     "createDomainValue": "Стойност:",
+    "multiSelectFilterCount": "{count} selected",
     "createDomainCnameRecords": "CNAME записи",
     "createDomainARecords": "A записи",
     "createDomainRecordNumber": "Запис {number}",

messages/cs-CZ.json

@@ -1573,6 +1573,8 @@
     "search": "Vyhledávání…",
     "searchPlaceholder": "Hledat...",
     "emptySearchOptions": "Nebyly nalezeny žádné možnosti",
+    "ipFilterSearchPlaceholder": "Enter an IP address…",
+    "ipFilterEmptyMessage": "Enter an IP address to filter by",
     "create": "Vytvořit",
     "orgs": "Organizace",
     "loginError": "Došlo k neočekávané chybě. Zkuste to prosím znovu.",
@@ -2596,6 +2598,7 @@
     "createDomainType": "Typ:",
     "createDomainName": "Jméno:",
     "createDomainValue": "Hodnota:",
+    "multiSelectFilterCount": "{count} selected",
     "createDomainCnameRecords": "Záznamy CNAME",
     "createDomainARecords": "Záznamy",
     "createDomainRecordNumber": "Nahrát {number}",

messages/da-DK.json

@@ -1573,6 +1573,8 @@
     "search": "Søg…",
     "searchPlaceholder": "Søg...",
     "emptySearchOptions": "Ingen valg fundet",
+    "ipFilterSearchPlaceholder": "Enter an IP address…",
+    "ipFilterEmptyMessage": "Enter an IP address to filter by",
     "create": "Opret",
     "orgs": "Organisationer",
     "loginError": "Der opstod en uventet fejl. Prøv venligst igen.",
@@ -2596,6 +2598,7 @@
     "createDomainType": "Type:",
     "createDomainName": "Navn:",
     "createDomainValue": "Værdi:",
+    "multiSelectFilterCount": "{count} selected",
     "createDomainCnameRecords": "CNAME-poster",
     "createDomainARecords": "A-poster",
     "createDomainRecordNumber": "Post {number}",

messages/de-DE.json

@@ -1573,6 +1573,8 @@
     "search": "Suche…",
     "searchPlaceholder": "Suche...",
     "emptySearchOptions": "Keine Optionen gefunden",
+    "ipFilterSearchPlaceholder": "Enter an IP address…",
+    "ipFilterEmptyMessage": "Enter an IP address to filter by",
     "create": "Erstellen",
     "orgs": "Organisationen",
     "loginError": "Ein unerwarteter Fehler ist aufgetreten. Bitte versuchen Sie es erneut.",
@@ -2596,6 +2598,7 @@
     "createDomainType": "Typ:",
     "createDomainName": "Name:",
     "createDomainValue": "Wert:",
+    "multiSelectFilterCount": "{count} selected",
     "createDomainCnameRecords": "CNAME-Einträge",
     "createDomainARecords": "A-Aufzeichnungen",
     "createDomainRecordNumber": "Eintrag {number}",

messages/en-US.json

@@ -1573,6 +1573,8 @@
     "search": "Search…",
     "searchPlaceholder": "Search...",
     "emptySearchOptions": "No options found",
+    "ipFilterSearchPlaceholder": "Enter an IP address…",
+    "ipFilterEmptyMessage": "Enter an IP address to filter by",
     "create": "Create",
     "orgs": "Organizations",
     "loginError": "An unexpected error occurred. Please try again.",
@@ -2596,6 +2598,7 @@
     "createDomainType": "Type:",
     "createDomainName": "Name:",
     "createDomainValue": "Value:",
+    "multiSelectFilterCount": "{count} selected",
     "createDomainCnameRecords": "CNAME Records",
     "createDomainARecords": "A Records",
     "createDomainRecordNumber": "Record {number}",

messages/es-ES.json

@@ -1573,6 +1573,8 @@
     "search": "Buscar…",
     "searchPlaceholder": "Buscar...",
     "emptySearchOptions": "No se encontraron opciones",
+    "ipFilterSearchPlaceholder": "Enter an IP address…",
+    "ipFilterEmptyMessage": "Enter an IP address to filter by",
     "create": "Crear",
     "orgs": "Organizaciones",
     "loginError": "Ocurrió un error inesperado. Por favor, inténtelo de nuevo.",
@@ -2596,6 +2598,7 @@
     "createDomainType": "Tipo:",
     "createDomainName": "Nombre:",
     "createDomainValue": "Valor:",
+    "multiSelectFilterCount": "{count} selected",
     "createDomainCnameRecords": "Registros CNAME",
     "createDomainARecords": "Registros A",
     "createDomainRecordNumber": "Registro {number}",

messages/fr-FR.json

@@ -1573,6 +1573,8 @@
     "search": "Rechercher…",
     "searchPlaceholder": "Recherche...",
     "emptySearchOptions": "Aucune option trouvée",
+    "ipFilterSearchPlaceholder": "Enter an IP address…",
+    "ipFilterEmptyMessage": "Enter an IP address to filter by",
     "create": "Créer",
     "orgs": "Organisations",
     "loginError": "Une erreur inattendue s'est produite. Veuillez réessayer.",
@@ -2596,6 +2598,7 @@
     "createDomainType": "Type :",
     "createDomainName": "Nom :",
     "createDomainValue": "Valeur :",
+    "multiSelectFilterCount": "{count} selected",
     "createDomainCnameRecords": "Enregistrements CNAME",
     "createDomainARecords": "Enregistrements A",
     "createDomainRecordNumber": "Enregistrement {number}",

messages/it-IT.json

@@ -1573,6 +1573,8 @@
     "search": "Cerca…",
     "searchPlaceholder": "Cerca...",
     "emptySearchOptions": "Nessuna opzione trovata",
+    "ipFilterSearchPlaceholder": "Enter an IP address…",
+    "ipFilterEmptyMessage": "Enter an IP address to filter by",
     "create": "Crea",
     "orgs": "Organizzazioni",
     "loginError": "Si è verificato un errore imprevisto. Riprova.",
@@ -2596,6 +2598,7 @@
     "createDomainType": "Tipo:",
     "createDomainName": "Nome:",
     "createDomainValue": "Valore:",
+    "multiSelectFilterCount": "{count} selected",
     "createDomainCnameRecords": "Record CNAME",
     "createDomainARecords": "Record A",
     "createDomainRecordNumber": "Record {number}",

messages/ko-KR.json

@@ -1573,6 +1573,8 @@
     "search": "검색…",
     "searchPlaceholder": "검색...",
     "emptySearchOptions": "옵션이 없습니다",
+    "ipFilterSearchPlaceholder": "Enter an IP address…",
+    "ipFilterEmptyMessage": "Enter an IP address to filter by",
     "create": "생성",
     "orgs": "조직",
     "loginError": "예기치 않은 오류가 발생했습니다. 다시 시도해주세요.",
@@ -2596,6 +2598,7 @@
     "createDomainType": "유형:",
     "createDomainName": "이름:",
     "createDomainValue": "값:",
+    "multiSelectFilterCount": "{count} selected",
     "createDomainCnameRecords": "CNAME 레코드",
     "createDomainARecords": "A 레코드",
     "createDomainRecordNumber": "레코드 {number}",

messages/nb-NO.json

@@ -1573,6 +1573,8 @@
     "search": "Søk…",
     "searchPlaceholder": "Søk...",
     "emptySearchOptions": "Ingen valg funnet",
+    "ipFilterSearchPlaceholder": "Enter an IP address…",
+    "ipFilterEmptyMessage": "Enter an IP address to filter by",
     "create": "Opprett",
     "orgs": "Organisasjoner",
     "loginError": "En uventet feil oppstod. Vennligst prøv igjen.",
@@ -2596,6 +2598,7 @@
     "createDomainType": "Type:",
     "createDomainName": "Navn:",
     "createDomainValue": "Verdi:",
+    "multiSelectFilterCount": "{count} selected",
     "createDomainCnameRecords": "CNAME-oppføringer",
     "createDomainARecords": "A-oppføringer",
     "createDomainRecordNumber": "Oppføring {number}",

messages/nl-NL.json

@@ -1573,6 +1573,8 @@
     "search": "Zoeken…",
     "searchPlaceholder": "Zoeken...",
     "emptySearchOptions": "Geen opties gevonden",
+    "ipFilterSearchPlaceholder": "Enter an IP address…",
+    "ipFilterEmptyMessage": "Enter an IP address to filter by",
     "create": "Aanmaken",
     "orgs": "Organisaties",
     "loginError": "Er is een onverwachte fout opgetreden. Probeer het opnieuw.",
@@ -2596,6 +2598,7 @@
     "createDomainType": "Type:",
     "createDomainName": "Naam:",
     "createDomainValue": "Waarde:",
+    "multiSelectFilterCount": "{count} selected",
     "createDomainCnameRecords": "CNAME-records",
     "createDomainARecords": "A Records",
     "createDomainRecordNumber": "Record {number}",

messages/pl-PL.json

@@ -1573,6 +1573,8 @@
     "search": "Szukaj…",
     "searchPlaceholder": "Szukaj...",
     "emptySearchOptions": "Nie znaleziono opcji",
+    "ipFilterSearchPlaceholder": "Enter an IP address…",
+    "ipFilterEmptyMessage": "Enter an IP address to filter by",
     "create": "Utwórz",
     "orgs": "Organizacje",
     "loginError": "Wystąpił nieoczekiwany błąd. Spróbuj ponownie.",
@@ -2596,6 +2598,7 @@
     "createDomainType": "Typ:",
     "createDomainName": "Nazwa:",
     "createDomainValue": "Wartość:",
+    "multiSelectFilterCount": "{count} selected",
     "createDomainCnameRecords": "Rekordy CNAME",
     "createDomainARecords": "Rekordy A",
     "createDomainRecordNumber": "Rekord {number}",

messages/pt-PT.json

@@ -1573,6 +1573,8 @@
     "search": "Pesquisar…",
     "searchPlaceholder": "Buscar...",
     "emptySearchOptions": "Nenhuma opção encontrada",
+    "ipFilterSearchPlaceholder": "Enter an IP address…",
+    "ipFilterEmptyMessage": "Enter an IP address to filter by",
     "create": "Criar",
     "orgs": "Organizações",
     "loginError": "Ocorreu um erro inesperado. Por favor, tente novamente.",
@@ -2596,6 +2598,7 @@
     "createDomainType": "Tipo:",
     "createDomainName": "Nome:",
     "createDomainValue": "Valor:",
+    "multiSelectFilterCount": "{count} selected",
     "createDomainCnameRecords": "Registros CNAME",
     "createDomainARecords": "Registros A",
     "createDomainRecordNumber": "Registrar {number}",

messages/ru-RU.json

@@ -1573,6 +1573,8 @@
     "search": "Поиск…",
     "searchPlaceholder": "Поиск...",
     "emptySearchOptions": "Опции не найдены",
+    "ipFilterSearchPlaceholder": "Enter an IP address…",
+    "ipFilterEmptyMessage": "Enter an IP address to filter by",
     "create": "Создать",
     "orgs": "Организации",
     "loginError": "Произошла непредвиденная ошибка. Пожалуйста, попробуйте еще раз.",
@@ -2596,6 +2598,7 @@
     "createDomainType": "Тип:",
     "createDomainName": "Имя:",
     "createDomainValue": "Значение:",
+    "multiSelectFilterCount": "{count} selected",
     "createDomainCnameRecords": "CNAME Записи",
     "createDomainARecords": "A Записи",
     "createDomainRecordNumber": "Запись {number}",

messages/tr-TR.json

@@ -1573,6 +1573,8 @@
     "search": "Ara…",
     "searchPlaceholder": "Ara...",
     "emptySearchOptions": "Seçenek bulunamadı",
+    "ipFilterSearchPlaceholder": "Enter an IP address…",
+    "ipFilterEmptyMessage": "Enter an IP address to filter by",
     "create": "Oluştur",
     "orgs": "Organizasyonlar",
     "loginError": "Beklenmeyen bir hata oluştu. Lütfen tekrar deneyin.",
@@ -2596,6 +2598,7 @@
     "createDomainType": "Tür:",
     "createDomainName": "Ad:",
     "createDomainValue": "Değer:",
+    "multiSelectFilterCount": "{count} selected",
     "createDomainCnameRecords": "CNAME Kayıtları",
     "createDomainARecords": "A Kayıtları",
     "createDomainRecordNumber": "Kayıt {number}",

messages/zh-CN.json

@@ -1573,6 +1573,8 @@
     "search": "搜索…",
     "searchPlaceholder": "搜索...",
     "emptySearchOptions": "未找到选项",
+    "ipFilterSearchPlaceholder": "Enter an IP address…",
+    "ipFilterEmptyMessage": "Enter an IP address to filter by",
     "create": "创建",
     "orgs": "组织",
     "loginError": "发生意外错误。请重试。",
@@ -2596,6 +2598,7 @@
     "createDomainType": "类型:",
     "createDomainName": "名称:",
     "createDomainValue": "值:",
+    "multiSelectFilterCount": "{count} selected",
     "createDomainCnameRecords": "CNAME 记录",
     "createDomainARecords": "A记录",
     "createDomainRecordNumber": "记录 {number}",

package-lock.json

@@ -7569,6 +7569,72 @@
                 "node": ">=14.0.0"
             }
         },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/core": {
+            "version": "1.10.0",
+            "dev": true,
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@emnapi/wasi-threads": "1.2.1",
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": {
+            "version": "1.10.0",
+            "dev": true,
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
+            "version": "1.2.1",
+            "dev": true,
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": {
+            "version": "1.1.4",
+            "dev": true,
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@tybys/wasm-util": "^0.10.1"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/Brooooooklyn"
+            },
+            "peerDependencies": {
+                "@emnapi/core": "^1.7.1",
+                "@emnapi/runtime": "^1.7.1"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@tybys/wasm-util": {
+            "version": "0.10.1",
+            "dev": true,
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/tslib": {
+            "version": "2.8.1",
+            "dev": true,
+            "inBundle": true,
+            "license": "0BSD",
+            "optional": true
+        },
         "node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.3.0.tgz",
@@ -17131,36 +17197,14 @@
             }
         },
         "node_modules/socket.io-adapter": {
-            "version": "2.5.6",
+            "version": "2.5.8",
-            "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.6.tgz",
+            "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.8.tgz",
-            "integrity": "sha512-DkkO/dz7MGln0dHn5bmN3pPy+JmywNICWrJqVWiVOyvXjWQFIv9c2h24JrQLLFJ2aQVQf/Cvl1vblnd4r2apLQ==",
+            "integrity": "sha512-6Oy52pbg+kvdCVvjcN+FnY7BvxZ7cIHNScbvztT/It5d0vbwoJoVZmF2gjJmnV0/4WlXRfG15zc45ySk9Ah8bw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "debug": "~4.4.1",
-                "ws": "~8.18.3"
+                "ws": "~8.21.0"
-            }
-        },
-        "node_modules/socket.io-adapter/node_modules/ws": {
-            "version": "8.18.3",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
-            "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=10.0.0"
-            },
-            "peerDependencies": {
-                "bufferutil": "^4.0.1",
-                "utf-8-validate": ">=5.0.2"
-            },
-            "peerDependenciesMeta": {
-                "bufferutil": {
-                    "optional": true
-                },
-                "utf-8-validate": {
-                    "optional": true
-                }
             }
         },
         "node_modules/socket.io-parser": {

server/db/pg/schema/schema.ts

@@ -262,16 +262,20 @@ export const resourceAiModels = pgTable(
     (t) => [primaryKey({ columns: [t.resourceId, t.modelId] })]
 );
 
-export const labels = pgTable("labels", {
+export const labels = pgTable(
-    labelId: serial("labelId").primaryKey(),
+    "labels",
-    name: varchar("name").notNull(),
+    {
-    color: varchar("color").notNull(),
+        labelId: serial("labelId").primaryKey(),
-    orgId: varchar("orgId")
+        name: varchar("name").notNull(),
-        .references(() => orgs.orgId, {
+        color: varchar("color").notNull(),
-            onDelete: "cascade"
+        orgId: varchar("orgId")
-        })
+            .references(() => orgs.orgId, {
-        .notNull()
+                onDelete: "cascade"
-});
+            })
+            .notNull()
+    },
+    (t) => [index("idx_labels_orgid").on(t.orgId)]
+);
 
 export const launcherViews = pgTable("launcherViews", {
     viewId: serial("viewId").primaryKey(),
@@ -693,15 +697,19 @@ export const twoFactorBackupCodes = pgTable("twoFactorBackupCodes", {
     codeHash: varchar("codeHash").notNull()
 });
 
-export const sessions = pgTable("session", {
+export const sessions = pgTable(
-    sessionId: varchar("id").primaryKey(),
+    "session",
-    userId: varchar("userId")
+    {
-        .notNull()
+        sessionId: varchar("id").primaryKey(),
-        .references(() => users.userId, { onDelete: "cascade" }),
+        userId: varchar("userId")
-    expiresAt: bigint("expiresAt", { mode: "number" }).notNull(),
+            .notNull()
-    issuedAt: bigint("issuedAt", { mode: "number" }),
+            .references(() => users.userId, { onDelete: "cascade" }),
-    deviceAuthUsed: boolean("deviceAuthUsed").notNull().default(false)
+        expiresAt: bigint("expiresAt", { mode: "number" }).notNull(),
-});
+        issuedAt: bigint("issuedAt", { mode: "number" }),
+        deviceAuthUsed: boolean("deviceAuthUsed").notNull().default(false)
+    },
+    (t) => [index("idx_sessions_userid").on(t.userId)]
+);
 
 export const newtSessions = pgTable("newtSession", {
     sessionId: varchar("id").primaryKey(),
@@ -711,19 +719,26 @@ export const newtSessions = pgTable("newtSession", {
     expiresAt: bigint("expiresAt", { mode: "number" }).notNull()
 });
 
-export const userOrgs = pgTable("userOrgs", {
+export const userOrgs = pgTable(
-    userId: varchar("userId")
+    "userOrgs",
-        .notNull()
+    {
-        .references(() => users.userId, { onDelete: "cascade" }),
+        userId: varchar("userId")
-    orgId: varchar("orgId")
+            .notNull()
-        .references(() => orgs.orgId, {
+            .references(() => users.userId, { onDelete: "cascade" }),
-            onDelete: "cascade"
+        orgId: varchar("orgId")
-        })
+            .references(() => orgs.orgId, {
-        .notNull(),
+                onDelete: "cascade"
-    isOwner: boolean("isOwner").notNull().default(false),
+            })
-    autoProvisioned: boolean("autoProvisioned").default(false),
+            .notNull(),
-    pamUsername: varchar("pamUsername") // cleaned username for ssh and such
+        isOwner: boolean("isOwner").notNull().default(false),
-});
+        autoProvisioned: boolean("autoProvisioned").default(false),
+        pamUsername: varchar("pamUsername") // cleaned username for ssh and such
+    },
+    (t) => [
+        index("idx_userOrgs_userid").on(t.userId),
+        index("idx_userOrgs_orgid").on(t.orgId)
+    ]
+);
 
 export const emailVerificationCodes = pgTable("emailVerificationCodes", {
     codeId: serial("id").primaryKey(),
@@ -751,22 +766,26 @@ export const actions = pgTable("actions", {
     description: varchar("description")
 });
 
-export const roles = pgTable("roles", {
+export const roles = pgTable(
-    roleId: serial("roleId").primaryKey(),
+    "roles",
-    orgId: varchar("orgId")
+    {
-        .references(() => orgs.orgId, {
+        roleId: serial("roleId").primaryKey(),
-            onDelete: "cascade"
+        orgId: varchar("orgId")
-        })
+            .references(() => orgs.orgId, {
-        .notNull(),
+                onDelete: "cascade"
-    isAdmin: boolean("isAdmin"),
+            })
-    name: varchar("name").notNull(),
+            .notNull(),
-    description: varchar("description"),
+        isAdmin: boolean("isAdmin"),
-    requireDeviceApproval: boolean("requireDeviceApproval").default(false),
+        name: varchar("name").notNull(),
-    sshSudoMode: varchar("sshSudoMode", { length: 32 }).default("full"), // "none" | "full" | "commands"
+        description: varchar("description"),
-    sshSudoCommands: text("sshSudoCommands").default("[]"),
+        requireDeviceApproval: boolean("requireDeviceApproval").default(false),
-    sshCreateHomeDir: boolean("sshCreateHomeDir").default(true),
+        sshSudoMode: varchar("sshSudoMode", { length: 32 }).default("full"), // "none" | "full" | "commands"
-    sshUnixGroups: text("sshUnixGroups").default("[]")
+        sshSudoCommands: text("sshSudoCommands").default("[]"),
-});
+        sshCreateHomeDir: boolean("sshCreateHomeDir").default(true),
+        sshUnixGroups: text("sshUnixGroups").default("[]")
+    },
+    (t) => [index("idx_roles_orgid").on(t.orgId)]
+);
 
 export const userOrgRoles = pgTable(
     "userOrgRoles",
@@ -1409,7 +1428,10 @@ export const olms = pgTable(
         }),
         archived: boolean("archived").notNull().default(false)
     },
-    (t) => [index("idx_olms_clientid").on(t.clientId)]
+    (t) => [
+        index("idx_olms_clientid").on(t.clientId),
+        index("idx_olms_userid").on(t.userId)
+    ]
 );
 
 export const currentFingerprint = pgTable("currentFingerprint", {

server/db/sqlite/schema/schema.ts

@@ -99,131 +99,147 @@ export const orgDomains = sqliteTable("orgDomains", {
         .references(() => domains.domainId, { onDelete: "cascade" })
 });
 
-export const sites = sqliteTable("sites", {
+export const sites = sqliteTable(
-    siteId: integer("siteId").primaryKey({ autoIncrement: true }),
+    "sites",
-    orgId: text("orgId")
+    {
-        .references(() => orgs.orgId, {
+        siteId: integer("siteId").primaryKey({ autoIncrement: true }),
-            onDelete: "cascade"
+        orgId: text("orgId")
-        })
+            .references(() => orgs.orgId, {
-        .notNull(),
+                onDelete: "cascade"
-    niceId: text("niceId").notNull(),
+            })
-    exitNodeId: integer("exitNode").references(() => exitNodes.exitNodeId, {
+            .notNull(),
-        onDelete: "set null"
+        niceId: text("niceId").notNull(),
-    }),
+        exitNodeId: integer("exitNode").references(() => exitNodes.exitNodeId, {
-    networkId: integer("networkId").references(() => networks.networkId, {
+            onDelete: "set null"
-        onDelete: "set null"
+        }),
-    }),
+        networkId: integer("networkId").references(() => networks.networkId, {
-    name: text("name").notNull(),
+            onDelete: "set null"
-    pubKey: text("pubKey"),
+        }),
-    exitNodeSubnet: text("exitNodeSubnet"),
+        name: text("name").notNull(),
-    megabytesIn: integer("bytesIn").default(0),
+        pubKey: text("pubKey"),
-    megabytesOut: integer("bytesOut").default(0),
+        exitNodeSubnet: text("exitNodeSubnet"),
-    lastBandwidthUpdate: text("lastBandwidthUpdate"),
+        megabytesIn: integer("bytesIn").default(0),
-    type: text("type").notNull(), // "newt" or "wireguard"
+        megabytesOut: integer("bytesOut").default(0),
-    online: integer("online", { mode: "boolean" }).notNull().default(false),
+        lastBandwidthUpdate: text("lastBandwidthUpdate"),
-    lastPing: integer("lastPing"),
+        type: text("type").notNull(), // "newt" or "wireguard"
+        online: integer("online", { mode: "boolean" }).notNull().default(false),
+        lastPing: integer("lastPing"),
 
-    // exit node stuff that is how to connect to the site when it has a wg server
+        // exit node stuff that is how to connect to the site when it has a wg server
-    address: text("address"), // this is the address of the wireguard interface in newt
+        address: text("address"), // this is the address of the wireguard interface in newt
-    endpoint: text("endpoint"), // this is how to reach gerbil externally - gets put into the wireguard config
+        endpoint: text("endpoint"), // this is how to reach gerbil externally - gets put into the wireguard config
-    localEndpoints: text("localEndpoints"), // JSON encoded list of string ips on the local machine to try to connect to
+        localEndpoints: text("localEndpoints"), // JSON encoded list of string ips on the local machine to try to connect to
-    publicKey: text("publicKey"), // TODO: Fix typo in publicKey
+        publicKey: text("publicKey"), // TODO: Fix typo in publicKey
-    lastHolePunch: integer("lastHolePunch"),
+        lastHolePunch: integer("lastHolePunch"),
-    listenPort: integer("listenPort"),
+        listenPort: integer("listenPort"),
-    dockerSocketEnabled: integer("dockerSocketEnabled", { mode: "boolean" })
+        dockerSocketEnabled: integer("dockerSocketEnabled", { mode: "boolean" })
-        .notNull()
+            .notNull()
-        .default(true),
+            .default(true),
-    autoUpdateEnabled: integer("autoUpdateEnabled", { mode: "boolean" })
+        autoUpdateEnabled: integer("autoUpdateEnabled", { mode: "boolean" })
-        .notNull()
+            .notNull()
-        .default(false),
+            .default(false),
-    autoUpdateOverrideOrg: integer("autoUpdateOverrideOrg", {
+        autoUpdateOverrideOrg: integer("autoUpdateOverrideOrg", {
-        mode: "boolean"
+            mode: "boolean"
-    })
-        .notNull()
-        .default(false),
-    status: text("status").$type<"pending" | "approved">().default("approved")
-});
-
-export const resources = sqliteTable("resources", {
-    resourceId: integer("resourceId").primaryKey({ autoIncrement: true }),
-    resourcePolicyId: integer("resourcePolicyId").references(
-        () => resourcePolicies.resourcePolicyId,
-        { onDelete: "set null" }
-    ),
-    defaultResourcePolicyId: integer("defaultResourcePolicyId").references(
-        () => resourcePolicies.resourcePolicyId,
-        {
-            onDelete: "restrict"
-        }
-    ),
-    resourceGuid: text("resourceGuid", { length: 36 })
-        .unique()
-        .notNull()
-        .$defaultFn(() => randomUUID()),
-    orgId: text("orgId")
-        .references(() => orgs.orgId, {
-            onDelete: "cascade"
         })
-        .notNull(),
+            .notNull()
-    niceId: text("niceId").notNull(),
+            .default(false),
-    name: text("name").notNull(),
+        status: text("status")
-    subdomain: text("subdomain"),
+            .$type<"pending" | "approved">()
-    fullDomain: text("fullDomain"),
+            .default("approved")
-    domainId: text("domainId").references(() => domains.domainId, {
+    },
-        onDelete: "set null"
+    (table) => [
-    }),
+        index("idx_sites_orgId").on(table.orgId)
-    ssl: integer("ssl", { mode: "boolean" }).notNull().default(false),
+    ]
-    blockAccess: integer("blockAccess", { mode: "boolean" })
+);
-        .notNull()
+
-        .default(false),
+export const resources = sqliteTable(
-    proxyPort: integer("proxyPort"),
+    "resources",
-    sso: integer("sso", { mode: "boolean" }),
+    {
-    emailWhitelistEnabled: integer("emailWhitelistEnabled", {
+        resourceId: integer("resourceId").primaryKey({ autoIncrement: true }),
-        mode: "boolean"
+        resourcePolicyId: integer("resourcePolicyId").references(
-    }),
+            () => resourcePolicies.resourcePolicyId,
-    applyRules: integer("applyRules", { mode: "boolean" }),
+            { onDelete: "set null" }
-    enabled: integer("enabled", { mode: "boolean" }).notNull().default(true),
+        ),
-    stickySession: integer("stickySession", { mode: "boolean" })
+        defaultResourcePolicyId: integer("defaultResourcePolicyId").references(
-        .notNull()
+            () => resourcePolicies.resourcePolicyId,
-        .default(false),
+            {
-    tlsServerName: text("tlsServerName"),
+                onDelete: "restrict"
-    setHostHeader: text("setHostHeader"),
+            }
-    enableProxy: integer("enableProxy", { mode: "boolean" }).default(true),
+        ),
-    skipToIdpId: integer("skipToIdpId").references(() => idp.idpId, {
+        resourceGuid: text("resourceGuid", { length: 36 })
-        onDelete: "set null"
+            .unique()
-    }),
+            .notNull()
-    headers: text("headers"), // comma-separated list of headers to add to the request
+            .$defaultFn(() => randomUUID()),
-    proxyProtocol: integer("proxyProtocol", { mode: "boolean" })
+        orgId: text("orgId")
-        .notNull()
+            .references(() => orgs.orgId, {
-        .default(false),
+                onDelete: "cascade"
-    proxyProtocolVersion: integer("proxyProtocolVersion").default(1),
+            })
-    maintenanceModeEnabled: integer("maintenanceModeEnabled", {
+            .notNull(),
-        mode: "boolean"
+        niceId: text("niceId").notNull(),
-    })
+        name: text("name").notNull(),
-        .notNull()
+        subdomain: text("subdomain"),
-        .default(false),
+        fullDomain: text("fullDomain"),
-    maintenanceModeType: text("maintenanceModeType", {
+        domainId: text("domainId").references(() => domains.domainId, {
-        enum: ["forced", "automatic"]
+            onDelete: "set null"
-    }).default("forced"), // "forced" = always show, "automatic" = only when down
+        }),
-    maintenanceTitle: text("maintenanceTitle"),
+        ssl: integer("ssl", { mode: "boolean" }).notNull().default(false),
-    maintenanceMessage: text("maintenanceMessage"),
+        blockAccess: integer("blockAccess", { mode: "boolean" })
-    maintenanceEstimatedTime: text("maintenanceEstimatedTime"),
+            .notNull()
-    postAuthPath: text("postAuthPath"),
+            .default(false),
-    health: text("health").default("unknown"), // "healthy", "unhealthy", "unknown"
+        proxyPort: integer("proxyPort"),
-    wildcard: integer("wildcard", { mode: "boolean" }).notNull().default(false),
+        sso: integer("sso", { mode: "boolean" }),
-    mode: text("mode")
+        emailWhitelistEnabled: integer("emailWhitelistEnabled", {
-        .default("http")
+            mode: "boolean"
-        .$type<"rdp" | "ssh" | "http" | "vnc" | "inference" | "tcp" | "udp">()
+        }),
-        .notNull(), // rdp, ssh, http, vnc, inference
+        applyRules: integer("applyRules", { mode: "boolean" }),
-    pamMode: text("pamMode")
+        enabled: integer("enabled", { mode: "boolean" }).notNull().default(true),
-        .$type<"passthrough" | "push">()
+        stickySession: integer("stickySession", { mode: "boolean" })
-        .default("passthrough"),
+            .notNull()
-    authDaemonMode: text("authDaemonMode")
+            .default(false),
-        .$type<"site" | "remote" | "native">()
+        tlsServerName: text("tlsServerName"),
-        .default("site"),
+        setHostHeader: text("setHostHeader"),
-    authDaemonPort: integer("authDaemonPort").default(22123),
+        enableProxy: integer("enableProxy", { mode: "boolean" }).default(true),
-    status: text("status").$type<"pending" | "approved">().default("approved")
+        skipToIdpId: integer("skipToIdpId").references(() => idp.idpId, {
-});
+            onDelete: "set null"
+        }),
+        headers: text("headers"), // comma-separated list of headers to add to the request
+        proxyProtocol: integer("proxyProtocol", { mode: "boolean" })
+            .notNull()
+            .default(false),
+        proxyProtocolVersion: integer("proxyProtocolVersion").default(1),
+        maintenanceModeEnabled: integer("maintenanceModeEnabled", {
+            mode: "boolean"
+        })
+            .notNull()
+            .default(false),
+        maintenanceModeType: text("maintenanceModeType", {
+            enum: ["forced", "automatic"]
+        }).default("forced"), // "forced" = always show, "automatic" = only when down
+        maintenanceTitle: text("maintenanceTitle"),
+        maintenanceMessage: text("maintenanceMessage"),
+        maintenanceEstimatedTime: text("maintenanceEstimatedTime"),
+        postAuthPath: text("postAuthPath"),
+        health: text("health").default("unknown"), // "healthy", "unhealthy", "unknown"
+        wildcard: integer("wildcard", { mode: "boolean" }).notNull().default(false),
+        mode: text("mode")
+            .default("http")
+            .$type<"rdp" | "ssh" | "http" | "vnc" | "inference" | "tcp" | "udp">()
+            .notNull(), // rdp, ssh, http, vnc, inference
+        pamMode: text("pamMode")
+            .$type<"passthrough" | "push">()
+            .default("passthrough"),
+        authDaemonMode: text("authDaemonMode")
+            .$type<"site" | "remote" | "native">()
+            .default("site"),
+        authDaemonPort: integer("authDaemonPort").default(22123),
+        status: text("status")
+            .$type<"pending" | "approved">()
+            .default("approved")
+    },
+    (table) => [
+        index("idx_resources_orgId").on(table.orgId)
+    ]
+);
 
 export const resourceAiProviders = sqliteTable(
     "resourceAiProviders",
@@ -260,16 +276,22 @@ export const resourceAiModels = sqliteTable(
     (t) => [primaryKey({ columns: [t.resourceId, t.modelId] })]
 );
 
-export const labels = sqliteTable("labels", {
+export const labels = sqliteTable(
-    labelId: integer("labelId").primaryKey({ autoIncrement: true }),
+    "labels",
-    name: text("name").notNull(),
+    {
-    color: text("color").notNull(),
+        labelId: integer("labelId").primaryKey({ autoIncrement: true }),
-    orgId: text("orgId")
+        name: text("name").notNull(),
-        .references(() => orgs.orgId, {
+        color: text("color").notNull(),
-            onDelete: "cascade"
+        orgId: text("orgId")
-        })
+            .references(() => orgs.orgId, {
-        .notNull()
+                onDelete: "cascade"
-});
+            })
+            .notNull()
+    },
+    (table) => [
+        index("idx_labels_orgId").on(table.orgId)
+    ]
+);
 
 export const launcherViews = sqliteTable("launcherViews", {
     viewId: integer("viewId").primaryKey({ autoIncrement: true }),
@@ -366,35 +388,44 @@ export const clientLabels = sqliteTable(
     (t) => [unique("client_label_uniq").on(t.clientId, t.labelId)]
 );
 
-export const targets = sqliteTable("targets", {
+export const targets = sqliteTable(
-    targetId: integer("targetId").primaryKey({ autoIncrement: true }),
+    "targets",
-    resourceId: integer("resourceId").references(() => resources.resourceId, {
+    {
-        onDelete: "cascade"
+        targetId: integer("targetId").primaryKey({ autoIncrement: true }),
-    }),
+        resourceId: integer("resourceId").references(
-    providerId: integer("providerId").references(() => aiProviders.providerId, {
+            () => resources.resourceId,
-        onDelete: "cascade"
+            { onDelete: "cascade" }
-    }),
+        ),
-    siteId: integer("siteId")
+        providerId: integer("providerId").references(
-        .references(() => sites.siteId, {
+            () => aiProviders.providerId,
-            onDelete: "cascade"
+            { onDelete: "cascade" }
-        })
+        ),
-        .notNull(),
+        siteId: integer("siteId")
-    ip: text("ip").notNull(),
+            .references(() => sites.siteId, {
-    method: text("method"),
+                onDelete: "cascade"
-    port: integer("port").notNull(),
+            })
-    internalPort: integer("internalPort"),
+            .notNull(),
-    enabled: integer("enabled", { mode: "boolean" }).notNull().default(true),
+        ip: text("ip").notNull(),
-    path: text("path"),
+        method: text("method"),
-    pathMatchType: text("pathMatchType"), // exact, prefix, regex
+        port: integer("port").notNull(),
-    rewritePath: text("rewritePath"), // if set, rewrites the path to this value before sending to the target
+        internalPort: integer("internalPort"),
-    rewritePathType: text("rewritePathType"), // exact, prefix, regex, stripPrefix
+        enabled: integer("enabled", { mode: "boolean" }).notNull().default(true),
-    priority: integer("priority").notNull().default(100),
+        path: text("path"),
-    mode: text("mode")
+        pathMatchType: text("pathMatchType"), // exact, prefix, regex
-        .$type<"http" | "tcp" | "udp" | "ssh" | "rdp" | "vnc">()
+        rewritePath: text("rewritePath"), // if set, rewrites the path to this value before sending to the target
-        .notNull()
+        rewritePathType: text("rewritePathType"), // exact, prefix, regex, stripPrefix
-        .default("http"),
+        priority: integer("priority").notNull().default(100),
-    authToken: text("authToken")
+        mode: text("mode")
-});
+            .$type<"http" | "tcp" | "udp" | "ssh" | "rdp" | "vnc">()
+            .notNull()
+            .default("http"),
+        authToken: text("authToken")
+    },
+    (table) => [
+        index("idx_targets_resourceId").on(table.resourceId),
+        index("idx_targets_siteId").on(table.siteId)
+    ]
+);
 
 export const targetHealthCheck = sqliteTable("targetHealthCheck", {
     targetHealthCheckId: integer("targetHealthCheckId").primaryKey({
@@ -663,50 +694,63 @@ export const setupTokens = sqliteTable("setupTokens", {
     dateUsed: text("dateUsed")
 });
 
-export const newts = sqliteTable("newt", {
+export const newts = sqliteTable(
-    newtId: text("id").primaryKey(),
+    "newt",
-    secretHash: text("secretHash").notNull(),
+    {
-    dateCreated: text("dateCreated").notNull(),
+        newtId: text("id").primaryKey(),
-    version: text("version"),
+        secretHash: text("secretHash").notNull(),
-    siteId: integer("siteId").references(() => sites.siteId, {
+        dateCreated: text("dateCreated").notNull(),
-        onDelete: "cascade"
+        version: text("version"),
-    })
+        siteId: integer("siteId").references(() => sites.siteId, {
-});
-
-export const clients = sqliteTable("clients", {
-    clientId: integer("clientId").primaryKey({ autoIncrement: true }),
-    orgId: text("orgId")
-        .references(() => orgs.orgId, {
             onDelete: "cascade"
         })
-        .notNull(),
+    },
-    exitNodeId: integer("exitNode").references(() => exitNodes.exitNodeId, {
+    (table) => [
-        onDelete: "set null"
+        index("idx_newts_siteId").on(table.siteId)
-    }),
+    ]
-    userId: text("userId").references(() => users.userId, {
+);
-        // optionally tied to a user and in this case delete when the user deletes
+
-        onDelete: "cascade"
+export const clients = sqliteTable(
-    }),
+    "clients",
-    niceId: text("niceId").notNull(),
+    {
-    name: text("name").notNull(),
+        clientId: integer("clientId").primaryKey({ autoIncrement: true }),
-    pubKey: text("pubKey"),
+        orgId: text("orgId")
-    olmId: text("olmId"), // to lock it to a specific olm optionally
+            .references(() => orgs.orgId, {
-    subnet: text("subnet").notNull(),
+                onDelete: "cascade"
-    exitNodeSubnet: text("exitNodeSubnet"), // this is the subnet when connecting to an exit node
+            })
-    megabytesIn: integer("bytesIn"),
+            .notNull(),
-    megabytesOut: integer("bytesOut"),
+        exitNodeId: integer("exitNode").references(() => exitNodes.exitNodeId, {
-    lastBandwidthUpdate: text("lastBandwidthUpdate"),
+            onDelete: "set null"
-    lastPing: integer("lastPing"),
+        }),
-    type: text("type").notNull(), // "olm"
+        userId: text("userId").references(() => users.userId, {
-    online: integer("online", { mode: "boolean" }).notNull().default(false),
+            // optionally tied to a user and in this case delete when the user deletes
-    // endpoint: text("endpoint"),
+            onDelete: "cascade"
-    lastHolePunch: integer("lastHolePunch"),
+        }),
-    archived: integer("archived", { mode: "boolean" }).notNull().default(false),
+        niceId: text("niceId").notNull(),
-    blocked: integer("blocked", { mode: "boolean" }).notNull().default(false),
+        name: text("name").notNull(),
-    approvalState: text("approvalState").$type<
+        pubKey: text("pubKey"),
-        "pending" | "approved" | "denied"
+        olmId: text("olmId"), // to lock it to a specific olm optionally
-    >()
+        subnet: text("subnet").notNull(),
-});
+        exitNodeSubnet: text("exitNodeSubnet"), // this is the subnet when connecting to an exit node
+        megabytesIn: integer("bytesIn"),
+        megabytesOut: integer("bytesOut"),
+        lastBandwidthUpdate: text("lastBandwidthUpdate"),
+        lastPing: integer("lastPing"),
+        type: text("type").notNull(), // "olm"
+        online: integer("online", { mode: "boolean" }).notNull().default(false),
+        // endpoint: text("endpoint"),
+        lastHolePunch: integer("lastHolePunch"),
+        archived: integer("archived", { mode: "boolean" }).notNull().default(false),
+        blocked: integer("blocked", { mode: "boolean" }).notNull().default(false),
+        approvalState: text("approvalState").$type<
+            "pending" | "approved" | "denied"
+        >()
+    },
+    (table) => [
+        index("idx_clients_orgId").on(table.orgId),
+        index("idx_clients_userId").on(table.userId)
+    ]
+);
 
 export const clientSitesAssociationsCache = sqliteTable(
     "clientSitesAssociationsCache",
@@ -734,23 +778,29 @@ export const clientSiteResourcesAssociationsCache = sqliteTable(
     }
 );
 
-export const olms = sqliteTable("olms", {
+export const olms = sqliteTable(
-    olmId: text("id").primaryKey(),
+    "olms",
-    secretHash: text("secretHash").notNull(),
+    {
-    dateCreated: text("dateCreated").notNull(),
+        olmId: text("id").primaryKey(),
-    version: text("version"),
+        secretHash: text("secretHash").notNull(),
-    agent: text("agent"),
+        dateCreated: text("dateCreated").notNull(),
-    name: text("name"),
+        version: text("version"),
-    clientId: integer("clientId").references(() => clients.clientId, {
+        agent: text("agent"),
-        // we will switch this depending on the current org it wants to connect to
+        name: text("name"),
-        onDelete: "set null"
+        clientId: integer("clientId").references(() => clients.clientId, {
-    }),
+            // we will switch this depending on the current org it wants to connect to
-    userId: text("userId").references(() => users.userId, {
+            onDelete: "set null"
-        // optionally tied to a user and in this case delete when the user deletes
+        }),
-        onDelete: "cascade"
+        userId: text("userId").references(() => users.userId, {
-    }),
+            // optionally tied to a user and in this case delete when the user deletes
-    archived: integer("archived", { mode: "boolean" }).notNull().default(false)
+            onDelete: "cascade"
-});
+        }),
+        archived: integer("archived", { mode: "boolean" }).notNull().default(false)
+    },
+    (table) => [
+        index("idx_olms_userId").on(table.userId)
+    ]
+);
 
 export const currentFingerprint = sqliteTable("currentFingerprint", {
     fingerprintId: integer("id").primaryKey({ autoIncrement: true }),
@@ -912,17 +962,23 @@ export const twoFactorBackupCodes = sqliteTable("twoFactorBackupCodes", {
     codeHash: text("codeHash").notNull()
 });
 
-export const sessions = sqliteTable("session", {
+export const sessions = sqliteTable(
-    sessionId: text("id").primaryKey(),
+    "session",
-    userId: text("userId")
+    {
-        .notNull()
+        sessionId: text("id").primaryKey(),
-        .references(() => users.userId, { onDelete: "cascade" }),
+        userId: text("userId")
-    expiresAt: integer("expiresAt").notNull(),
+            .notNull()
-    issuedAt: integer("issuedAt"),
+            .references(() => users.userId, { onDelete: "cascade" }),
-    deviceAuthUsed: integer("deviceAuthUsed", { mode: "boolean" })
+        expiresAt: integer("expiresAt").notNull(),
-        .notNull()
+        issuedAt: integer("issuedAt"),
-        .default(false)
+        deviceAuthUsed: integer("deviceAuthUsed", { mode: "boolean" })
-});
+            .notNull()
+            .default(false)
+    },
+    (table) => [
+        index("idx_sessions_userId").on(table.userId)
+    ]
+);
 
 export const newtSessions = sqliteTable("newtSession", {
     sessionId: text("id").primaryKey(),
@@ -940,21 +996,28 @@ export const olmSessions = sqliteTable("clientSession", {
     expiresAt: integer("expiresAt").notNull()
 });
 
-export const userOrgs = sqliteTable("userOrgs", {
+export const userOrgs = sqliteTable(
-    userId: text("userId")
+    "userOrgs",
-        .notNull()
+    {
-        .references(() => users.userId, { onDelete: "cascade" }),
+        userId: text("userId")
-    orgId: text("orgId")
+            .notNull()
-        .references(() => orgs.orgId, {
+            .references(() => users.userId, { onDelete: "cascade" }),
-            onDelete: "cascade"
+        orgId: text("orgId")
-        })
+            .references(() => orgs.orgId, {
-        .notNull(),
+                onDelete: "cascade"
-    isOwner: integer("isOwner", { mode: "boolean" }).notNull().default(false),
+            })
-    autoProvisioned: integer("autoProvisioned", {
+            .notNull(),
-        mode: "boolean"
+        isOwner: integer("isOwner", { mode: "boolean" }).notNull().default(false),
-    }).default(false),
+        autoProvisioned: integer("autoProvisioned", {
-    pamUsername: text("pamUsername") // cleaned username for ssh and such
+            mode: "boolean"
-});
+        }).default(false),
+        pamUsername: text("pamUsername") // cleaned username for ssh and such
+    },
+    (table) => [
+        index("idx_userOrgs_userId").on(table.userId),
+        index("idx_userOrgs_orgId").on(table.orgId)
+    ]
+);
 
 export const emailVerificationCodes = sqliteTable("emailVerificationCodes", {
     codeId: integer("id").primaryKey({ autoIncrement: true }),
@@ -982,26 +1045,32 @@ export const actions = sqliteTable("actions", {
     description: text("description")
 });
 
-export const roles = sqliteTable("roles", {
+export const roles = sqliteTable(
-    roleId: integer("roleId").primaryKey({ autoIncrement: true }),
+    "roles",
-    orgId: text("orgId")
+    {
-        .references(() => orgs.orgId, {
+        roleId: integer("roleId").primaryKey({ autoIncrement: true }),
-            onDelete: "cascade"
+        orgId: text("orgId")
-        })
+            .references(() => orgs.orgId, {
-        .notNull(),
+                onDelete: "cascade"
-    isAdmin: integer("isAdmin", { mode: "boolean" }),
+            })
-    name: text("name").notNull(),
+            .notNull(),
-    description: text("description"),
+        isAdmin: integer("isAdmin", { mode: "boolean" }),
-    requireDeviceApproval: integer("requireDeviceApproval", {
+        name: text("name").notNull(),
-        mode: "boolean"
+        description: text("description"),
-    }).default(false),
+        requireDeviceApproval: integer("requireDeviceApproval", {
-    sshSudoMode: text("sshSudoMode").default("full"), // "none" | "full" | "commands"
+            mode: "boolean"
-    sshSudoCommands: text("sshSudoCommands").default("[]"),
+        }).default(false),
-    sshCreateHomeDir: integer("sshCreateHomeDir", { mode: "boolean" }).default(
+        sshSudoMode: text("sshSudoMode").default("full"), // "none" | "full" | "commands"
-        true
+        sshSudoCommands: text("sshSudoCommands").default("[]"),
-    ),
+        sshCreateHomeDir: integer("sshCreateHomeDir", { mode: "boolean" }).default(
-    sshUnixGroups: text("sshUnixGroups").default("[]")
+            true
-});
+        ),
+        sshUnixGroups: text("sshUnixGroups").default("[]")
+    },
+    (table) => [
+        index("idx_roles_orgId").on(table.orgId)
+    ]
+);
 
 export const userOrgRoles = sqliteTable(
     "userOrgRoles",

server/lib/blueprints/types.ts

@@ -101,7 +101,7 @@ export const AuthSchema = z.object({
 export const RuleSchema = z
     .object({
         action: z.enum(["allow", "deny", "pass"]),
-        match: z.enum(["cidr", "path", "ip", "country", "asn", "region"]),
+        match: z.enum(["cidr", "path", "ip", "country", "country_is_not", "asn", "region"]),
         value: z.coerce.string(),
         priority: z.int().optional(),
         enabled: z.boolean().optional().default(true)
@@ -136,7 +136,7 @@ export const RuleSchema = z
     )
     .refine(
         (rule) => {
-            if (rule.match === "country") {
+            if (rule.match === "country" || rule.match === "country_is_not") {
                 if (!hasMaxmindCountryDb) {
                     return false;
                 }

server/lib/domainUtils.ts

@@ -31,7 +31,6 @@ export async function validateAndConstructDomain(
     subdomain?: string | null
 ): Promise<DomainValidationResult> {
     try {
-        // Query domain with organization access check
         const [domainRes] = await db
             .select()
             .from(domains)
@@ -42,6 +41,10 @@ export async function validateAndConstructDomain(
                     eq(orgDomains.orgId, orgId),
                     eq(orgDomains.domainId, domainId)
                 )
+            )
+            .leftJoin(
+                domainNamespaces,
+                eq(domainNamespaces.domainId, domainId)
             );
 
         // Check if domain exists
@@ -52,7 +55,7 @@ export async function validateAndConstructDomain(
             };
         }
 
-        if (!domainRes.orgDomains) {
+        if (!domainRes.orgDomains && !domainRes.domainNamespaces) {
             return {
                 success: false,
                 error: `Organization does not have access to domain with ID ${domainId}`
@@ -83,19 +86,11 @@ export async function validateAndConstructDomain(
         }
 
         // Wildcard subdomains are not allowed on namespace (provided/free) domains
-        if (isWildcard) {
+        if (isWildcard && domainRes.domainNamespaces) {
-            const [namespaceDomain] = await db
+            return {
-                .select()
+                success: false,
-                .from(domainNamespaces)
+                error: "Wildcard subdomains are not supported for provided or free domains. Use a specific subdomain instead."
-                .where(eq(domainNamespaces.domainId, domainId))
+            };
-                .limit(1);
-
-            if (namespaceDomain) {
-                return {
-                    success: false,
-                    error: "Wildcard subdomains are not supported for provided or free domains. Use a specific subdomain instead."
-                };
-            }
         }
 
         if (

server/lib/telemetry.ts

@@ -3,6 +3,8 @@ import config from "./config";
 import { getHostMeta } from "./hostMeta";
 import logger from "@server/logger";
 import {
+    aiProviders,
+    aiUsageRecords,
     alertRules,
     apiKeys,
     blueprints,
@@ -11,7 +13,16 @@ import {
     siteResources
 } from "@server/db";
 import { sites, users, orgs, resources, clients, idp } from "@server/db";
-import { eq, count, notInArray, and, isNotNull, isNull } from "drizzle-orm";
+import {
+    eq,
+    count,
+    countDistinct,
+    notInArray,
+    and,
+    isNotNull,
+    isNull,
+    gte
+} from "drizzle-orm";
 import { APP_VERSION } from "./consts";
 import crypto from "crypto";
 import { UserType } from "@server/types/UserTypes";
@@ -172,6 +183,25 @@ class TelemetryClient {
                 .select({ count: count() })
                 .from(blueprints);
 
+            const [aiProvidersCount] = await db
+                .select({ count: count() })
+                .from(aiProviders);
+            const [orgsWithAiProviders] = await db
+                .select({ count: countDistinct(aiProviders.orgId) })
+                .from(aiProviders);
+
+            const usageWindowStart =
+                Math.floor(Date.now() / 1000) -
+                this.collectionIntervalDays * 24 * 60 * 60;
+            const [aiUsageRecordsRecent] = await db
+                .select({ count: count() })
+                .from(aiUsageRecords)
+                .where(gte(aiUsageRecords.createdAt, usageWindowStart));
+            const [orgsWithRecentAiUsage] = await db
+                .select({ count: countDistinct(aiUsageRecords.orgId) })
+                .from(aiUsageRecords)
+                .where(gte(aiUsageRecords.createdAt, usageWindowStart));
+
             const supporterKey = config.getSupporterData();
 
             const allPrivateResources = await db.select().from(siteResources);
@@ -182,6 +212,7 @@ class TelemetryClient {
             let numPrivResourceCidr = 0;
             let numPrivResourceHttp = 0;
             let numPrivResourceSsh = 0;
+            let numPrivResourceInference = 0;
             for (const res of allPrivateResources) {
                 if (res.mode === "host") {
                     numPrivResourceHosts += 1;
@@ -191,6 +222,8 @@ class TelemetryClient {
                     numPrivResourceHttp += 1;
                 } else if (res.mode === "ssh") {
                     numPrivResourceSsh += 1;
+                } else if (res.mode === "inference") {
+                    numPrivResourceInference += 1;
                 }
 
                 if (res.alias) {
@@ -211,6 +244,11 @@ class TelemetryClient {
                 numPrivateResourceCidr: numPrivResourceCidr,
                 numPrivateResourceHttp: numPrivResourceHttp,
                 numPrivateResourceSsh: numPrivResourceSsh,
+                numPrivateResourceInference: numPrivResourceInference,
+                numAiProviders: aiProvidersCount.count,
+                numOrgsWithAiProviders: orgsWithAiProviders.count,
+                numAiUsageRecordsRecent: aiUsageRecordsRecent.count,
+                numOrgsWithRecentAiUsage: orgsWithRecentAiUsage.count,
                 numAlertRules: numAlertRules.count,
                 numUserDevices: userDevicesCount.count,
                 numMachineClients: machineClients.count,
@@ -323,6 +361,17 @@ class TelemetryClient {
                     num_resources_non_http: stats.resources.filter(
                         (r) => r.mode !== "http"
                     ).length,
+                    num_resources_ai_gateway: stats.resources.filter(
+                        (r) => r.mode === "inference"
+                    ).length,
+                    num_private_resources_ai_gateway:
+                        stats.numPrivateResourceInference,
+                    num_ai_providers: stats.numAiProviders,
+                    num_orgs_with_ai_providers: stats.numOrgsWithAiProviders,
+                    num_ai_usage_records_recent:
+                        stats.numAiUsageRecordsRecent,
+                    num_orgs_with_recent_ai_usage:
+                        stats.numOrgsWithRecentAiUsage,
                     num_newt_sites: stats.sites.filter((s) => s.type === "newt")
                         .length,
                     num_local_sites: stats.sites.filter(

server/middlewares/integration/verifyAccessTokenAccess.ts

@@ -68,6 +68,11 @@ export async function verifyApiKeyAccessTokenAccess(
             );
         }
 
+        if (apiKey.isRoot) {
+            // Root keys can access any access token in any org
+            return next();
+        }
+
         if (!resource.orgId) {
             return next(
                 createHttpError(

server/private/license/license.ts

@@ -149,12 +149,8 @@ LQIDAQAB
         }
 
         // Count used sites and users for license comparison
-        const [siteCountRes] = await db
+        const [siteCountRes] = await db.select({ value: count() }).from(sites);
-            .select({ value: count() })
+        const [userCountRes] = await db.select({ value: count() }).from(users);
-            .from(sites);
-        const [userCountRes] = await db
-            .select({ value: count() })
-            .from(users);
 
         const status: LicenseStatus = {
             hostId: this.hostMeta.hostMetaId,
@@ -276,10 +272,13 @@ LQIDAQAB
                         logger.error(
                             `Allowing failure. Will retry one more time at next run interval.`
                         );
-                        // return last known good status
+                        // Fall back to last known good status if we have
-                        return this.statusCache.get(
+                        // one cached; otherwise return the freshly built
+                        // status (with defaults) rather than undefined.
+                        const lastKnownStatus = this.statusCache.get(
                             this.statusKey
-                        ) as LicenseStatus;
+                        ) as LicenseStatus | undefined;
+                        return lastKnownStatus ?? status;
                     } else {
                         // Subsequent failures: fail abruptly
                         throw e;
@@ -368,10 +367,7 @@ LQIDAQAB
                 }
 
                 // Only consider quantity if defined and >= 0 (quantity = users, quantity_2 = sites)
-                if (
+                if (cached.quantity_2 !== undefined && cached.quantity_2 >= 0) {
-                    cached.quantity_2 !== undefined &&
-                    cached.quantity_2 >= 0
-                ) {
                     status.maxSites =
                         (status.maxSites ?? 0) + cached.quantity_2;
                 }
@@ -561,7 +557,7 @@ LQIDAQAB
                     // Calculate exponential backoff delay
                     const retryDelay = Math.floor(
                         initialRetryDelay *
-                        Math.pow(exponentialFactor, attempt - 1)
+                            Math.pow(exponentialFactor, attempt - 1)
                     );
 
                     logger.debug(

server/private/routers/auditLogs/queryAccessAuditLog.ts

@@ -88,7 +88,27 @@ export const queryAccessAuditLogsQuery = z.object({
         .optional()
         .default("0")
         .transform(Number)
-        .pipe(z.int().nonnegative())
+        .pipe(z.int().nonnegative()),
+    ip: z
+        .preprocess((val) => {
+            if (val === undefined || val === null || val === "") {
+                return undefined;
+            }
+            if (Array.isArray(val)) {
+                return val;
+            }
+            // the array is returned as this
+            if (typeof val === "string") {
+                return val.split(",");
+            }
+            return undefined;
+        }, z.array(z.string()))
+        .optional()
+        .catch([])
+        .openapi({
+            type: "array",
+            description: "Filter by IP adresses"
+        })
 });
 
 export const queryAccessAuditLogsParams = z.object({
@@ -134,6 +154,9 @@ function getWhere(data: Q) {
         data.type ? eq(accessAuditLog.type, data.type) : undefined,
         data.action !== undefined
             ? eq(accessAuditLog.action, data.action)
+            : undefined,
+        data.ip && data.ip.length > 0
+            ? inArray(accessAuditLog.ip, data.ip)
             : undefined
     );
 }

server/private/routers/ws/messageHandlers.ts

@@ -16,12 +16,10 @@ import {
     handleRemoteExitNodePingMessage
 } from "#private/routers/remoteExitNode";
 import { MessageHandler } from "@server/routers/ws";
-import {
+import { handleConnectionLogMessage } from "#private/routers/newt";
-    handleConnectionLogMessage,
-} from "#private/routers/newt";
 
 export const messageHandlers: Record<string, MessageHandler> = {
     "remoteExitNode/register": handleRemoteExitNodeRegisterMessage,
     "remoteExitNode/ping": handleRemoteExitNodePingMessage,
-    "newt/access-log": handleConnectionLogMessage,
+    "newt/access-log": handleConnectionLogMessage
 };

server/routers/auditLogs/queryRequestAuditLog.ts

@@ -81,7 +81,27 @@ export const queryAccessAuditLogsQuery = z.strictObject({
         .optional()
         .default("0")
         .transform(Number)
-        .pipe(z.int().nonnegative())
+        .pipe(z.int().nonnegative()),
+    ip: z
+        .preprocess((val) => {
+            if (val === undefined || val === null || val === "") {
+                return undefined;
+            }
+            if (Array.isArray(val)) {
+                return val;
+            }
+            // the array is returned as this
+            if (typeof val === "string") {
+                return val.split(",");
+            }
+            return undefined;
+        }, z.array(z.string()))
+        .optional()
+        .catch([])
+        .openapi({
+            type: "array",
+            description: "Filter by IP adresses"
+        })
 });
 
 export const queryRequestAuditLogsParams = z.object({
@@ -126,6 +146,9 @@ function getWhere(data: Q) {
         data.path ? eq(requestAuditLog.path, data.path) : undefined,
         data.action !== undefined
             ? eq(requestAuditLog.action, data.action)
+            : undefined,
+        data.ip && data.ip.length > 0
+            ? inArray(requestAuditLog.ip, data.ip)
             : undefined
     );
 }

server/routers/auth/securityKey.ts

@@ -533,18 +533,23 @@ export async function startAuthentication(
 
         // If email is provided, get security keys for that specific user
         if (email) {
-            const [user] = await db
+            const matchingUsers = await db
                 .select()
                 .from(users)
-                .where(eq(users.email, email))
+                .where(
-                .limit(1);
+                    and(
+                        eq(users.email, email.toLowerCase()),
+                        eq(users.type, UserType.Internal)
+                    )
+                );
 
-            if (!user || user.type !== UserType.Internal) {
+            if (matchingUsers.length !== 1) {
                 return next(
                     createHttpError(HttpCode.BAD_REQUEST, "Invalid credentials")
                 );
             }
 
+            const user = matchingUsers[0];
             userId = user.userId;
 
             const userSecurityKeys = await db

server/routers/auth/setServerAdmin.ts

@@ -42,54 +42,62 @@ export async function setServerAdmin(
 
         const { email, password, setupToken } = parsedBody.data;
 
-        // Validate setup token
-        const [validToken] = await db
-            .select()
-            .from(setupTokens)
-            .where(
-                and(
-                    eq(setupTokens.token, setupToken),
-                    eq(setupTokens.used, false)
-                )
-            );
-
-        if (!validToken) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Invalid or expired setup token"
-                )
-            );
-        }
-
-        const [existing] = await db
-            .select()
-            .from(users)
-            .where(eq(users.serverAdmin, true));
-
-        if (existing) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Server admin already exists"
-                )
-            );
-        }
-
         const passwordHash = await hashPassword(password);
         const userId = generateId(15);
 
         await db.transaction(async (trx) => {
-            // Mark the token as used
+            const consumed = await trx
-            await trx
                 .update(setupTokens)
                 .set({
                     used: true,
                     dateUsed: moment().toISOString()
                 })
-                .where(eq(setupTokens.tokenId, validToken.tokenId));
+                .where(
+                    and(
+                        eq(setupTokens.token, setupToken),
+                        eq(setupTokens.used, false)
+                    )
+                )
+                .returning({ tokenId: setupTokens.tokenId });
+
+            if (!consumed.length) {
+                throw createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    "Invalid setup token"
+                );
+            }
+
+            const [existingAdmin] = await trx
+                .select({ userId: users.userId })
+                .from(users)
+                .where(eq(users.serverAdmin, true))
+                .limit(1);
+
+            if (existingAdmin) {
+                throw createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    "Server admin already exists"
+                );
+            }
+
+            const [existingUser] = await trx
+                .select({ userId: users.userId })
+                .from(users)
+                .where(
+                    and(
+                        eq(users.email, email),
+                        eq(users.type, UserType.Internal)
+                    )
+                )
+                .limit(1);
+
+            if (existingUser) {
+                throw createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    "A user with that email address already exists"
+                );
+            }
 
-            // Create the server admin user
             await trx.insert(users).values({
                 userId: userId,
                 email: email,
@@ -111,6 +119,9 @@ export async function setServerAdmin(
             status: HttpCode.OK
         });
     } catch (e) {
+        if (createHttpError.isHttpError(e)) {
+            return next(e);
+        }
         logger.error(e);
         return next(
             createHttpError(

server/routers/auth/validateSetupToken.ts

@@ -48,7 +48,7 @@ export async function validateSetupToken(
             return response<ValidateSetupTokenResponse>(res, {
                 data: {
                     valid: false,
-                    message: "Invalid or expired setup token"
+                    message: "Invalid setup token"
                 },
                 success: true,
                 error: false,

src/app/[orgId]/settings/logs/access/page.tsx

@@ -12,6 +12,7 @@ import { DateTimeValue } from "@app/components/DateTimePicker";
 import { ArrowUpRight, Key, User } from "lucide-react";
 import Link from "next/link";
 import { ColumnFilterButton } from "@app/components/ColumnFilterButton";
+import { ColumnMultiFilterButton } from "@app/components/ColumnMultiFilterButton";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import { build } from "@server/build";
 import { getSevenDaysAgo } from "@app/lib/getSevenDaysAgo";
@@ -26,6 +27,7 @@ import { tierMatrix } from "@server/lib/billing/tierMatrix";
 import { logQueries } from "@app/lib/queries";
 import { useQuery } from "@tanstack/react-query";
 import type { QueryAccessAuditLogResponse } from "@server/routers/auditLogs/types";
+import { countryCodeToFlagEmoji } from "@app/lib/countryCodeToFlagEmoji";
 
 export default function GeneralPage() {
     const router = useRouter();
@@ -45,12 +47,14 @@ export default function GeneralPage() {
         resourceId?: string;
         location?: string;
         actor?: string;
+        ip?: string[];
     }>({
         action: searchParams.get("action") || undefined,
         type: searchParams.get("type") || undefined,
         resourceId: searchParams.get("resourceId") || undefined,
         location: searchParams.get("location") || undefined,
-        actor: searchParams.get("actor") || undefined
+        actor: searchParams.get("actor") || undefined,
+        ip: searchParams.getAll("ip") || undefined
     });
 
     const [currentPage, setCurrentPage] = useState<number>(0);
@@ -176,7 +180,7 @@ export default function GeneralPage() {
 
     const handleFilterChange = (
         filterType: keyof typeof filters,
-        value: string | undefined
+        value: string | string[] | undefined
     ) => {
         const newFilters = { ...filters, [filterType]: value };
         setFilters(newFilters);
@@ -194,10 +198,13 @@ export default function GeneralPage() {
     ) => {
         const params = new URLSearchParams(searchParams);
         Object.entries(newFilters).forEach(([key, value]) => {
-            if (value) {
+            params.delete(key);
+            if (typeof value === "string") {
                 params.set(key, value);
-            } else {
+            } else if (typeof value !== "undefined" && "length" in value) {
-                params.delete(key);
+                for (const element of value) {
+                    params.append(key, element);
+                }
             }
         });
         router.replace(`?${params.toString()}`, { scroll: false });
@@ -205,6 +212,7 @@ export default function GeneralPage() {
 
     const exportData = async () => {
         try {
+            const { ip, ...restFilters } = filters;
             const params: any = {
                 timeStart: dateRange.startDate?.date
                     ? new Date(dateRange.startDate.date).toISOString()
@@ -212,13 +220,20 @@ export default function GeneralPage() {
                 timeEnd: dateRange.endDate?.date
                     ? new Date(dateRange.endDate.date).toISOString()
                     : undefined,
-                ...filters
+                ...restFilters
             };
 
-            const response = await api.get(`/org/${orgId}/logs/access/export`, {
+            // axios serializes arrays as `ip[]=…`, which express's query
-                responseType: "blob",
+            // parser does not read back as `ip`, so pass them in the URL
-                params
+            const sp = new URLSearchParams((ip ?? []).map((ip) => ["ip", ip]));
-            });
+
+            const response = await api.get(
+                `/org/${orgId}/logs/access/export?${sp.toString()}`,
+                {
+                    responseType: "blob",
+                    params
+                }
+            );
 
             const url = window.URL.createObjectURL(new Blob([response.data]));
             const link = document.createElement("a");
@@ -297,7 +312,24 @@ export default function GeneralPage() {
         },
         {
             accessorKey: "ip",
-            header: () => <span className="px-2">{t("ip")}</span>,
+            header: () => (
+                <span className="px-2">
+                    <ColumnMultiFilterButton
+                        options={(filters.ip ?? []).map((ip) => ({
+                            label: ip,
+                            value: ip
+                        }))}
+                        label={t("ip")}
+                        allowArbitraryValues
+                        searchPlaceholder={t("ipFilterSearchPlaceholder")}
+                        emptyMessage={t("ipFilterEmptyMessage")}
+                        selectedValues={filters.ip ?? []}
+                        onSelectedValuesChange={(value) =>
+                            handleFilterChange("ip", value)
+                        }
+                    />
+                </span>
+            ),
             cell: ({ row }) => {
                 return row.original.ip ? (
                     row.original.ip
@@ -315,7 +347,7 @@ export default function GeneralPage() {
                             options={filterAttributes.locations.map(
                                 (location) => ({
                                     value: location,
-                                    label: location
+                                    label: `${location} ${countryCodeToFlagEmoji(location)}`
                                 })
                             )}
                             label={t("location")}
@@ -334,7 +366,8 @@ export default function GeneralPage() {
                     <span className="flex items-center gap-1">
                         {row.original.location ? (
                             <span className="text-muted-foreground text-xs">
-                                {row.original.location}
+                                {row.original.location}{" "}
+                                {countryCodeToFlagEmoji(row.original.location)}
                             </span>
                         ) : (
                             <span className="text-muted-foreground text-xs">

src/app/[orgId]/settings/logs/request/page.tsx

@@ -23,6 +23,8 @@ import { useMemo, useState, useTransition } from "react";
 import { useStoredPageSize } from "@app/hooks/useStoredPageSize";
 import type { QueryRequestAuditLogResponse } from "@server/routers/auditLogs/types";
 import { ColumnFilterButton } from "@app/components/ColumnFilterButton";
+import { countryCodeToFlagEmoji } from "@app/lib/countryCodeToFlagEmoji";
+import { ColumnMultiFilterButton } from "@app/components/ColumnMultiFilterButton";
 
 export default function GeneralPage() {
     const router = useRouter();
@@ -47,6 +49,7 @@ export default function GeneralPage() {
         method?: string;
         reason?: string;
         path?: string;
+        ip?: string[];
     }>({
         action: searchParams.get("action") || undefined,
         host: searchParams.get("host") || undefined,
@@ -55,7 +58,8 @@ export default function GeneralPage() {
         actor: searchParams.get("actor") || undefined,
         method: searchParams.get("method") || undefined,
         reason: searchParams.get("reason") || undefined,
-        path: searchParams.get("path") || undefined
+        path: searchParams.get("path") || undefined,
+        ip: searchParams.getAll("ip") || undefined
     });
 
     const getDefaultDateRange = () => {
@@ -179,7 +183,7 @@ export default function GeneralPage() {
 
     const handleFilterChange = (
         filterType: keyof typeof filters,
-        value: string | undefined
+        value: string | string[] | undefined
     ) => {
         const newFilters = { ...filters, [filterType]: value };
         setFilters(newFilters);
@@ -197,10 +201,13 @@ export default function GeneralPage() {
     ) => {
         const params = new URLSearchParams(searchParams);
         Object.entries(newFilters).forEach(([key, value]) => {
-            if (value) {
+            params.delete(key);
+            if (typeof value === "string") {
                 params.set(key, value);
-            } else {
+            } else if (typeof value !== "undefined" && "length" in value) {
-                params.delete(key);
+                for (const element of value) {
+                    params.append(key, element);
+                }
             }
         });
         router.replace(`?${params.toString()}`, { scroll: false });
@@ -209,6 +216,7 @@ export default function GeneralPage() {
     const exportData = async () => {
         try {
             // Prepare query params for export
+            const { ip, ...restFilters } = filters;
             const params: any = {
                 timeStart: dateRange.startDate?.date
                     ? new Date(dateRange.startDate.date).toISOString()
@@ -216,11 +224,15 @@ export default function GeneralPage() {
                 timeEnd: dateRange.endDate?.date
                     ? new Date(dateRange.endDate.date).toISOString()
                     : undefined,
-                ...filters
+                ...restFilters
             };
 
+            // axios serializes arrays as `ip[]=…`, which express's query
+            // parser does not read back as `ip`, so pass them in the URL
+            const sp = new URLSearchParams((ip ?? []).map((ip) => ["ip", ip]));
+
             const response = await api.get(
-                `/org/${orgId}/logs/request/export`,
+                `/org/${orgId}/logs/request/export?${sp.toString()}`,
                 {
                     responseType: "blob",
                     params
@@ -351,7 +363,24 @@ export default function GeneralPage() {
         },
         {
             accessorKey: "ip",
-            header: ({ column }) => <span className="px-2">{t("ip")}</span>,
+            header: ({ column }) => (
+                <span className="px-2">
+                    <ColumnMultiFilterButton
+                        options={(filters.ip ?? []).map((ip) => ({
+                            label: ip,
+                            value: ip
+                        }))}
+                        label={t("ip")}
+                        allowArbitraryValues
+                        searchPlaceholder={t("ipFilterSearchPlaceholder")}
+                        emptyMessage={t("ipFilterEmptyMessage")}
+                        selectedValues={filters.ip ?? []}
+                        onSelectedValuesChange={(value) =>
+                            handleFilterChange("ip", value)
+                        }
+                    />
+                </span>
+            ),
             cell: ({ row }) => {
                 return row.original.ip ? (
                     row.original.ip
@@ -369,7 +398,7 @@ export default function GeneralPage() {
                             options={filterAttributes.locations.map(
                                 (location) => ({
                                     value: location,
-                                    label: location
+                                    label: `${location} ${countryCodeToFlagEmoji(location)}`
                                 })
                             )}
                             selectedValue={filters.location}
@@ -389,7 +418,8 @@ export default function GeneralPage() {
                     <span className="flex items-center gap-1">
                         {row.original.location ? (
                             <span className="text-muted-foreground text-xs">
-                                {row.original.location}
+                                {row.original.location}{" "}
+                                {countryCodeToFlagEmoji(row.original.location)}
                             </span>
                         ) : (
                             <span className="text-muted-foreground text-xs">

src/app/[orgId]/settings/resources/public/create/page.tsx

@@ -50,8 +50,6 @@ import {
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { usePaidStatus } from "@app/hooks/usePaidStatus";
 import { toast } from "@app/hooks/useToast";
-import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
-import { tierMatrix, TierFeature } from "@server/lib/billing/tierMatrix";
 import { createApiClient, formatAxiosError } from "@app/lib/api";
 import {
     createBrowserGatewayTargetFormSchema,
@@ -59,7 +57,6 @@ import {
     selectedSiteSchema,
     type SshSettingsFormValues
 } from "@app/lib/browserGatewayTargetFormSchema";
-import { DockerManager, DockerState } from "@app/lib/docker";
 import { orgQueries } from "@app/lib/queries";
 import { finalizeSubdomainSanitize } from "@app/lib/subdomain-utils";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -328,19 +325,20 @@ export default function Page() {
     const rawResourcesAllowed =
         env.flags.allowRawResources &&
         (build !== "saas" || remoteExitNodes.length > 0);
-    const enterpriseModesAllowed =
-        !env.flags.disableEnterpriseFeatures;
 
     const availableTypes = useMemo((): NewResourceType[] => {
-        const base: NewResourceType[] = ["http", "inference"];
+        const base: NewResourceType[] = [
-        if (enterpriseModesAllowed) {
+            "http",
-            base.push("ssh", "rdp", "vnc");
+            "inference",
-        }
+            "ssh",
+            "rdp",
+            "vnc"
+        ];
         if (rawResourcesAllowed) {
             base.push("tcp", "udp");
         }
         return base;
-    }, [enterpriseModesAllowed, rawResourcesAllowed]);
+    }, [rawResourcesAllowed]);
 
     useEffect(() => {
         if (!availableTypes.includes(resourceType)) {

src/components/ColumnFilterButton.tsx

@@ -21,7 +21,7 @@ import { useTranslations } from "next-intl";
 
 interface FilterOption {
     value: string;
-    label: string;
+    label: React.ReactNode;
 }
 
 interface ColumnFilterButtonProps {
@@ -32,6 +32,7 @@ interface ColumnFilterButtonProps {
     emptyMessage?: string;
     className?: string;
     label: string;
+    allowArbitraryValues?: boolean;
 }
 
 export function ColumnFilterButton({
@@ -41,7 +42,8 @@ export function ColumnFilterButton({
     searchPlaceholder = "Search...",
     emptyMessage = "No options found",
     className,
-    label
+    label,
+    allowArbitraryValues
 }: ColumnFilterButtonProps) {
     const [open, setOpen] = useState(false);
 
@@ -101,7 +103,7 @@ export function ColumnFilterButton({
                             {options.map((option) => (
                                 <CommandItem
                                     key={option.value}
-                                    value={option.label}
+                                    value={option.value}
                                     onSelect={() => {
                                         onValueChange(
                                             selectedValue === option.value

src/components/ColumnMultiFilterButton.tsx

@@ -35,6 +35,7 @@ type ColumnMultiFilterButtonProps = {
     emptyMessage?: string;
     className?: string;
     label: string;
+    allowArbitraryValues?: boolean;
 };
 
 export function ColumnMultiFilterButton({
@@ -44,11 +45,26 @@ export function ColumnMultiFilterButton({
     searchPlaceholder = "Search...",
     emptyMessage = "No options found",
     className,
-    label
+    label,
+    allowArbitraryValues
 }: ColumnMultiFilterButtonProps) {
     const [open, setOpen] = useState(false);
+    const [searchQuery, setSearchQuery] = useState("");
     const t = useTranslations();
 
+    const visibleOptions = useMemo<FilterOption[]>(() => {
+        const newOptions = [...options];
+
+        if (allowArbitraryValues && searchQuery.trim().length > 0) {
+            newOptions.push({
+                label: searchQuery,
+                value: searchQuery
+            });
+        }
+
+        return newOptions;
+    }, [options, allowArbitraryValues, searchQuery]);
+
     const selectedSet = useMemo(
         () => new Set(selectedValues),
         [selectedValues]
@@ -64,7 +80,7 @@ export function ColumnMultiFilterButton({
                 selectedValues[0]
             );
         }
-        return t("accessUsersRoleFilterCount", {
+        return t("multiSelectFilterCount", {
             count: selectedValues.length
         });
     }, [selectedValues, options, t]);
@@ -108,7 +124,11 @@ export function ColumnMultiFilterButton({
                 align="start"
             >
                 <Command>
-                    <CommandInput placeholder={searchPlaceholder} />
+                    <CommandInput
+                        placeholder={searchPlaceholder}
+                        value={searchQuery}
+                        onValueChange={setSearchQuery}
+                    />
                     <CommandList>
                         <CommandEmpty>{emptyMessage}</CommandEmpty>
                         <CommandGroup>
@@ -123,7 +143,7 @@ export function ColumnMultiFilterButton({
                                     {t("accessFilterClear")}
                                 </CommandItem>
                             )}
-                            {options.map((option) => (
+                            {visibleOptions.map((option) => (
                                 <CommandItem
                                     key={option.value}
                                     value={option.label}

src/lib/queries.ts

@@ -1,3 +1,8 @@
+import {
+    getAiBudgetScopeListPath,
+    type AiBudgetScope
+} from "@app/lib/aiBudgetScope";
+import type { AiProviderType } from "@app/lib/aiProviderDefaults";
 import type { LauncherQueryFilters } from "@app/lib/launcherSearchParams";
 import { buildLauncherSearchParams } from "@app/lib/launcherSearchParams";
 import { build } from "@server/build";
@@ -5,15 +10,21 @@ import {
     StatusHistoryResponse,
     type BatchedStatusHistoryResponse
 } from "@server/lib/statusHistory";
+import type { ListAiBudgetsByScopeResponse } from "@server/routers/aiBudget/types";
+import type {
+    ListAiModelsResponse,
+    ListAiProvidersResponse,
+    ListCatalogModelsResponse
+} from "@server/routers/aiProvider/types";
 import type { ListAlertRulesResponse } from "@server/routers/alertRule/types";
 import type {
-    QueryRequestAnalyticsResponse,
     QueryAiUsageFilterOptionsResponse,
     QueryAiUsageOverviewResponse,
     QueryAiUsageProvidersResponse,
     QueryAiUsageResourcesResponse,
     QueryAiUsageUsersRolesResponse,
-    QueryAiUsageVirtualApiKeysResponse
+    QueryAiUsageVirtualApiKeysResponse,
+    QueryRequestAnalyticsResponse
 } from "@server/routers/auditLogs";
 import type {
     QueryAccessAuditLogResponse,
@@ -34,6 +45,7 @@ import type {
 import type { GetDomainResponse } from "@server/routers/domain/getDomain";
 import { ListHealthChecksResponse } from "@server/routers/healthChecks/types";
 import type { ListOrgLabelsResponse } from "@server/routers/labels/types";
+import type { ListLauncherAiModelsResponse } from "@server/routers/launcher/listLauncherAiModels";
 import type {
     LauncherResource,
     ListLauncherGroupsResponse,
@@ -43,9 +55,8 @@ import type {
     ListLauncherSitesResponse,
     ListLauncherViewsResponse
 } from "@server/routers/launcher/types";
-import type { ListLauncherAiModelsResponse } from "@server/routers/launcher/listLauncherAiModels";
-import type { ListMyVirtualApiKeysResponse } from "@server/routers/virtualApiKey/types";
 import type { GetResourcePolicyResponse } from "@server/routers/policy";
+import type { ListRemoteExitNodesResponse } from "@server/routers/remoteExitNode/types";
 import type {
     GetResourcePoliciesResponse,
     GetResourceWhitelistResponse,
@@ -59,7 +70,6 @@ import type {
 import type { GetResourceResponse } from "@server/routers/resource/getResource";
 import type { GetResourceAuthInfoResponse } from "@server/routers/resource/getResourceAuthInfo";
 import type { ListResourcePoliciesResponse } from "@server/routers/resource/types";
-import type { ListRemoteExitNodesResponse } from "@server/routers/remoteExitNode/types";
 import type { ListRolesResponse } from "@server/routers/role";
 import type { ListSitesResponse } from "@server/routers/site";
 import type {
@@ -71,18 +81,8 @@ import type {
 } from "@server/routers/siteResource";
 import type { GetSiteResourceResponse } from "@server/routers/siteResource/getSiteResource";
 import type { ListTargetsResponse } from "@server/routers/target";
-import type {
-    ListAiModelsResponse,
-    ListAiProvidersResponse,
-    ListCatalogModelsResponse
-} from "@server/routers/aiProvider/types";
-import type { AiProviderType } from "@app/lib/aiProviderDefaults";
-import type { ListAiBudgetsByScopeResponse } from "@server/routers/aiBudget/types";
-import {
-    getAiBudgetScopeListPath,
-    type AiBudgetScope
-} from "@app/lib/aiBudgetScope";
 import type { ListUsersResponse } from "@server/routers/user";
+import type { ListMyVirtualApiKeysResponse } from "@server/routers/virtualApiKey/types";
 import type ResponseT from "@server/types/Response";
 import {
     infiniteQueryOptions,
@@ -1000,7 +1000,8 @@ export const httpLogsFiltersSchema = z.object({
     actor: z.string().optional().catch(undefined),
     method: z.string().optional().catch(undefined),
     reason: z.string().optional().catch(undefined),
-    path: z.string().optional().catch(undefined)
+    path: z.string().optional().catch(undefined),
+    ip: z.array(z.string()).optional().catch(undefined)
 });
 
 export type HttpLogFilters = z.output<typeof httpLogsFiltersSchema>;
@@ -1026,7 +1027,8 @@ export const accessLogsFiltersSchema = z.object({
     action: z.string().optional().catch(undefined),
     location: z.string().optional().catch(undefined),
     actor: z.string().optional().catch(undefined),
-    type: z.string().optional().catch(undefined)
+    type: z.string().optional().catch(undefined),
+    ip: z.array(z.string()).optional().catch(undefined)
 });
 
 export type AccessLogFilters = z.output<typeof accessLogsFiltersSchema>;
@@ -1139,10 +1141,13 @@ export const logQueries = {
         queryOptions({
             queryKey: ["REQUEST_LOGS", orgId, "ALL", filters] as const,
             queryFn: async ({ signal, meta }) => {
-                const { page, pageSize, ...rest } = filters;
+                const { page, pageSize, ip, ...rest } = filters;
+                const sp = new URLSearchParams(
+                    (ip ?? []).map((ip) => ["ip", ip])
+                );
                 const res = await meta!.api.get<
                     AxiosResponse<QueryRequestAuditLogResponse>
-                >(`/org/${orgId}/logs/request`, {
+                >(`/org/${orgId}/logs/request?${sp.toString()}`, {
                     params: {
                         ...rest,
                         limit: pageSize,
@@ -1164,10 +1169,13 @@ export const logQueries = {
         queryOptions({
             queryKey: ["ACCESS_LOGS", orgId, "ALL", filters] as const,
             queryFn: async ({ signal, meta }) => {
-                const { page, pageSize, ...rest } = filters;
+                const { page, pageSize, ip, ...rest } = filters;
+                const sp = new URLSearchParams(
+                    (ip ?? []).map((ip) => ["ip", ip])
+                );
                 const res = await meta!.api.get<
                     AxiosResponse<QueryAccessAuditLogResponse>
-                >(`/org/${orgId}/logs/access`, {
+                >(`/org/${orgId}/logs/access?${sp.toString()}`, {
                     params: {
                         ...rest,
                         limit: pageSize,