dandri/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2026-04-26 15:17:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 2fa

Browse Source
This commit is contained in:
TheArcaneBrony
2022-08-06 02:33:12 +02:00
committed by GitHub
parent 40aee6d4fe e70a8a77f1
commit 88916865ee
19 changed files with 218 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@@ -9,4 +9,7 @@ files/
config.json
.vscode/settings.json
api/assets/plugins/*.js
api/assets/plugins/*.js
.idea/
*.code-workspace

0
api/assets/preload-plugins/autoRegister.js → api/assets/inline-plugins/autoRegister.js
View File

0
api/assets/preload-plugins/fosscord-login.js → api/assets/inline-plugins/fosscord-login.js
View File

27
api/assets/schemas.json
View File

@@ -13828,6 +13828,33 @@
"TotpEnableSchema": {
"type": "object",
"properties": {
"username": {
"minLength": 1,
"maxLength": 100,
"type": "string"
},
"discriminator": {
"type": "string"
},
"avatar": {
"type": [
"null",
"string"
]
},
"bio": {
"maxLength": 1024,
"type": "string"
},
"accent_color": {
"type": "integer"
},
"banner": {
"type": [
"null",
"string"
]
},
"password": {
"type": "string"
},

1
api/client_test/index.html
View File

@@ -7,6 +7,7 @@
<link rel="stylesheet" href="/assets/fosscord.css" />
<link id="logincss" rel="stylesheet" href="/assets/fosscord-login.css" />
<link id="customcss" rel="stylesheet" href="/assets/user.css" />
<!-- inline plugin marker -->
<!-- preload plugin marker -->
</head>

20
api/locales/he/auth.json
View File

@@ -1,16 +1,16 @@
{
"login": {
"INVALID_LOGIN": "מייל או מספר טלפון לא נמצאים במאגר",
"INVALID_PASSWORD": "סיסמא שגויה",
"ACCOUNT_DISABLED": "משתמש זה חסום / מבוטל"
"INVALID_LOGIN": "E-Mail or Phone not found",
"INVALID_PASSWORD": "Invalid Password",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "לא ניתן לאפשר רישום משתמשים חדשים",
"INVITE_ONLY": "עליך להיות מוזמן בכדי להרשם",
"EMAIL_INVALID": "מייל שגוי",
"EMAIL_ALREADY_REGISTERED": "מייל זה כבר רשום",
"DATE_OF_BIRTH_UNDERAGE": "{{years}} עלייך להיות מעל גיל",
"CONSENT_REQUIRED": ".עליך להסכים לתנאי השירות ולמדיניות הפרטיות",
"USERNAME_TOO_MANY_USERS": "ליותר מדי משתמשים יש שם משתמש זהה, אנא נסה אחר"
"REGISTRATION_DISABLED": "New user registration is disabled",
"INVITE_ONLY": "You must be invited to register",
"EMAIL_INVALID": "Invalid Email",
"EMAIL_ALREADY_REGISTERED": "Email is already registered",
"DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older",
"CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.",
"USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another"
}
}

22
api/locales/he/common.json
View File

@@ -1,18 +1,18 @@
{
"field": {
"BASE_TYPE_REQUIRED": "שדה זה חובה",
"BASE_TYPE_STRING": "שדה זה חייב להיות כטקסט",
"BASE_TYPE_NUMBER": "שדה זה חייב להיות מספר",
"BASE_TYPE_BIGINT": "השדה הזה חייב להיות ביגינט",
"BASE_TYPE_BOOLEAN": "השדה הזה חייב להיות בוליאני",
"BASE_TYPE_CHOICES": "({{types}}) שדה זה חייב להיות אחד מ",
"BASE_TYPE_CLASS": "{{type}} מסוג instance שדה זה חייב להיות",
"BASE_TYPE_REQUIRED": "This field is required",
"BASE_TYPE_STRING": "This field must be a string",
"BASE_TYPE_NUMBER": "This field must be a number",
"BASE_TYPE_BIGINT": "This field must be a bigint",
"BASE_TYPE_BOOLEAN": "This field must be a boolean",
"BASE_TYPE_CHOICES": "This field must be one of ({{types}})",
"BASE_TYPE_CLASS": "This field must be an instance of {{type}}",
"BASE_TYPE_OBJECT": "שדה זה חייב להיות אובייקט",
"BASE_TYPE_ARRAY": "שדה זה חייב להיות מערך",
"UNKOWN_FIELD": "{{key}} :מפתח לא ידוע",
"BASE_TYPE_CONSTANT": "{{value}} שדה זה חייב להיות",
"UNKOWN_FIELD": "מפתח לא ידוע: {{key}}",
"BASE_TYPE_CONSTANT": "שדה זה להיות {{value}}",
"EMAIL_TYPE_INVALID_EMAIL": "כתובת דואר אלקטרוני לא חוקית",
"DATE_TYPE_PARSE": "ISO8601 אמור להיות {{date}} לא ניתן לאתר",
"BASE_TYPE_BAD_LENGTH": "{{length}} האורך חייב להיות בין"
"DATE_TYPE_PARSE": "לא ניתן לנתח {{date}}. צריך להיות ISO8601",
"BASE_TYPE_BAD_LENGTH": "האורך חייב להיות בין {{length}}"
}
}

2
api/package.json
View File

@@ -48,7 +48,7 @@
"@types/jsonwebtoken": "^8.5.0",
"@types/morgan": "^1.9.3",
"@types/multer": "^1.4.5",
"@types/node": "^14.17.9",
"@types/node": "^14.18.22",
"@types/node-fetch": "^2.5.5",
"@types/supertest": "^2.0.11",
"@zerollup/ts-transform-paths": "^1.7.18",

170
api/src/middlewares/TestClient.ts
View File

@@ -1,54 +1,46 @@
import express, { Request, Response, Application } from "express";
import fs from "fs";
import fs, { writeFile } from "fs";
import path from "path";
import fetch, { Response as FetchResponse } from "node-fetch";
import fetch, { Response as FetchResponse, Headers } from "node-fetch";
import ProxyAgent from 'proxy-agent';
import { Config } from "@fosscord/util";
import { AssetCacheItem } from "../util/entities/AssetCacheItem"
import { FileLogger } from "typeorm";
export default function TestClient(app: Application) {
const agent = new ProxyAgent();
const assetCache = new Map<string, { response: FetchResponse; buffer: Buffer }>();
const indexHTML = fs.readFileSync(path.join(__dirname, "..", "..", "client_test", "index.html"), { encoding: "utf8" });
var html = indexHTML;
const CDN_ENDPOINT = (Config.get().cdn.endpointClient || Config.get()?.cdn.endpointPublic || process.env.CDN || "").replace(
/(https?)?(:\/\/?)/g,
""
);
const GATEWAY_ENDPOINT = Config.get().gateway.endpointClient || Config.get()?.gateway.endpointPublic || process.env.GATEWAY || "";
if (CDN_ENDPOINT) {
html = html.replace(/CDN_HOST: .+/, `CDN_HOST: \`${CDN_ENDPOINT}\`,`);
}
if (GATEWAY_ENDPOINT) {
html = html.replace(/GATEWAY_ENDPOINT: .+/, `GATEWAY_ENDPOINT: \`${GATEWAY_ENDPOINT}\`,`);
}
// inline plugins
var files = fs.readdirSync(path.join(__dirname, "..", "..", "assets", "preload-plugins"));
var plugins = "";
files.forEach(x =>{if(x.endsWith(".js")) plugins += `<script>${fs.readFileSync(path.join(__dirname, "..", "..", "assets", "preload-plugins", x))}</script>\n`; });
html = html.replaceAll("<!-- preload plugin marker -->", plugins);
// plugins
files = fs.readdirSync(path.join(__dirname, "..", "..", "assets", "plugins"));
plugins = "";
files.forEach(x =>{if(x.endsWith(".js")) plugins += `<script src='/assets/plugins/${x}'></script>\n`; });
html = html.replaceAll("<!-- plugin marker -->", plugins);
//preload plugins
files = fs.readdirSync(path.join(__dirname, "..", "..", "assets", "preload-plugins"));
plugins = "";
files.forEach(x =>{if(x.endsWith(".js")) plugins += `<script>${fs.readFileSync(path.join(__dirname, "..", "..", "assets", "preload-plugins", x))}</script>\n`; });
html = html.replaceAll("<!-- preload plugin marker -->", plugins);
app.use("/assets", express.static(path.join(__dirname, "..", "..", "assets")));
//build client page
let html = fs.readFileSync(path.join(__dirname, "..", "..", "client_test", "index.html"), { encoding: "utf8" });
html = applyEnv(html);
html = applyInlinePlugins(html);
html = applyPlugins(html);
html = applyPreloadPlugins(html);
//load asset cache
let newAssetCache: Map<string, AssetCacheItem> = new Map<string, AssetCacheItem>();
if(!fs.existsSync(path.join(__dirname, "..", "..", "assets", "cache"))) {
fs.mkdirSync(path.join(__dirname, "..", "..", "assets", "cache"));
}
if(fs.existsSync(path.join(__dirname, "..", "..", "assets", "cache", "index.json"))) {
let rawdata = fs.readFileSync(path.join(__dirname, "..", "..", "assets", "cache", "index.json"));
newAssetCache = new Map<string, AssetCacheItem>(Object.entries(JSON.parse(rawdata.toString())));
}
app.use("/assets", express.static(path.join(__dirname, "..", "..", "assets")));
app.get("/assets/:file", async (req: Request, res: Response) => {
delete req.headers.host;
var response: FetchResponse;
var buffer: Buffer;
const cache = assetCache.get(req.params.file);
if (!cache) {
let response: FetchResponse;
let buffer: Buffer;
let assetCacheItem: AssetCacheItem = new AssetCacheItem(req.params.file);
if(newAssetCache.has(req.params.file)){
assetCacheItem = newAssetCache.get(req.params.file)!;
assetCacheItem.Headers.forEach((value: any, name: any) => {
res.set(name, value);
});
}
else {
console.log(`CACHE MISS! Asset file: ${req.params.file}`);
response = await fetch(`https://discord.com/assets/${req.params.file}`, {
agent,
// @ts-ignore
@@ -56,34 +48,24 @@ export default function TestClient(app: Application) {
...req.headers
}
});
buffer = await response.buffer();
} else {
response = cache.response;
buffer = cache.buffer;
//set cache info
assetCacheItem.Headers = Object.fromEntries(stripHeaders(response.headers));
assetCacheItem.FilePath = path.join(__dirname, "..", "..", "assets", "cache", req.params.file);
assetCacheItem.Key = req.params.file;
//add to cache and save
newAssetCache.set(req.params.file, assetCacheItem);
fs.writeFileSync(path.join(__dirname, "..", "..", "assets", "cache", "index.json"), JSON.stringify(Object.fromEntries(newAssetCache), null, 4));
//download file
fs.writeFileSync(assetCacheItem.FilePath, await response.buffer());
}
response.headers.forEach((value, name) => {
if (
[
"content-length",
"content-security-policy",
"strict-transport-security",
"set-cookie",
"transfer-encoding",
"expect-ct",
"access-control-allow-origin",
"content-encoding"
].includes(name.toLowerCase())
) {
return;
}
assetCacheItem.Headers.forEach((value: string, name: string) => {
res.set(name, value);
});
assetCache.set(req.params.file, { buffer, response });
return res.send(buffer);
return res.send(fs.readFileSync(assetCacheItem.FilePath));
});
app.get("/developers*", (req: Request, res: Response) => {
app.get("/developers*", (_req: Request, res: Response) => {
const { useTestClient } = Config.get().client;
res.set("Cache-Control", "public, max-age=" + 60 * 60 * 24);
res.set("content-type", "text/html");
@@ -104,4 +86,62 @@ export default function TestClient(app: Application) {
res.send(html);
});
}
function applyEnv(html: string): string {
const CDN_ENDPOINT = (Config.get().cdn.endpointClient || Config.get()?.cdn.endpointPublic || process.env.CDN || "").replace(
/(https?)?(:\/\/?)/g,
""
);
const GATEWAY_ENDPOINT = Config.get().gateway.endpointClient || Config.get()?.gateway.endpointPublic || process.env.GATEWAY || "";
if (CDN_ENDPOINT) {
html = html.replace(/CDN_HOST: .+/, `CDN_HOST: \`${CDN_ENDPOINT}\`,`);
}
if (GATEWAY_ENDPOINT) {
html = html.replace(/GATEWAY_ENDPOINT: .+/, `GATEWAY_ENDPOINT: \`${GATEWAY_ENDPOINT}\`,`);
}
return html;
}
function applyPlugins(html: string): string {
// plugins
let files = fs.readdirSync(path.join(__dirname, "..", "..", "assets", "plugins"));
let plugins = "";
files.forEach(x =>{if(x.endsWith(".js")) plugins += `<script src='/assets/plugins/${x}'></script>\n`; });
return html.replaceAll("<!-- plugin marker -->", plugins);
}
function applyInlinePlugins(html: string): string{
// inline plugins
let files = fs.readdirSync(path.join(__dirname, "..", "..", "assets", "inline-plugins"));
let plugins = "";
files.forEach(x =>{if(x.endsWith(".js")) plugins += `<script src='/assets/inline-plugins/${x}'></script>\n\n`; });
return html.replaceAll("<!-- inline plugin marker -->", plugins);
}
function applyPreloadPlugins(html: string): string{
//preload plugins
let files = fs.readdirSync(path.join(__dirname, "..", "..", "assets", "preload-plugins"));
let plugins = "";
files.forEach(x =>{if(x.endsWith(".js")) plugins += `<script>${fs.readFileSync(path.join(__dirname, "..", "..", "assets", "preload-plugins", x))}</script>\n`; });
return html.replaceAll("<!-- preload plugin marker -->", plugins);
}
function stripHeaders(headers: Headers): Headers {
[
"content-length",
"content-security-policy",
"strict-transport-security",
"set-cookie",
"transfer-encoding",
"expect-ct",
"access-control-allow-origin",
"content-encoding"
].forEach(headerName => {
headers.delete(headerName);
});
return headers;
}

1
api/src/routes/users/@me/index.ts
View File

@@ -11,6 +11,7 @@ export interface UserModifySchema {
* @maxLength 100
*/
username?: string;
discriminator?: string;
avatar?: string | null;
/**
* @maxLength 1024

43
api/src/routes/users/@me/notes.ts
View File

@@ -1,37 +1,58 @@
import { Request, Response, Router } from "express";
import { route } from "@fosscord/api";
import { User, emitEvent } from "@fosscord/util";
import { User, Note, emitEvent, Snowflake } from "@fosscord/util";
const router: Router = Router();
router.get("/:id", route({}), async (req: Request, res: Response) => {
const { id } = req.params;
const user = await User.findOneOrFail({ where: { id: req.user_id }, select: ["notes"] });
const note = user.notes[id];
const note = await Note.findOneOrFail({
where: {
owner: { id: req.user_id },
target: { id: id },
}
});
return res.json({
note: note,
note: note?.content,
note_user_id: id,
user_id: user.id,
user_id: req.user_id,
});
});
router.put("/:id", route({}), async (req: Request, res: Response) => {
const { id } = req.params;
const user = await User.findOneOrFail({ where: { id: req.user_id } });
const noteUser = await User.findOneOrFail({ where: { id: id }}); //if noted user does not exist throw
const owner = await User.findOneOrFail({ where: { id: req.user_id } });
const target = await User.findOneOrFail({ where: { id: id } }); //if noted user does not exist throw
const { note } = req.body;
await User.update({ id: req.user_id }, { notes: { ...user.notes, [noteUser.id]: note } });
if (note && note.length) {
// upsert a note
if (await Note.findOne({ owner: { id: owner.id }, target: { id: target.id } })) {
Note.update(
{ owner: { id: owner.id }, target: { id: target.id } },
{ owner, target, content: note }
);
}
else {
Note.insert(
{ id: Snowflake.generate(), owner, target, content: note }
);
}
}
else {
await Note.delete({ owner: { id: owner.id }, target: { id: target.id } });
}
await emitEvent({
event: "USER_NOTE_UPDATE",
data: {
note: note,
id: noteUser.id
id: target.id
},
user_id: user.id,
})
user_id: owner.id,
});
return res.status(204);
});

3
api/src/util/entities/AssetCacheItem.ts Normal file
View File

@@ -0,0 +1,3 @@
export class AssetCacheItem {
constructor(public Key: string, public FilePath: string = "", public Headers: any = null as any) {}
}

1
api/src/util/index.ts
View File

@@ -6,3 +6,4 @@ export * from "./utility/RandomInviteID";
export * from "./handlers/route";
export * from "./utility/String";
export * from "./handlers/Voice";
export * from "./entities/AssetCacheItem";

BIN
bundle/package-lock.json generated
View File

Binary file not shown.

3
fosscord-server.code-workspace
View File

@@ -24,6 +24,5 @@
{
"path": "webrtc"
}
],
"settings": {}
]
}

BIN
package-lock.json generated Normal file
View File

Binary file not shown.

18
util/src/entities/Note.ts Normal file
View File

@@ -0,0 +1,18 @@
import { Column, Entity, JoinColumn, ManyToOne, Unique } from "typeorm";
import { BaseClass } from "./BaseClass";
import { User } from "./User";
@Entity("notes")
@Unique(["owner", "target"])
export class Note extends BaseClass {
@JoinColumn({ name: "owner_id" })
@ManyToOne(() => User, { onDelete: "CASCADE" })
owner: User;
@JoinColumn({ name: "target_id" })
@ManyToOne(() => User, { onDelete: "CASCADE" })
target: User;
@Column()
content: string;
}

4
util/src/entities/User.ts
View File

@@ -5,6 +5,7 @@ import { Relationship } from "./Relationship";
import { ConnectedAccount } from "./ConnectedAccount";
import { Config, FieldErrors, Snowflake, trimSpecial } from "..";
import { Member, Session } from ".";
import { Note } from "./Note";
export enum PublicUserEnum {
username,
@@ -174,9 +175,6 @@ export class User extends BaseClass {
@Column({ type: "simple-json", select: false })
extended_settings: string;
@Column({ type: "simple-json" })
notes: { [key: string]: string }; //key is ID of user
toPublicUser() {
const user: any = {};
PublicUserProjection.forEach((x) => {

3
util/src/entities/index.ts
View File

@@ -28,4 +28,5 @@ export * from "./User";
export * from "./VoiceState";
export * from "./Webhook";
export * from "./ClientRelease";
export * from "./BackupCodes";
export * from "./BackupCodes";
export * from "./Note";