mirror/fosrl.pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2025-08-04 10:05:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

use strict zod objects and hide proto on targets

Browse source
This commit is contained in:
Milo Schwartz 2024-11-14 00:00:17 -05:00
parent 44b932937f
commit ba3505a385
No known key found for this signature in database
14 changed files with 154 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/routers/auth/verifySiteAccess.ts
View file

@ -10,6 +10,7 @@ import {
import { and, eq, or } from "drizzle-orm";
import createHttpError from "http-errors";
import HttpCode from "@server/types/HttpCode";
import logger from "@server/logger";
export async function verifySiteAccess(
req: Request,
@ -28,6 +29,7 @@ export async function verifySiteAccess(
}
if (isNaN(siteId)) {
logger.debug(JSON.stringify(req.body));
return next(createHttpError(HttpCode.BAD_REQUEST, "Invalid site ID"));
}

1
server/routers/external.ts
View file

@ -150,7 +150,6 @@ authenticated.get(
authenticated.post(
"/resource/:resourceId",
verifyResourceAccess,
verifySiteAccess,
verifyUserHasAction(ActionsEnum.updateResource),
resource.updateResource
);

12
server/routers/org/createOrg.ts
View file

@ -12,11 +12,13 @@ import config from "@server/config";
import { fromError } from "zod-validation-error";
import { defaultRoleAllowedActions } from "../role";
const createOrgSchema = z.object({
orgId: z.string(),
name: z.string().min(1).max(255),
// domain: z.string().min(1).max(255).optional(),
});
const createOrgSchema = z
.object({
orgId: z.string(),
name: z.string().min(1).max(255),
// domain: z.string().min(1).max(255).optional(),
})
.strict();
const MAX_ORGS = 5;

1
server/routers/org/updateOrg.ts
View file

@ -18,6 +18,7 @@ const updateOrgBodySchema = z
name: z.string().min(1).max(255).optional(),
domain: z.string().min(1).max(255).optional(),
})
.strict()
.refine((data) => Object.keys(data).length > 0, {
message: "At least one field must be provided for update",
});

10
server/routers/resource/createResource.ts
View file

@ -25,10 +25,12 @@ const createResourceParamsSchema = z.object({
orgId: z.string(),
});
const createResourceSchema = z.object({
name: z.string().min(1).max(255),
subdomain: z.string().min(1).max(255).optional(),
});
const createResourceSchema = z
.object({
name: z.string().min(1).max(255),
subdomain: z.string().min(1).max(255).optional(),
})
.strict();
export type CreateResourceResponse = Resource;

3
server/routers/resource/updateResource.ts
View file

@ -18,8 +18,9 @@ const updateResourceBodySchema = z
name: z.string().min(1).max(255).optional(),
subdomain: z.string().min(1).max(255).optional(),
ssl: z.boolean().optional(),
siteId: z.number(),
// siteId: z.number(),
})
.strict()
.refine((data) => Object.keys(data).length > 0, {
message: "At least one field must be provided for update",
});

10
server/routers/role/createRole.ts
View file

@ -14,10 +14,12 @@ const createRoleParamsSchema = z.object({
orgId: z.string(),
});
const createRoleSchema = z.object({
name: z.string().min(1).max(255),
description: z.string().optional(),
});
const createRoleSchema = z
.object({
name: z.string().min(1).max(255),
description: z.string().optional(),
})
.strict();
export const defaultRoleAllowedActions: ActionsEnum[] = [
ActionsEnum.getOrg,

1
server/routers/role/updateRole.ts
View file

@ -18,6 +18,7 @@ const updateRoleBodySchema = z
name: z.string().min(1).max(255).optional(),
description: z.string().optional(),
})
.strict()
.refine((data) => Object.keys(data).length > 0, {
message: "At least one field must be provided for update",
});

16
server/routers/site/createSite.ts
View file

@ -15,13 +15,15 @@ const createSiteParamsSchema = z.object({
orgId: z.string(),
});
const createSiteSchema = z.object({
name: z.string().min(1).max(255),
exitNodeId: z.number().int().positive(),
subdomain: z.string().min(1).max(255).optional(),
pubKey: z.string(),
subnet: z.string(),
});
const createSiteSchema = z
.object({
name: z.string().min(1).max(255),
exitNodeId: z.number().int().positive(),
subdomain: z.string().min(1).max(255).optional(),
pubKey: z.string(),
subnet: z.string(),
})
.strict();
export type CreateSiteResponse = {
name: string;

1
server/routers/site/updateSite.ts
View file

@ -23,6 +23,7 @@ const updateSiteBodySchema = z
megabytesIn: z.number().int().nonnegative().optional(),
megabytesOut: z.number().int().nonnegative().optional(),
})
.strict()
.refine((data) => Object.keys(data).length > 0, {
message: "At least one field must be provided for update",
});

17
server/routers/target/createTarget.ts
View file

@ -15,13 +15,15 @@ const createTargetParamsSchema = z.object({
resourceId: z.string().transform(Number).pipe(z.number().int().positive()),
});
const createTargetSchema = z.object({
ip: z.string().ip(),
method: z.string().min(1).max(10),
port: z.number().int().min(1).max(65535),
protocol: z.string().optional(),
enabled: z.boolean().default(true),
});
const createTargetSchema = z
.object({
ip: z.string().ip(),
method: z.string().min(1).max(10),
port: z.number().int().min(1).max(65535),
protocol: z.string().optional(),
enabled: z.boolean().default(true),
})
.strict();
export type CreateTargetResponse = Target;
@ -104,6 +106,7 @@ export async function createTarget(
.insert(targets)
.values({
resourceId,
protocol: "tcp", // hard code for now
...targetData,
})
.returning();

4
server/routers/target/updateTarget.ts
View file

@ -15,12 +15,12 @@ const updateTargetParamsSchema = z.object({
const updateTargetBodySchema = z
.object({
// ip: z.string().ip().optional(), // for now we cant update the ip; you will have to delete
ip: z.string().ip().optional(), // for now we cant update the ip; you will have to delete
method: z.string().min(1).max(10).optional(),
port: z.number().int().min(1).max(65535).optional(),
protocol: z.string().optional(),
enabled: z.boolean().optional(),
})
.strict()
.refine((data) => Object.keys(data).length > 0, {
message: "At least one field must be provided for update",
});

230
src/app/[orgId]/settings/resources/[resourceId]/connectivity/page.tsx
View file

@ -17,7 +17,7 @@ import { AxiosResponse } from "axios";
import { ListTargetsResponse } from "@server/routers/target/listTargets";
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { set, z } from "zod";
import { z } from "zod";
import {
Form,
FormControl,
@ -27,7 +27,7 @@ import {
FormLabel,
FormMessage,
} from "@app/components/ui/form";
import { CreateTargetResponse, updateTarget } from "@server/routers/target";
import { CreateTargetResponse } from "@server/routers/target";
import {
ColumnDef,
getFilteredRowModel,
@ -51,7 +51,6 @@ import { useResourceContext } from "@app/hooks/useResourceContext";
import { ArrayElement } from "@server/types/ArrayElement";
import { Dot } from "lucide-react";
import { formatAxiosError } from "@app/lib/utils";
import { escape } from "querystring";
const addTargetSchema = z.object({
ip: z.string().ip(),
@ -62,15 +61,18 @@ const addTargetSchema = z.object({
message: "Port must be a number",
})
.transform((val) => Number(val)),
protocol: z.string(),
// protocol: z.string(),
});
type AddTargetFormValues = z.infer<typeof addTargetSchema>;
type LocalTarget = ArrayElement<ListTargetsResponse["targets"]> & {
new?: boolean;
updated?: boolean;
};
type LocalTarget = Omit<
ArrayElement<ListTargetsResponse["targets"]> & {
new?: boolean;
updated?: boolean;
},
"protocol"
>;
export default function ReverseProxyTargets(props: {
params: Promise<{ resourceId: number }>;
@ -84,13 +86,15 @@ export default function ReverseProxyTargets(props: {
const [targetsToRemove, setTargetsToRemove] = useState<number[]>([]);
const [sslEnabled, setSslEnabled] = useState(resource.ssl);
const [loading, setLoading] = useState(false);
const addTargetForm = useForm({
resolver: zodResolver(addTargetSchema),
defaultValues: {
ip: "",
method: "http",
port: "80",
protocol: "TCP",
// protocol: "TCP",
},
});
@ -153,109 +157,72 @@ export default function ReverseProxyTargets(props: {
}
async function saveAll() {
const res = await api
.post(`/resource/${params.resourceId}`, { ssl: sslEnabled })
.catch((err) => {
console.error(err);
toast({
variant: "destructive",
title: "Failed to update resource",
description: formatAxiosError(
err,
"Failed to update resource"
),
});
})
.then(() => {
updateResource({ ssl: sslEnabled });
try {
setLoading(true);
const res = await api.post(`/resource/${params.resourceId}`, {
ssl: sslEnabled,
});
for (const target of targets) {
const data = {
ip: target.ip,
port: target.port,
method: target.method,
protocol: target.protocol,
enabled: target.enabled,
};
updateResource({ ssl: sslEnabled });
if (target.new) {
await api
.put<AxiosResponse<CreateTargetResponse>>(
`/resource/${params.resourceId}/target`,
for (const target of targets) {
const data = {
ip: target.ip,
port: target.port,
// protocol: target.protocol,
method: target.method,
enabled: target.enabled,
};
if (target.new) {
const res = await api.put<
AxiosResponse<CreateTargetResponse>
>(`/resource/${params.resourceId}/target`, data);
} else if (target.updated) {
const res = await api.post(
`/target/${target.targetId}`,
data
)
.then((res) => {
setTargets(
targets.map((t) => {
if (
t.new &&
t.targetId === res.data.data.targetId
) {
return {
...t,
new: false,
};
}
return t;
})
);
})
.catch((err) => {
console.error(err);
toast({
variant: "destructive",
title: "Failed to add target",
description: formatAxiosError(
err,
"Failed to add target"
),
});
});
} else if (target.updated) {
const res = await api
.post(`/target/${target.targetId}`, data)
.catch((err) => {
console.error(err);
toast({
variant: "destructive",
title: "Failed to update target",
description: formatAxiosError(
err,
"Failed to update target"
),
});
});
}
}
for (const targetId of targetsToRemove) {
await api
.delete(`/target/${targetId}`)
.catch((err) => {
console.error(err);
toast({
variant: "destructive",
title: "Failed to remove target",
description: formatAxiosError(
err,
"Failed to remove target"
),
});
})
.then((res) => {
setTargets(
targets.filter((target) => target.targetId !== targetId)
);
});
}
setTargets([
...targets.map((t) => {
return {
...t,
new: false,
updated: false,
};
}),
]);
}
for (const targetId of targetsToRemove) {
await api.delete(`/target/${targetId}`);
setTargets(
targets.filter((target) => target.targetId !== targetId)
);
}
toast({
title: "Resource updated",
description: "Resource and targets updated successfully",
});
setTargetsToRemove([]);
} catch (err) {
console.error(err);
toast({
variant: "destructive",
title: "Operation failed",
description: formatAxiosError(
err,
"An error occurred during the save operation"
),
});
}
toast({
title: "Resource updated",
description: "Resource and targets updated successfully",
});
setTargetsToRemove([]);
setLoading(false);
}
const columns: ColumnDef<LocalTarget>[] = [
@ -306,24 +273,24 @@ export default function ReverseProxyTargets(props: {
</Select>
),
},
{
accessorKey: "protocol",
header: "Protocol",
cell: ({ row }) => (
<Select
defaultValue={row.original.protocol!}
onValueChange={(value) =>
updateTarget(row.original.targetId, { protocol: value })
}
>
<SelectTrigger>{row.original.protocol}</SelectTrigger>
<SelectContent>
<SelectItem value="TCP">TCP</SelectItem>
<SelectItem value="UDP">UDP</SelectItem>
</SelectContent>
</Select>
),
},
// {
// accessorKey: "protocol",
// header: "Protocol",
// cell: ({ row }) => (
// <Select
// defaultValue={row.original.protocol!}
// onValueChange={(value) =>
// updateTarget(row.original.targetId, { protocol: value })
// }
// >
// <SelectTrigger>{row.original.protocol}</SelectTrigger>
// <SelectContent>
// <SelectItem value="TCP">TCP</SelectItem>
// <SelectItem value="UDP">UDP</SelectItem>
// </SelectContent>
// </Select>
// ),
// },
{
accessorKey: "enabled",
header: "Enabled",
@ -341,7 +308,14 @@ export default function ReverseProxyTargets(props: {
cell: ({ row }) => (
<>
<div className="flex items-center justify-end space-x-2">
{row.original.new && <Dot />}
<Dot
className={
row.original.new || row.original.updated
? "opacity-100"
: "opacity-0"
}
/>
<Button
variant="outline"
onClick={() => removeTarget(row.original.targetId)}
@ -475,7 +449,7 @@ export default function ReverseProxyTargets(props: {
</FormItem>
)}
/>
<FormField
{/* <FormField
control={addTargetForm.control}
name="protocol"
render={({ field }) => (
@ -511,7 +485,7 @@ export default function ReverseProxyTargets(props: {
<FormMessage />
</FormItem>
)}
/>
/> */}
</div>
<Button type="submit" variant="gray">
Add Target
@ -569,7 +543,9 @@ export default function ReverseProxyTargets(props: {
</div>
<div className="mt-8">
<Button onClick={saveAll}>Save Changes</Button>
<Button onClick={saveAll} loading={loading} disabled={loading}>
Save Changes
</Button>
</div>
</div>
);

8
src/app/[orgId]/settings/resources/[resourceId]/general/page.tsx
View file

@ -61,7 +61,7 @@ export default function GeneralForm() {
resolver: zodResolver(GeneralFormSchema),
defaultValues: {
name: resource.name,
siteId: resource.siteId!,
// siteId: resource.siteId!,
},
mode: "onChange",
});
@ -84,7 +84,7 @@ export default function GeneralForm() {
`resource/${resource?.resourceId}`,
{
name: data.name,
siteId: data.siteId,
// siteId: data.siteId,
}
)
.catch((e) => {
@ -137,7 +137,7 @@ export default function GeneralForm() {
</FormItem>
)}
/>
<FormField
{/* <FormField
control={form.control}
name="siteId"
render={({ field }) => (
@ -213,7 +213,7 @@ export default function GeneralForm() {
<FormMessage />
</FormItem>
)}
/>
/> */}
<Button
type="submit"
loading={saveLoading}