Spacebar/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2024-11-22 02:12:40 +01:00
Code Issues Releases Activity

Merge pull request #1197 from DEVTomatoCake/feat/improve-no-authorization-routes

Browse Source 
Add method to NO_AUTHORIZATION_ROUTES
This commit is contained in:
Madeline 2024-08-24 17:48:33 +10:00 committed by GitHub
commit e3707e6a56
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 41 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
assets/openapi.json
View File

@ -10936,13 +10936,8 @@
]
}
},
"/scheduled-maintenances/upcoming_json/scheduled-maintenances/upcoming.json": {
"/scheduled-maintenances/upcoming.json/": {
"get": {
"security": [
{
"bearer": []
}
],
"responses": {
"default": {
"description": "No description available"
@ -10950,12 +10945,6 @@
},
"tags": [
"scheduled-maintenances"
],
"x-badges": [
{
"label": "Spacebar-only",
"color": "red"
}
]
}
},
@ -11341,11 +11330,6 @@
},
"/invites/{code}": {
"get": {
"security": [
{
"bearer": []
}
],
"responses": {
"200": {
"description": "",

5
scripts/openapi.js
View File

@ -134,8 +134,9 @@ function apiRoutes(missingRoutes) {
if (
!NO_AUTHORIZATION_ROUTES.some((x) => {
if (typeof x === "string") return path.startsWith(x);
return x.test(path);
if (typeof x === "string")
return (method.toUpperCase() + " " + path).startsWith(x);
return x.test(method.toUpperCase() + " " + path);
})
) {
obj.security = [{ bearer: [] }];

56
src/api/middlewares/Authentication.ts
View File

@ -1,17 +1,17 @@
/*
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
Copyright (C) 2023 Spacebar and Spacebar Contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
@ -23,37 +23,37 @@ import { HTTPError } from "lambert-server";
export const NO_AUTHORIZATION_ROUTES = [
// Authentication routes
"/auth/login",
"/auth/register",
"/auth/location-metadata",
"/auth/mfa/totp",
"/auth/mfa/webauthn",
"/auth/verify",
"/auth/forgot",
"/auth/reset",
"POST /auth/login",
"POST /auth/register",
"GET /auth/location-metadata",
"POST /auth/mfa/",
"POST /auth/verify",
"POST /auth/forgot",
"POST /auth/reset",
"GET /invites/",
// Routes with a seperate auth system
/\/webhooks\/\d+\/\w+\/?/, // no token requires auth
/POST \/webhooks\/\d+\/\w+\/?/, // no token requires auth
// Public information endpoints
"/ping",
"/gateway",
"/experiments",
"/updates",
"/download",
"/scheduled-maintenances/upcoming.json",
"GET /ping",
"GET /gateway",
"GET /experiments",
"GET /updates",
"GET /download",
"GET /scheduled-maintenances/upcoming.json",
// Public kubernetes integration
"/-/readyz",
"/-/healthz",
"GET /-/readyz",
"GET /-/healthz",
// Client analytics
"/science",
"/track",
"POST /science",
"POST /track",
// Public policy pages
"/policies/instance",
"GET /policies/instance/",
// Oauth callback
"/oauth2/callback",
// Asset delivery
/\/guilds\/\d+\/widget\.(json|png)/,
/GET \/guilds\/\d+\/widget\.(json|png)/,
// Connections
/\/connections\/\w+\/callback/,
/POST \/connections\/\w+\/callback/,
];
export const API_PREFIX = /^\/api(\/v\d+)?/;
@ -78,11 +78,11 @@ export async function Authentication(
) {
if (req.method === "OPTIONS") return res.sendStatus(204);
const url = req.url.replace(API_PREFIX, "");
if (url.startsWith("/invites") && req.method === "GET") return next();
if (
NO_AUTHORIZATION_ROUTES.some((x) => {
if (typeof x === "string") return url.startsWith(x);
return x.test(url);
if (typeof x === "string")
return (req.method + " " + url).startsWith(x);
return x.test(req.method + " " + url);
})
)
return next();

22
src/api/routes/scheduled-maintenances/upcoming_json.ts → src/api/routes/scheduled-maintenances/upcoming.json.ts
View File

@ -1,17 +1,17 @@
/*
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
Copyright (C) 2023 Spacebar and Spacebar Contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
@ -20,15 +20,11 @@ import { Router, Request, Response } from "express";
import { route } from "@spacebar/api";
const router = Router();
router.get(
"/scheduled-maintenances/upcoming.json",
route({}),
async (req: Request, res: Response) => {
res.json({
page: {},
scheduled_maintenances: {},
});
},
);
router.get("/", route({}), async (req: Request, res: Response) => {
res.json({
page: {},
scheduled_maintenances: {},
});
});
export default router;