Skip to content

Commit

Permalink
fix: issues found in security audit (ajnart#1668)
Browse files Browse the repository at this point in the history
  • Loading branch information
Meierschlumpf authored Dec 15, 2024
1 parent 032509e commit 922101d
Show file tree
Hide file tree
Showing 15 changed files with 70 additions and 27 deletions.
6 changes: 5 additions & 1 deletion apps/nextjs/src/app/[locale]/boards/[name]/settings/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,13 @@ const getBoardAndPermissionsAsync = async (params: Props["params"]) => {
export default async function BoardSettingsPage({ params, searchParams }: Props) {
const { board, permissions } = await getBoardAndPermissionsAsync(params);
const boardSettings = await getServerSettingByKeyAsync(db, "board");
const { hasFullAccess } = await getBoardPermissionsAsync(board);
const { hasFullAccess, hasChangeAccess } = await getBoardPermissionsAsync(board);
const t = await getScopedI18n("board.setting");

if (!hasChangeAccess) {
notFound();
}

return (
<Container>
<Stack>
Expand Down
8 changes: 8 additions & 0 deletions apps/nextjs/src/app/[locale]/manage/settings/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { notFound } from "next/navigation";
import { Stack, Title } from "@mantine/core";

import { api } from "@homarr/api/server";
import { auth } from "@homarr/auth/next";
import { getScopedI18n } from "@homarr/translation/server";

import { CrawlingAndIndexingSettings } from "~/app/[locale]/manage/settings/_components/crawling-and-indexing.settings";
Expand All @@ -20,6 +22,12 @@ export async function generateMetadata() {
}

export default async function SettingsPage() {
const session = await auth();

if (!session?.user.permissions.includes("admin")) {
notFound();
}

const serverSettings = await api.serverSettings.getAll();
const tSettings = await getScopedI18n("management.page.settings");
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import Link from "next/link";
import { notFound } from "next/navigation";
import { Alert, Anchor, Center, Group, Stack, Table, TableTbody, TableTd, TableTr, Text, Title } from "@mantine/core";
import { IconExclamationCircle } from "@tabler/icons-react";

import type { RouterOutputs } from "@homarr/api";
import { api } from "@homarr/api/server";
import { env } from "@homarr/auth/env.mjs";
import { auth } from "@homarr/auth/next";
import { isProviderEnabled } from "@homarr/auth/server";
import { everyoneGroup } from "@homarr/definitions";
import { getI18n, getScopedI18n } from "@homarr/translation/server";
Expand All @@ -24,6 +26,12 @@ interface GroupsDetailPageProps {
}

export default async function GroupsDetailPage({ params, searchParams }: GroupsDetailPageProps) {
const session = await auth();

if (!session?.user.permissions.includes("admin")) {
notFound();
}

const t = await getI18n();
const tMembers = await getScopedI18n("management.page.group.setting.members");
const group = await api.group.getById({ id: params.id });
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { notFound } from "next/navigation";
import { Card, Group, Stack, Text, Title } from "@mantine/core";

import { api } from "@homarr/api/server";
import { auth } from "@homarr/auth/next";
import { everyoneGroup } from "@homarr/definitions";
import { getScopedI18n } from "@homarr/translation/server";
import { UserAvatar } from "@homarr/ui";
Expand All @@ -18,6 +20,12 @@ interface GroupsDetailPageProps {
}

export default async function GroupsDetailPage({ params }: GroupsDetailPageProps) {
const session = await auth();

if (!session?.user.permissions.includes("admin")) {
notFound();
}

const group = await api.group.getById({ id: params.id });
const tGeneral = await getScopedI18n("management.page.group.setting.general");
const tGroupAction = await getScopedI18n("group.action");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import React from "react";
import { notFound } from "next/navigation";
import { Card, CardSection, Divider, Group, Stack, Text, Title } from "@mantine/core";

import { api } from "@homarr/api/server";
import { auth } from "@homarr/auth/next";
import { objectKeys } from "@homarr/common";
import type { GroupPermissionKey } from "@homarr/definitions";
import { groupPermissions } from "@homarr/definitions";
Expand All @@ -16,6 +18,12 @@ interface GroupPermissionsPageProps {
}

export default async function GroupPermissionsPage({ params }: GroupPermissionsPageProps) {
const session = await auth();

if (!session?.user.permissions.includes("admin")) {
notFound();
}

const group = await api.group.getById({ id: params.id });
const tPermissions = await getScopedI18n("group.permission");
const t = await getI18n();
Expand Down
13 changes: 8 additions & 5 deletions packages/api/src/router/board.ts
Original file line number Diff line number Diff line change
Expand Up @@ -575,11 +575,14 @@ export const boardRouter = createTRPCRouter({
);
});
}),
importOldmarrConfig: protectedProcedure.input(importJsonFileSchema).mutation(async ({ input, ctx }) => {
const content = await input.file.text();
const oldmarr = oldmarrConfigSchema.parse(JSON.parse(content));
await importOldmarrAsync(ctx.db, oldmarr, input.configuration);
}),
importOldmarrConfig: permissionRequiredProcedure
.requiresPermission("board-create")
.input(importJsonFileSchema)
.mutation(async ({ input, ctx }) => {
const content = await input.file.text();
const oldmarr = oldmarrConfigSchema.parse(JSON.parse(content));
await importOldmarrAsync(ctx.db, oldmarr, input.configuration);
}),
});

const noBoardWithSimilarNameAsync = async (db: Database, name: string, ignoredIds: string[] = []) => {
Expand Down
11 changes: 7 additions & 4 deletions packages/api/src/router/invite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ import { invites } from "@homarr/db/schema/sqlite";
import { selectInviteSchema } from "@homarr/db/validationSchemas";
import { z } from "@homarr/validation";

import { createTRPCRouter, protectedProcedure } from "../trpc";
import { createTRPCRouter, permissionRequiredProcedure } from "../trpc";
import { throwIfCredentialsDisabled } from "./invite/checks";

export const inviteRouter = createTRPCRouter({
getAll: protectedProcedure
getAll: permissionRequiredProcedure
.requiresPermission("admin")
.output(
z.array(
selectInviteSchema
Expand Down Expand Up @@ -40,7 +41,8 @@ export const inviteRouter = createTRPCRouter({
},
});
}),
createInvite: protectedProcedure
createInvite: permissionRequiredProcedure
.requiresPermission("admin")
.input(
z.object({
expirationDate: z.date(),
Expand All @@ -65,7 +67,8 @@ export const inviteRouter = createTRPCRouter({
token,
};
}),
deleteInvite: protectedProcedure
deleteInvite: permissionRequiredProcedure
.requiresPermission("admin")
.input(
z.object({
id: z.string(),
Expand Down
7 changes: 4 additions & 3 deletions packages/api/src/router/serverSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@ import type { ServerSettings } from "@homarr/server-settings";
import { defaultServerSettingsKeys } from "@homarr/server-settings";
import { validation, z } from "@homarr/validation";

import { createTRPCRouter, onboardingProcedure, protectedProcedure, publicProcedure } from "../trpc";
import { createTRPCRouter, onboardingProcedure, permissionRequiredProcedure, publicProcedure } from "../trpc";
import { nextOnboardingStepAsync } from "./onboard/onboard-queries";

export const serverSettingsRouter = createTRPCRouter({
getCulture: publicProcedure.query(async ({ ctx }) => {
return await getServerSettingByKeyAsync(ctx.db, "culture");
}),
getAll: protectedProcedure.query(async ({ ctx }) => {
getAll: permissionRequiredProcedure.requiresPermission("admin").query(async ({ ctx }) => {
return await getServerSettingsAsync(ctx.db);
}),
saveSettings: protectedProcedure
saveSettings: permissionRequiredProcedure
.requiresPermission("admin")
.input(
z.object({
settingsKey: z.enum(defaultServerSettingsKeys),
Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/router/test/invite.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { inviteRouter } from "../invite";
const defaultSession = {
user: {
id: createId(),
permissions: [],
permissions: ["admin"],
colorScheme: "light",
},
expires: new Date().toISOString(),
Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/router/test/serverSettings.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ vi.mock("@homarr/auth", () => ({ auth: () => ({}) as Session }));
const defaultSession = {
user: {
id: createId(),
permissions: [],
permissions: ["admin"],
colorScheme: "light",
},
expires: new Date().toISOString(),
Expand Down
4 changes: 2 additions & 2 deletions packages/api/src/router/update-checker.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { updateCheckerRequestHandler } from "@homarr/request-handler/update-checker";

import { createTRPCRouter, protectedProcedure } from "../trpc";
import { createTRPCRouter, permissionRequiredProcedure } from "../trpc";

export const updateCheckerRouter = createTRPCRouter({
getAvailableUpdates: protectedProcedure.query(async () => {
getAvailableUpdates: permissionRequiredProcedure.requiresPermission("admin").query(async () => {
const handler = updateCheckerRequestHandler.handler({});
const data = await handler.getCachedOrUpdatedDataAsync({});
return data.data.availableUpdates;
Expand Down
6 changes: 3 additions & 3 deletions packages/api/src/router/widgets/dns-hole.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { controlsInputSchema } from "@homarr/integrations/types";
import { dnsHoleRequestHandler } from "@homarr/request-handler/dns-hole";

import { createManyIntegrationMiddleware, createOneIntegrationMiddleware } from "../../middlewares/integration";
import { createTRPCRouter, publicProcedure } from "../../trpc";
import { createTRPCRouter, protectedProcedure, publicProcedure } from "../../trpc";

export const dnsHoleRouter = createTRPCRouter({
summary: publicProcedure
Expand Down Expand Up @@ -62,7 +62,7 @@ export const dnsHoleRouter = createTRPCRouter({
});
}),

enable: publicProcedure
enable: protectedProcedure
.unstable_concat(createOneIntegrationMiddleware("interact", ...getIntegrationKindsByCategory("dnsHole")))
.mutation(async ({ ctx: { integration } }) => {
const client = integrationCreator(integration);
Expand All @@ -75,7 +75,7 @@ export const dnsHoleRouter = createTRPCRouter({
});
}),

disable: publicProcedure
disable: protectedProcedure
.input(controlsInputSchema)
.unstable_concat(createOneIntegrationMiddleware("interact", ...getIntegrationKindsByCategory("dnsHole")))
.mutation(async ({ ctx: { integration }, input }) => {
Expand Down
4 changes: 2 additions & 2 deletions packages/api/src/router/widgets/indexer-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { indexerManagerRequestHandler } from "@homarr/request-handler/indexer-ma

import type { IntegrationAction } from "../../middlewares/integration";
import { createManyIntegrationMiddleware } from "../../middlewares/integration";
import { createTRPCRouter, publicProcedure } from "../../trpc";
import { createTRPCRouter, protectedProcedure, publicProcedure } from "../../trpc";

const createIndexerManagerIntegrationMiddleware = (action: IntegrationAction) =>
createManyIntegrationMiddleware(action, ...getIntegrationKindsByCategory("indexerManager"));
Expand Down Expand Up @@ -54,7 +54,7 @@ export const indexerManagerRouter = createTRPCRouter({
};
});
}),
testAllIndexers: publicProcedure
testAllIndexers: protectedProcedure
.unstable_concat(createIndexerManagerIntegrationMiddleware("interact"))
.mutation(async ({ ctx }) => {
await Promise.all(
Expand Down
4 changes: 2 additions & 2 deletions packages/api/src/router/widgets/notebook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import { eq } from "@homarr/db";
import { items } from "@homarr/db/schema/sqlite";
import { z } from "@homarr/validation";

import { createTRPCRouter, publicProcedure } from "../../trpc";
import { createTRPCRouter, protectedProcedure } from "../../trpc";

export const notebookRouter = createTRPCRouter({
updateContent: publicProcedure
updateContent: protectedProcedure
.input(
z.object({
itemId: z.string(),
Expand Down
6 changes: 3 additions & 3 deletions packages/api/src/router/widgets/smart-home.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { z } from "@homarr/validation";

import type { IntegrationAction } from "../../middlewares/integration";
import { createOneIntegrationMiddleware } from "../../middlewares/integration";
import { createTRPCRouter, publicProcedure } from "../../trpc";
import { createTRPCRouter, protectedProcedure, publicProcedure } from "../../trpc";

const createSmartHomeIntegrationMiddleware = (action: IntegrationAction) =>
createOneIntegrationMiddleware(action, ...getIntegrationKindsByCategory("smartHomeServer"));
Expand Down Expand Up @@ -41,7 +41,7 @@ export const smartHomeRouter = createTRPCRouter({
};
});
}),
switchEntity: publicProcedure
switchEntity: protectedProcedure
.unstable_concat(createSmartHomeIntegrationMiddleware("interact"))
.input(z.object({ entityId: z.string() }))
.mutation(async ({ ctx: { integration }, input }) => {
Expand All @@ -53,7 +53,7 @@ export const smartHomeRouter = createTRPCRouter({

return success;
}),
executeAutomation: publicProcedure
executeAutomation: protectedProcedure
.unstable_concat(createSmartHomeIntegrationMiddleware("interact"))
.input(z.object({ automationId: z.string() }))
.mutation(async ({ ctx: { integration }, input }) => {
Expand Down

0 comments on commit 922101d

Please sign in to comment.