Merge branch 'development' into main

backend/src/auth/auth.controller.ts

@@ -6,7 +6,6 @@ import {
   Post,
 } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
-import { UserDTO } from "src/user/dto/user.dto";
 
 import { AuthService } from "./auth.service";
 import { AuthRegisterDTO } from "./dto/authRegister.dto";

backend/src/file/file.controller.ts

@@ -10,23 +10,21 @@ import {
   UseGuards,
   UseInterceptors,
 } from "@nestjs/common";
-import { ConfigService } from "@nestjs/config";
 import { FileInterceptor } from "@nestjs/platform-express";
 import { Response } from "express";
 import { JwtGuard } from "src/auth/guard/jwt.guard";
 import { FileDownloadGuard } from "src/file/guard/fileDownload.guard";
 import { ShareDTO } from "src/share/dto/share.dto";
+import { ShareOwnerGuard } from "src/share/guard/shareOwner.guard";
 import { ShareSecurityGuard } from "src/share/guard/shareSecurity.guard";
 import { FileService } from "./file.service";
 
 @Controller("shares/:shareId/files")
 export class FileController {
-  constructor(
-    private fileService: FileService,
-    private config: ConfigService
-  ) {}
+  constructor(private fileService: FileService) {}
+
   @Post()
-  @UseGuards(JwtGuard)
+  @UseGuards(JwtGuard, ShareOwnerGuard)
   @UseInterceptors(
     FileInterceptor("file", {
       dest: "./uploads/_temp/",
@@ -43,7 +41,7 @@ export class FileController {
     file: Express.Multer.File,
     @Param("shareId") shareId: string
   ) {
-    return new ShareDTO().from( await this.fileService.create(file, shareId));
+    return new ShareDTO().from(await this.fileService.create(file, shareId));
   }
 
   @Get(":fileId/download")

backend/src/share/guard/shareOwner.guard.ts

@@ -0,0 +1,33 @@
+import { CanActivate, ExecutionContext, Injectable } from "@nestjs/common";
+import { Reflector } from "@nestjs/core";
+import { User } from "@prisma/client";
+import { Request } from "express";
+import { ExtractJwt } from "passport-jwt";
+import { PrismaService } from "src/prisma/prisma.service";
+import { ShareService } from "src/share/share.service";
+
+@Injectable()
+export class ShareOwnerGuard implements CanActivate {
+  constructor(
+    private prisma: PrismaService
+  ) {}
+
+  async canActivate(context: ExecutionContext) {
+    const request: Request = context.switchToHttp().getRequest();
+    const shareId = Object.prototype.hasOwnProperty.call(
+      request.params,
+      "shareId"
+    )
+      ? request.params.shareId
+      : request.params.id;
+
+    const share = await this.prisma.share.findUnique({
+      where: { id: shareId },
+      include: { security: true },
+    });
+
+
+
+    return share.creatorId == (request.user as User).id;
+  }
+}

backend/src/share/share.controller.ts

@@ -16,6 +16,7 @@ import { MyShareDTO } from "./dto/myShare.dto";
 import { ShareDTO } from "./dto/share.dto";
 import { ShareMetaDataDTO } from "./dto/shareMetaData.dto";
 import { SharePasswordDto } from "./dto/sharePassword.dto";
+import { ShareOwnerGuard } from "./guard/shareOwner.guard";
 import { ShareSecurityGuard } from "./guard/shareSecurity.guard";
 import { ShareService } from "./share.service";
 
@@ -50,14 +51,14 @@ export class ShareController {
   }
 
   @Delete(":id")
-  @UseGuards(JwtGuard)
-  async remove(@Param("id") id: string, @GetUser() user: User) {
-    await this.shareService.remove(id, user.id);
+  @UseGuards(JwtGuard, ShareOwnerGuard)
+  async remove(@Param("id") id: string) {
+    await this.shareService.remove(id);
   }
 
   @Post(":id/complete")
   @HttpCode(202)
-  @UseGuards(JwtGuard)
+  @UseGuards(JwtGuard, ShareOwnerGuard)
   async complete(@Param("id") id: string) {
     return new ShareDTO().from(await this.shareService.complete(id));
   }

backend/src/share/share.service.ts

@@ -132,15 +132,13 @@ export class ShareService {
     return share;
   }
 
-  async remove(shareId: string, userId: string) {
+  async remove(shareId: string) {
     const share = await this.prisma.share.findUnique({
       where: { id: shareId },
     });
 
     if (!share) throw new NotFoundException("Share not found");
 
-    if (share.creatorId != userId) throw new ForbiddenException();
-
     await this.prisma.share.delete({ where: { id: shareId } });
   }
 

frontend/src/pages/account/shares.tsx

@@ -5,6 +5,7 @@ import {
   Group,
   LoadingOverlay,
   Space,
+  Stack,
   Table,
   Text,
   Title,
@@ -39,14 +40,14 @@ const MyShares = () => {
       </Title>
       {shares.length == 0 ? (
         <Center style={{ height: "70vh" }}>
-          <Group direction="column" align="center" spacing={10}>
+          <Stack align="center" spacing={10}>
             <Title order={3}>It's empty here 👀</Title>
             <Text>You don't have any shares.</Text>
             <Space h={5} />
             <Button component={NextLink} href="/upload" variant="light">
               Create one
             </Button>
-          </Group>
+          </Stack>
         </Center>
       ) : (
         <Table>

frontend/src/pages/index.tsx

@@ -16,7 +16,7 @@ import { Check } from "tabler-icons-react";
 import Meta from "../components/Meta";
 import useUser from "../hooks/user.hook";
 
-const { publicRuntimeConfig } = getConfig()
+const { publicRuntimeConfig } = getConfig();
 
 const useStyles = createStyles((theme) => ({
   inner: {
@@ -106,15 +106,21 @@ export default function Home() {
                 }
               >
                 <List.Item>
-                  <b>Self-Hosted</b> - Host Pingvin Share on your own machine.
+                  <div>
+                    <b>Self-Hosted</b> - Host Pingvin Share on your own machine.
+                  </div>
                 </List.Item>
                 <List.Item>
-                  <b>Privacy</b> - Your files are your files and should never
-                  get into the hands of third parties.
+                  <div>
+                    <b>Privacy</b> - Your files are your files and should never
+                    get into the hands of third parties.
+                  </div>
                 </List.Item>
                 <List.Item>
-                  <b>No annoying file size limit</b> - Upload as big files as
-                  you want. Only your hard drive will be your limit.
+                  <div>
+                    <b>No annoying file size limit</b> - Upload as big files as
+                    you want. Only your hard drive will be your limit.
+                  </div>
                 </List.Item>
               </List>