diff --git a/routes/NextNet API/Create Backend.bru b/routes/NextNet API/Backend API/Create Backend.bru similarity index 100% rename from routes/NextNet API/Create Backend.bru rename to routes/NextNet API/Backend API/Create Backend.bru diff --git a/routes/NextNet API/Backend API/Remove Backend.bru b/routes/NextNet API/Backend API/Remove Backend.bru new file mode 100644 index 0000000..2cceb2b --- /dev/null +++ b/routes/NextNet API/Backend API/Remove Backend.bru @@ -0,0 +1,23 @@ +meta { + name: Remove Backend + type: http + seq: 2 +} + +post { + url: http://127.0.0.1:3000/api/v1/backends/create + body: json + auth: none +} + +body:json { + { + "token": "f1b89cc337073476289ade17ffbe7a6419b4bd52aa7ede26114bffd76fa263b5cb1bcaf389462e1d9e7acb7f4b6a7c28152a9cc9af83e3ec862f1892b1", + "name": "PortCopier Route", + "description": "This is a test route for portcopier.", + "backend": "PortCopier", + "connectionDetails": { + "funny": true + } + } +} diff --git a/routes/NextNet API/Create Forward.bru b/routes/NextNet API/Forward API/Create Forward.bru similarity index 98% rename from routes/NextNet API/Create Forward.bru rename to routes/NextNet API/Forward API/Create Forward.bru index 20dfa60..bb4a084 100644 --- a/routes/NextNet API/Create Forward.bru +++ b/routes/NextNet API/Forward API/Create Forward.bru @@ -1,7 +1,7 @@ meta { name: Create Forward type: http - seq: 4 + seq: 1 } post { diff --git a/routes/NextNet API/Forward API/Remove Forward.bru b/routes/NextNet API/Forward API/Remove Forward.bru new file mode 100644 index 0000000..1399550 --- /dev/null +++ b/routes/NextNet API/Forward API/Remove Forward.bru @@ -0,0 +1,26 @@ +meta { + name: Remove Forward + type: http + seq: 2 +} + +post { + url: http://127.0.0.1:3000/api/v1/forward/create + body: json + auth: none +} + +body:json { + { + "token": "f1b89cc337073476289ade17ffbe7a6419b4bd52aa7ede26114bffd76fa263b5cb1bcaf389462e1d9e7acb7f4b6a7c28152a9cc9af83e3ec862f1892b1", + "name": "Test Route", + "description": "This is a test route for portcopier.", + + "sourceIP": "127.0.0.1", + "sourcePort": "8000", + + "destinationPort": "9000", + + "providerID": "1" + } +} diff --git a/routes/NextNet API/Get Permissions.bru b/routes/NextNet API/Get Permissions.bru index 66ec976..65787f8 100644 --- a/routes/NextNet API/Get Permissions.bru +++ b/routes/NextNet API/Get Permissions.bru @@ -1,7 +1,7 @@ meta { name: Get Permissions type: http - seq: 5 + seq: 1 } post { diff --git a/routes/NextNet API/Create User.bru b/routes/NextNet API/User API/Create User.bru similarity index 100% rename from routes/NextNet API/Create User.bru rename to routes/NextNet API/User API/Create User.bru diff --git a/routes/NextNet API/Log In User.bru b/routes/NextNet API/User API/Log In User.bru similarity index 95% rename from routes/NextNet API/Log In User.bru rename to routes/NextNet API/User API/Log In User.bru index 833bd2b..d0183a8 100644 --- a/routes/NextNet API/Log In User.bru +++ b/routes/NextNet API/User API/Log In User.bru @@ -1,7 +1,7 @@ meta { name: Log In User type: http - seq: 1 + seq: 2 } post { diff --git a/routes/NextNet API/Lookup User.bru b/routes/NextNet API/User API/Lookup User.bru similarity index 97% rename from routes/NextNet API/Lookup User.bru rename to routes/NextNet API/User API/Lookup User.bru index d413e85..a92b577 100644 --- a/routes/NextNet API/Lookup User.bru +++ b/routes/NextNet API/User API/Lookup User.bru @@ -1,7 +1,7 @@ meta { name: Lookup User type: http - seq: 7 + seq: 4 } post { diff --git a/routes/NextNet API/Remove User.bru b/routes/NextNet API/User API/Remove User.bru similarity index 97% rename from routes/NextNet API/Remove User.bru rename to routes/NextNet API/User API/Remove User.bru index 4b3713a..16240bd 100644 --- a/routes/NextNet API/Remove User.bru +++ b/routes/NextNet API/User API/Remove User.bru @@ -1,7 +1,7 @@ meta { name: Remove User type: http - seq: 6 + seq: 3 } post { diff --git a/src/index.ts b/src/index.ts index 483babb..fddae23 100644 --- a/src/index.ts +++ b/src/index.ts @@ -8,8 +8,10 @@ import { ServerOptions, SessionToken } from "./libs/types.js"; import { route as getPermissions } from "./routes/getPermissions.js"; import { route as backendCreate } from "./routes/backends/create.js"; +import { route as backendRemove } from "./routes/backends/remove.js"; import { route as forwardCreate } from "./routes/forward/create.js"; +import { route as forwardRemove } from "./routes/forward/remove.js"; import { route as userCreate } from "./routes/user/create.js"; import { route as userRemove } from "./routes/user/remove.js"; @@ -43,8 +45,10 @@ const fastify = Fastify({ getPermissions(fastify, prisma, sessionTokens, serverOptions); backendCreate(fastify, prisma, sessionTokens, serverOptions); +backendRemove(fastify, prisma, sessionTokens, serverOptions); forwardCreate(fastify, prisma, sessionTokens, serverOptions); +forwardRemove(fastify, prisma, sessionTokens, serverOptions); userCreate(fastify, prisma, sessionTokens, serverOptions); userRemove(fastify, prisma, sessionTokens, serverOptions); diff --git a/src/routes/ROUTE_PLAN.md b/src/routes/ROUTE_PLAN.md index 526c817..5ae0da2 100644 --- a/src/routes/ROUTE_PLAN.md +++ b/src/routes/ROUTE_PLAN.md @@ -3,13 +3,13 @@ - [x] /api/v1/users/login - [x] /api/v1/users/remove - [ ] /api/v1/users/modify -- [ ] /api/v1/users/search +- [x] /api/v1/users/search - [x] /api/v1/backends/create -- [ ] /api/v1/backends/remove +- [x] /api/v1/backends/remove - [ ] /api/v1/backends/modify - [ ] /api/v1/backends/search - [x] /api/v1/routes/create -- [ ] /api/v1/routes/remove +- [x] /api/v1/routes/remove - [ ] /api/v1/routes/modify - [ ] /api/v1/routes/search - [x] /api/v1/getPermissions \ No newline at end of file diff --git a/src/routes/backends/remove.ts b/src/routes/backends/remove.ts new file mode 100644 index 0000000..ef49e5e --- /dev/null +++ b/src/routes/backends/remove.ts @@ -0,0 +1,52 @@ +import type { PrismaClient } from "@prisma/client"; +import type { FastifyInstance } from "fastify"; + +import { ServerOptions, SessionToken } from "../../libs/types.js"; +import { hasPermissionByToken } from "../../libs/permissions.js"; + +export function route(fastify: FastifyInstance, prisma: PrismaClient, tokens: Record, options: ServerOptions) { + function hasPermission(token: string, permissionList: string[]): Promise { + return hasPermissionByToken(permissionList, token, tokens, prisma); + }; + + /** + * Creates a new route to use + */ + fastify.post("/api/v1/backends/remove", { + schema: { + body: { + type: "object", + required: ["token", "id"], + + properties: { + token: { type: "string" }, + id: { type: "number" } + } + } + } + }, async(req, res) => { + // @ts-ignore + const body: { + token: string, + id: number + } = req.body; + + if (!await hasPermission(body.token, [ + "backends.remove" + ])) { + return res.status(403).send({ + error: "Unauthorized" + }); + }; + + await prisma.desinationProvider.delete({ + where: { + id: body.id + } + }); + + return { + success: true + } + }); +} \ No newline at end of file diff --git a/src/routes/forward/remove.ts b/src/routes/forward/remove.ts new file mode 100644 index 0000000..706282e --- /dev/null +++ b/src/routes/forward/remove.ts @@ -0,0 +1,52 @@ +import type { PrismaClient } from "@prisma/client"; +import type { FastifyInstance } from "fastify"; + +import { ServerOptions, SessionToken } from "../../libs/types.js"; +import { hasPermissionByToken } from "../../libs/permissions.js"; + +export function route(fastify: FastifyInstance, prisma: PrismaClient, tokens: Record, options: ServerOptions) { + function hasPermission(token: string, permissionList: string[]): Promise { + return hasPermissionByToken(permissionList, token, tokens, prisma); + }; + + /** + * Creates a new route to use + */ + fastify.post("/api/v1/forward/remove", { + schema: { + body: { + type: "object", + required: ["token", "id"], + + properties: { + token: { type: "string" }, + id: { type: "number" } + } + } + } + }, async(req, res) => { + // @ts-ignore + const body: { + token: string, + id: number + } = req.body; + + if (!await hasPermission(body.token, [ + "routes.remove" + ])) { + return res.status(403).send({ + error: "Unauthorized" + }); + }; + + await prisma.forwardRule.delete({ + where: { + id: body.id + } + }); + + return { + success: true + } + }); +} \ No newline at end of file