RSCord/ServerSpacebarOld
Archived
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix token keypair issue

Browse Source
This commit is contained in:
murdle 2025-12-16 11:28:35 +02:00
parent 311d7f1960
commit e30f6b4142
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/public/custom/web/main.js
View File

@ -61,7 +61,7 @@
anchor.parentNode.insertBefore(infoSection, anchor); anchor.parentNode.insertBefore(infoSection, anchor);
} }
infoText.style.marginTop = isNewSection ? "0px" : "5px"; infoText.style.marginTop = isNewSection ? "0px" : "10px";
infoSection.append(infoText, dateText); infoSection.append(infoText, dateText);
} else { } else {
anchor.parentNode.insertBefore(infoText, anchor); anchor.parentNode.insertBefore(infoText, anchor);

41
src/util/util/Token.ts
View File

@ -149,40 +149,47 @@ export async function generateToken(id: string) {
// Get ECDSA keypair from file or generate it // Get ECDSA keypair from file or generate it
export async function loadOrGenerateKeypair() { export async function loadOrGenerateKeypair() {
let privateKey: crypto.KeyObject; let privateKey: string | crypto.KeyObject;
let publicKey: crypto.KeyObject; let publicKey: string | crypto.KeyObject;
if (existsSync("jwt.key") && existsSync("jwt.key.pub")) { if (existsSync("jwt.key") && existsSync("jwt.key.pub")) {
const [loadedPrivateKey, loadedPublicKey] = await Promise.all([ const [loadedPrivateKey, loadedPublicKey] = await Promise.all([
fs.readFile("jwt.key"), fs.readFile("jwt.key", "utf-8"),
fs.readFile("jwt.key.pub"), fs.readFile("jwt.key.pub", "utf-8"),
]); ]);
privateKey = crypto.createPrivateKey({ key: loadedPrivateKey, type: "sec1" }); privateKey = loadedPrivateKey;
publicKey = crypto.createPublicKey({ key: loadedPublicKey, type: "spki" }); publicKey = loadedPublicKey;
} else { } else {
console.log("[JWT] Generating new keypair"); console.log("[JWT] Generating new keypair");
const res = crypto.generateKeyPairSync("ec", { const res = crypto.generateKeyPairSync("ec", {
namedCurve: "secp521r1", namedCurve: "secp521r1",
publicKeyEncoding: {
type: "spki",
format: "pem"
},
privateKeyEncoding: {
type: "pkcs8",
format: "pem"
}
}); });
privateKey = res.privateKey;
publicKey = res.publicKey;
await Promise.all([ await Promise.all([
fs.writeFile( fs.writeFile("jwt.key", res.privateKey),
"jwt.key", fs.writeFile("jwt.key.pub", res.publicKey),
privateKey.export({ format: "pem", type: "sec1" }),
),
fs.writeFile(
"jwt.key.pub",
publicKey.export({ format: "pem", type: "spki" }),
),
]); ]);
privateKey = res.privateKey;
publicKey = res.publicKey;
} }
const publicKeyForHash = typeof publicKey === 'string'
? crypto.createPublicKey(publicKey)
: publicKey;
const fingerprint = crypto const fingerprint = crypto
.createHash("sha256") .createHash("sha256")
.update(publicKey.export({ format: "pem", type: "spki" })) .update(publicKeyForHash.export({ format: "pem", type: "spki" }))
.digest("hex"); .digest("hex");
return { privateKey, publicKey, fingerprint }; return { privateKey, publicKey, fingerprint };