pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-03-10 04:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update API routes and ui

Browse Source
This commit is contained in:
Owen
2025-12-17 11:58:25 -05:00
committed by Owen Schwartz
parent 79eefc0ac7
commit 35ea01610a
9 changed files with 160 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
messages/en-US.json
View File

@@ -1618,9 +1618,8 @@
"createInternalResourceDialogResourceProperties": "Resource Properties", "createInternalResourceDialogResourceProperties": "Resource Properties",
"createInternalResourceDialogName": "Name", "createInternalResourceDialogName": "Name",
"createInternalResourceDialogSite": "Site", "createInternalResourceDialogSite": "Site",
"createInternalResourceDialogSelectSite": "Select site...", "selectSite": "Select site...",
"createInternalResourceDialogSearchSites": "Search sites...", "noSitesFound": "No sites found.",
"createInternalResourceDialogNoSitesFound": "No sites found.",
"createInternalResourceDialogProtocol": "Protocol", "createInternalResourceDialogProtocol": "Protocol",
"createInternalResourceDialogTcp": "TCP", "createInternalResourceDialogTcp": "TCP",
"createInternalResourceDialogUdp": "UDP", "createInternalResourceDialogUdp": "UDP",

15
server/routers/external.ts
View File

@@ -239,9 +239,8 @@ authenticated.get(
// Site Resource endpoints // Site Resource endpoints
authenticated.put( authenticated.put(
"/org/:orgId/site/:siteId/resource", "/org/:orgId/site-resource",
verifyOrgAccess, verifyOrgAccess,
verifySiteAccess,
verifyUserHasAction(ActionsEnum.createSiteResource), verifyUserHasAction(ActionsEnum.createSiteResource),
logActionAudit(ActionsEnum.createSiteResource), logActionAudit(ActionsEnum.createSiteResource),
siteResource.createSiteResource siteResource.createSiteResource
@@ -263,18 +262,14 @@ authenticated.get(
); );
authenticated.get( authenticated.get(
"/org/:orgId/site/:siteId/resource/:siteResourceId", "/site-resource/:siteResourceId",
verifyOrgAccess,
verifySiteAccess,
verifySiteResourceAccess, verifySiteResourceAccess,
verifyUserHasAction(ActionsEnum.getSiteResource), verifyUserHasAction(ActionsEnum.getSiteResource),
siteResource.getSiteResource siteResource.getSiteResource
); );
authenticated.post( authenticated.post(
"/org/:orgId/site/:siteId/resource/:siteResourceId", "/site-resource/:siteResourceId",
verifyOrgAccess,
verifySiteAccess,
verifySiteResourceAccess, verifySiteResourceAccess,
verifyUserHasAction(ActionsEnum.updateSiteResource), verifyUserHasAction(ActionsEnum.updateSiteResource),
logActionAudit(ActionsEnum.updateSiteResource), logActionAudit(ActionsEnum.updateSiteResource),
@@ -282,9 +277,7 @@ authenticated.post(
); );
authenticated.delete( authenticated.delete(
"/org/:orgId/site/:siteId/resource/:siteResourceId", "/site-resource/:siteResourceId",
verifyOrgAccess,
verifySiteAccess,
verifySiteResourceAccess, verifySiteResourceAccess,
verifyUserHasAction(ActionsEnum.deleteSiteResource), verifyUserHasAction(ActionsEnum.deleteSiteResource),
logActionAudit(ActionsEnum.deleteSiteResource), logActionAudit(ActionsEnum.deleteSiteResource),

15
server/routers/integration.ts
View File

@@ -146,9 +146,8 @@ authenticated.get(
); );
// Site Resource endpoints // Site Resource endpoints
authenticated.put( authenticated.put(
"/org/:orgId/site/:siteId/resource", "/org/:orgId/private-resource",
verifyApiKeyOrgAccess, verifyApiKeyOrgAccess,
verifyApiKeySiteAccess,
verifyApiKeyHasAction(ActionsEnum.createSiteResource), verifyApiKeyHasAction(ActionsEnum.createSiteResource),
logActionAudit(ActionsEnum.createSiteResource), logActionAudit(ActionsEnum.createSiteResource),
siteResource.createSiteResource siteResource.createSiteResource
@@ -170,18 +169,14 @@ authenticated.get(
); );
authenticated.get( authenticated.get(
"/org/:orgId/site/:siteId/resource/:siteResourceId", "/site-resource/:siteResourceId",
verifyApiKeyOrgAccess,
verifyApiKeySiteAccess,
verifyApiKeySiteResourceAccess, verifyApiKeySiteResourceAccess,
verifyApiKeyHasAction(ActionsEnum.getSiteResource), verifyApiKeyHasAction(ActionsEnum.getSiteResource),
siteResource.getSiteResource siteResource.getSiteResource
); );
authenticated.post( authenticated.post(
"/org/:orgId/site/:siteId/resource/:siteResourceId", "/site-resource/:siteResourceId",
verifyApiKeyOrgAccess,
verifyApiKeySiteAccess,
verifyApiKeySiteResourceAccess, verifyApiKeySiteResourceAccess,
verifyApiKeyHasAction(ActionsEnum.updateSiteResource), verifyApiKeyHasAction(ActionsEnum.updateSiteResource),
logActionAudit(ActionsEnum.updateSiteResource), logActionAudit(ActionsEnum.updateSiteResource),
@@ -189,9 +184,7 @@ authenticated.post(
); );
authenticated.delete( authenticated.delete(
"/org/:orgId/site/:siteId/resource/:siteResourceId", "/site-resource/:siteResourceId",
verifyApiKeyOrgAccess,
verifyApiKeySiteAccess,
verifyApiKeySiteResourceAccess, verifyApiKeySiteResourceAccess,
verifyApiKeyHasAction(ActionsEnum.deleteSiteResource), verifyApiKeyHasAction(ActionsEnum.deleteSiteResource),
logActionAudit(ActionsEnum.deleteSiteResource), logActionAudit(ActionsEnum.deleteSiteResource),

7
server/routers/siteResource/createSiteResource.ts
View File

@@ -23,7 +23,6 @@ import { z } from "zod";
import { fromError } from "zod-validation-error"; import { fromError } from "zod-validation-error";
const createSiteResourceParamsSchema = z.strictObject({ const createSiteResourceParamsSchema = z.strictObject({
siteId: z.string().transform(Number).pipe(z.int().positive()),
orgId: z.string() orgId: z.string()
}); });
@@ -31,6 +30,7 @@ const createSiteResourceSchema = z
.strictObject({ .strictObject({
name: z.string().min(1).max(255), name: z.string().min(1).max(255),
mode: z.enum(["host", "cidr", "port"]), mode: z.enum(["host", "cidr", "port"]),
siteId: z.int(),
// protocol: z.enum(["tcp", "udp"]).optional(), // protocol: z.enum(["tcp", "udp"]).optional(),
// proxyPort: z.int().positive().optional(), // proxyPort: z.int().positive().optional(),
// destinationPort: z.int().positive().optional(), // destinationPort: z.int().positive().optional(),
@@ -101,7 +101,7 @@ export type CreateSiteResourceResponse = SiteResource;
registry.registerPath({ registry.registerPath({
method: "put", method: "put",
path: "/org/{orgId}/site/{siteId}/resource", path: "/org/{orgId}/site-resource",
description: "Create a new site resource.", description: "Create a new site resource.",
tags: [OpenAPITags.Client, OpenAPITags.Org], tags: [OpenAPITags.Client, OpenAPITags.Org],
request: { request: {
@@ -145,9 +145,10 @@ export async function createSiteResource(
); );
} }
const { siteId, orgId } = parsedParams.data; const { orgId } = parsedParams.data;
const { const {
name, name,
siteId,
mode, mode,
// protocol, // protocol,
// proxyPort, // proxyPort,

2
server/routers/siteResource/getSiteResource.ts
View File

@@ -63,7 +63,7 @@ export type GetSiteResourceResponse = NonNullable<
registry.registerPath({ registry.registerPath({
method: "get", method: "get",
path: "/org/{orgId}/site/{siteId}/resource/{siteResourceId}", path: "/site-resource/{siteResourceId}",
description: "Get a specific site resource by siteResourceId.", description: "Get a specific site resource by siteResourceId.",
tags: [OpenAPITags.Client, OpenAPITags.Org], tags: [OpenAPITags.Client, OpenAPITags.Org],
request: { request: {

36
server/routers/siteResource/updateSiteResource.ts
View File

@@ -32,14 +32,13 @@ import {
} from "@server/lib/rebuildClientAssociations"; } from "@server/lib/rebuildClientAssociations";
const updateSiteResourceParamsSchema = z.strictObject({ const updateSiteResourceParamsSchema = z.strictObject({
siteResourceId: z.string().transform(Number).pipe(z.int().positive()), siteResourceId: z.string().transform(Number).pipe(z.int().positive())
siteId: z.string().transform(Number).pipe(z.int().positive()),
orgId: z.string()
}); });
const updateSiteResourceSchema = z const updateSiteResourceSchema = z
.strictObject({ .strictObject({
name: z.string().min(1).max(255).optional(), name: z.string().min(1).max(255).optional(),
siteId: z.int(),
// mode: z.enum(["host", "cidr", "port"]).optional(), // mode: z.enum(["host", "cidr", "port"]).optional(),
mode: z.enum(["host", "cidr"]).optional(), mode: z.enum(["host", "cidr"]).optional(),
// protocol: z.enum(["tcp", "udp"]).nullish(), // protocol: z.enum(["tcp", "udp"]).nullish(),
@@ -78,7 +77,10 @@ const updateSiteResourceSchema = z
const domainRegex = const domainRegex =
/^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)*[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$/; /^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)*[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$/;
const isValidDomain = domainRegex.test(data.destination); const isValidDomain = domainRegex.test(data.destination);
const isValidAlias = data.alias !== undefined && data.alias !== null && data.alias.trim() !== ""; const isValidAlias =
data.alias !== undefined &&
data.alias !== null &&
data.alias.trim() !== "";
return isValidDomain && isValidAlias; // require the alias to be set in the case of domain return isValidDomain && isValidAlias; // require the alias to be set in the case of domain
} }
@@ -111,7 +113,7 @@ export type UpdateSiteResourceResponse = SiteResource;
registry.registerPath({ registry.registerPath({
method: "post", method: "post",
path: "/org/{orgId}/site/{siteId}/resource/{siteResourceId}", path: "/site-resource/{siteResourceId}",
description: "Update a site resource.", description: "Update a site resource.",
tags: [OpenAPITags.Client, OpenAPITags.Org], tags: [OpenAPITags.Client, OpenAPITags.Org],
request: { request: {
@@ -155,9 +157,10 @@ export async function updateSiteResource(
); );
} }
const { siteResourceId, siteId, orgId } = parsedParams.data; const { siteResourceId } = parsedParams.data;
const { const {
name, name,
siteId, // because it can change
mode, mode,
destination, destination,
alias, alias,
@@ -173,7 +176,7 @@ export async function updateSiteResource(
const [site] = await db const [site] = await db
.select() .select()
.from(sites) .from(sites)
.where(and(eq(sites.siteId, siteId), eq(sites.orgId, orgId))) .where(eq(sites.siteId, siteId))
.limit(1); .limit(1);
if (!site) { if (!site) {
@@ -184,13 +187,7 @@ export async function updateSiteResource(
const [existingSiteResource] = await db const [existingSiteResource] = await db
.select() .select()
.from(siteResources) .from(siteResources)
.where( .where(and(eq(siteResources.siteResourceId, siteResourceId)))
and(
eq(siteResources.siteResourceId, siteResourceId),
eq(siteResources.siteId, siteId),
eq(siteResources.orgId, orgId)
)
)
.limit(1); .limit(1);
if (!existingSiteResource) { if (!existingSiteResource) {
@@ -206,7 +203,7 @@ export async function updateSiteResource(
.from(siteResources) .from(siteResources)
.where( .where(
and( and(
eq(siteResources.orgId, orgId), eq(siteResources.orgId, existingSiteResource.orgId),
eq(siteResources.alias, alias.trim()), eq(siteResources.alias, alias.trim()),
ne(siteResources.siteResourceId, siteResourceId) // exclude self ne(siteResources.siteResourceId, siteResourceId) // exclude self
) )
@@ -230,6 +227,7 @@ export async function updateSiteResource(
.update(siteResources) .update(siteResources)
.set({ .set({
name: name, name: name,
siteId: siteId,
mode: mode, mode: mode,
destination: destination, destination: destination,
enabled: enabled, enabled: enabled,
@@ -238,13 +236,7 @@ export async function updateSiteResource(
udpPortRangeString: udpPortRangeString, udpPortRangeString: udpPortRangeString,
disableIcmp: disableIcmp disableIcmp: disableIcmp
}) })
.where( .where(and(eq(siteResources.siteResourceId, siteResourceId)))
and(
eq(siteResources.siteResourceId, siteResourceId),
eq(siteResources.siteId, siteId),
eq(siteResources.orgId, orgId)
)
)
.returning(); .returning();
//////////////////// update the associations //////////////////// //////////////////// update the associations ////////////////////

3
src/components/ClientResourcesTable.tsx
View File

@@ -100,7 +100,7 @@ export default function ClientResourcesTable({
) => { ) => {
try { try {
await api await api
.delete(`/org/${orgId}/site/${siteId}/resource/${resourceId}`) .delete(`/site-resource/${resourceId}`)
.then(() => { .then(() => {
startTransition(() => { startTransition(() => {
router.refresh(); router.refresh();
@@ -327,6 +327,7 @@ export default function ClientResourcesTable({
setOpen={setIsEditDialogOpen} setOpen={setIsEditDialogOpen}
resource={editingResource} resource={editingResource}
orgId={orgId} orgId={orgId}
sites={sites}
onSuccess={() => { onSuccess={() => {
router.refresh(); router.refresh();
setEditingResource(null); setEditingResource(null);

11
src/components/CreateInternalResourceDialog.tsx
View File

@@ -395,9 +395,10 @@ export default function CreateInternalResourceDialog({
} }
const response = await api.put<AxiosResponse<any>>( const response = await api.put<AxiosResponse<any>>(
`/org/${orgId}/site/${data.siteId}/resource`, `/org/${orgId}/site-resource`,
{ {
name: data.name, name: data.name,
siteId: data.siteId,
mode: data.mode, mode: data.mode,
// protocol: data.protocol, // protocol: data.protocol,
// proxyPort: data.mode === "port" ? data.proxyPort : undefined, // proxyPort: data.mode === "port" ? data.proxyPort : undefined,
@@ -548,7 +549,7 @@ export default function CreateInternalResourceDialog({
<FormItem className="flex flex-col"> <FormItem className="flex flex-col">
<FormLabel> <FormLabel>
{t( {t(
"createInternalResourceDialogSite" "site"
)} )}
</FormLabel> </FormLabel>
<Popover> <Popover>
@@ -572,7 +573,7 @@ export default function CreateInternalResourceDialog({
field.value field.value
)?.name )?.name
: t( : t(
"createInternalResourceDialogSelectSite" "selectSite"
)} )}
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" /> <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
</Button> </Button>
@@ -582,13 +583,13 @@ export default function CreateInternalResourceDialog({
<Command> <Command>
<CommandInput <CommandInput
placeholder={t( placeholder={t(
"createInternalResourceDialogSearchSites" "searchSites"
)} )}
/> />
<CommandList> <CommandList>
<CommandEmpty> <CommandEmpty>
{t( {t(
"createInternalResourceDialogNoSitesFound" "noSitesFound"
)} )}
</CommandEmpty> </CommandEmpty>
<CommandGroup> <CommandGroup>

124
src/components/EditInternalResourceDialog.tsx
View File

@@ -41,6 +41,22 @@ import { Tag, TagInput } from "@app/components/tags/tag-input";
import { UserType } from "@server/types/UserTypes"; import { UserType } from "@server/types/UserTypes";
import { useQueries, useQuery, useQueryClient } from "@tanstack/react-query"; import { useQueries, useQuery, useQueryClient } from "@tanstack/react-query";
import { orgQueries, resourceQueries } from "@app/lib/queries"; import { orgQueries, resourceQueries } from "@app/lib/queries";
import {
Command,
CommandEmpty,
CommandGroup,
CommandInput,
CommandItem,
CommandList
} from "@app/components/ui/command";
import {
Popover,
PopoverContent,
PopoverTrigger
} from "@app/components/ui/popover";
import { cn } from "@app/lib/cn";
import { ListSitesResponse } from "@server/routers/site";
import { Check, ChevronsUpDown } from "lucide-react";
// import { InfoPopup } from "@app/components/ui/info-popup"; // import { InfoPopup } from "@app/components/ui/info-popup";
// Helper to validate port range string format // Helper to validate port range string format
@@ -118,6 +134,8 @@ const getPortStringFromMode = (mode: PortMode, customValue: string): string | un
return customValue; return customValue;
}; };
type Site = ListSitesResponse["sites"][0];
type InternalResourceData = { type InternalResourceData = {
id: number; id: number;
name: string; name: string;
@@ -141,6 +159,7 @@ type EditInternalResourceDialogProps = {
setOpen: (val: boolean) => void; setOpen: (val: boolean) => void;
resource: InternalResourceData; resource: InternalResourceData;
orgId: string; orgId: string;
sites: Site[];
onSuccess?: () => void; onSuccess?: () => void;
}; };
@@ -149,6 +168,7 @@ export default function EditInternalResourceDialog({
setOpen, setOpen,
resource, resource,
orgId, orgId,
sites,
onSuccess onSuccess
}: EditInternalResourceDialogProps) { }: EditInternalResourceDialogProps) {
const t = useTranslations(); const t = useTranslations();
@@ -161,6 +181,7 @@ export default function EditInternalResourceDialog({
.string() .string()
.min(1, t("editInternalResourceDialogNameRequired")) .min(1, t("editInternalResourceDialogNameRequired"))
.max(255, t("editInternalResourceDialogNameMaxLength")), .max(255, t("editInternalResourceDialogNameMaxLength")),
siteId: z.number().int().positive(),
mode: z.enum(["host", "cidr", "port"]), mode: z.enum(["host", "cidr", "port"]),
// protocol: z.enum(["tcp", "udp"]).nullish(), // protocol: z.enum(["tcp", "udp"]).nullish(),
// proxyPort: z.int().positive().min(1, t("editInternalResourceDialogProxyPortMin")).max(65535, t("editInternalResourceDialogProxyPortMax")).nullish(), // proxyPort: z.int().positive().min(1, t("editInternalResourceDialogProxyPortMin")).max(65535, t("editInternalResourceDialogProxyPortMax")).nullish(),
@@ -349,10 +370,15 @@ export default function EditInternalResourceDialog({
: "" : ""
); );
const availableSites = sites.filter(
(site) => site.type === "newt" && site.subnet
);
const form = useForm<FormData>({ const form = useForm<FormData>({
resolver: zodResolver(formSchema), resolver: zodResolver(formSchema),
defaultValues: { defaultValues: {
name: resource.name, name: resource.name,
siteId: resource.siteId,
mode: resource.mode || "host", mode: resource.mode || "host",
// protocol: (resource.protocol as "tcp" | "udp" | null | undefined) ?? undefined, // protocol: (resource.protocol as "tcp" | "udp" | null | undefined) ?? undefined,
// proxyPort: resource.proxyPort ?? undefined, // proxyPort: resource.proxyPort ?? undefined,
@@ -421,9 +447,10 @@ export default function EditInternalResourceDialog({
// Update the site resource // Update the site resource
await api.post( await api.post(
`/org/${orgId}/site/${resource.siteId}/resource/${resource.id}`, `/site-resource/${resource.id}`,
{ {
name: data.name, name: data.name,
siteId: data.siteId,
mode: data.mode, mode: data.mode,
// protocol: data.mode === "port" ? data.protocol : null, // protocol: data.mode === "port" ? data.protocol : null,
// proxyPort: data.mode === "port" ? data.proxyPort : null, // proxyPort: data.mode === "port" ? data.proxyPort : null,
@@ -504,6 +531,7 @@ export default function EditInternalResourceDialog({
if (resourceChanged) { if (resourceChanged) {
form.reset({ form.reset({
name: resource.name, name: resource.name,
siteId: resource.siteId,
mode: resource.mode || "host", mode: resource.mode || "host",
destination: resource.destination || "", destination: resource.destination || "",
alias: resource.alias ?? null, alias: resource.alias ?? null,
@@ -559,6 +587,7 @@ export default function EditInternalResourceDialog({
// reset only on close // reset only on close
form.reset({ form.reset({
name: resource.name, name: resource.name,
siteId: resource.siteId,
mode: resource.mode || "host", mode: resource.mode || "host",
// protocol: (resource.protocol as "tcp" | "udp" | null | undefined) ?? undefined, // protocol: (resource.protocol as "tcp" | "udp" | null | undefined) ?? undefined,
// proxyPort: resource.proxyPort ?? undefined, // proxyPort: resource.proxyPort ?? undefined,
@@ -636,6 +665,99 @@ export default function EditInternalResourceDialog({
)} )}
/> />
<FormField
control={form.control}
name="siteId"
render={({ field }) => (
<FormItem className="flex flex-col">
<FormLabel>
{t(
"site"
)}
</FormLabel>
<Popover>
<PopoverTrigger asChild>
<FormControl>
<Button
variant="outline"
role="combobox"
className={cn(
"w-full justify-between",
!field.value &&
"text-muted-foreground"
)}
>
{field.value
? availableSites.find(
(
site
) =>
site.siteId ===
field.value
)?.name
: t(
"selectSite"
)}
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
</Button>
</FormControl>
</PopoverTrigger>
<PopoverContent className="w-full p-0">
<Command>
<CommandInput
placeholder={t(
"searchSites"
)}
/>
<CommandList>
<CommandEmpty>
{t(
"noSitesFound"
)}
</CommandEmpty>
<CommandGroup>
{availableSites.map(
(
site
) => (
<CommandItem
key={
site.siteId
}
value={
site.name
}
onSelect={() => {
field.onChange(
site.siteId
);
}}
>
<Check
className={cn(
"mr-2 h-4 w-4",
field.value ===
site.siteId
? "opacity-100"
: "opacity-0"
)}
/>
{
site.name
}
</CommandItem>
)
)}
</CommandGroup>
</CommandList>
</Command>
</PopoverContent>
</Popover>
<FormMessage />
</FormItem>
)}
/>
<FormField <FormField
control={form.control} control={form.control}
name="mode" name="mode"