mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-26 05:43:09 +02:00
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/414
This commit is contained in:
commit
cce106d2eb
34 changed files with 267 additions and 174 deletions
|
@ -103,3 +103,9 @@ mergeManifests:
|
||||||
only:
|
only:
|
||||||
- stable
|
- stable
|
||||||
- develop
|
- develop
|
||||||
|
|
||||||
|
include:
|
||||||
|
- template: Jobs/Dependency-Scanning.latest.gitlab-ci.yml
|
||||||
|
- template: Jobs/License-Scanning.latest.gitlab-ci.yml
|
||||||
|
- template: Jobs/SAST.latest.gitlab-ci.yml
|
||||||
|
- template: Jobs/Secret-Detection.latest.gitlab-ci.yml
|
||||||
|
|
6
.njsscan
Normal file
6
.njsscan
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
- ignore-filenames:
|
||||||
|
# there may be a "header injection", I'm pretty sure we don't
|
||||||
|
# trigger it given the way we use this, but please remove this
|
||||||
|
# when/if the library gets updated
|
||||||
|
- packages/frontend/assets/libopenmpt.js
|
4
.semgrepignore
Normal file
4
.semgrepignore
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
/packages/frontend/.storybook/
|
||||||
|
/packages/frontend/assets/
|
||||||
|
/scripts/
|
||||||
|
/tossface-emojis/
|
|
@ -49,7 +49,7 @@ const primaries = {
|
||||||
};
|
};
|
||||||
|
|
||||||
// 何故か文字列にバックスペース文字が混入することがあり、YAMLが壊れるので取り除く
|
// 何故か文字列にバックスペース文字が混入することがあり、YAMLが壊れるので取り除く
|
||||||
const clean = (text) => text.replace(new RegExp(String.fromCodePoint(0x08), 'g'), '');
|
const clean = (text) => text.replace(new RegExp(String.fromCodePoint(0x08), 'g'), ''); // eslint-disable-line detect-non-literal-regexp
|
||||||
|
|
||||||
export function build() {
|
export function build() {
|
||||||
const locales = languages.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(new URL(`${c}.yml`, import.meta.url), 'utf-8'))) || {}, a), {});
|
const locales = languages.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(new URL(`${c}.yml`, import.meta.url), 'utf-8'))) || {}, a), {});
|
||||||
|
|
|
@ -474,176 +474,176 @@ export class MfmService {
|
||||||
}
|
}
|
||||||
|
|
||||||
const handlers: {
|
const handlers: {
|
||||||
[K in mfm.MfmNode['type']]: (node: mfm.NodeType<K>) => any;
|
[K in mfm.MfmNode['type']]: (node: mfm.NodeType<K>) => any;
|
||||||
} = {
|
} = {
|
||||||
async bold(node) {
|
async bold(node) {
|
||||||
const el = doc.createElement('span');
|
const el = doc.createElement('span');
|
||||||
el.textContent = '**';
|
el.textContent = '**';
|
||||||
await appendChildren(node.children, el);
|
await appendChildren(node.children, el);
|
||||||
el.textContent += '**';
|
el.textContent += '**';
|
||||||
return el;
|
return el;
|
||||||
},
|
},
|
||||||
|
|
||||||
async small(node) {
|
async small(node) {
|
||||||
const el = doc.createElement('small');
|
const el = doc.createElement('small');
|
||||||
await appendChildren(node.children, el);
|
await appendChildren(node.children, el);
|
||||||
return el;
|
return el;
|
||||||
},
|
},
|
||||||
|
|
||||||
async strike(node) {
|
async strike(node) {
|
||||||
const el = doc.createElement('span');
|
const el = doc.createElement('span');
|
||||||
el.textContent = '~~';
|
el.textContent = '~~';
|
||||||
await appendChildren(node.children, el);
|
await appendChildren(node.children, el);
|
||||||
el.textContent += '~~';
|
el.textContent += '~~';
|
||||||
return el;
|
return el;
|
||||||
},
|
},
|
||||||
|
|
||||||
async italic(node) {
|
async italic(node) {
|
||||||
const el = doc.createElement('span');
|
const el = doc.createElement('span');
|
||||||
el.textContent = '*';
|
el.textContent = '*';
|
||||||
await appendChildren(node.children, el);
|
await appendChildren(node.children, el);
|
||||||
el.textContent += '*';
|
el.textContent += '*';
|
||||||
return el;
|
return el;
|
||||||
},
|
},
|
||||||
|
|
||||||
async fn(node) {
|
async fn(node) {
|
||||||
const el = doc.createElement('span');
|
const el = doc.createElement('span');
|
||||||
el.textContent = '*';
|
el.textContent = '*';
|
||||||
await appendChildren(node.children, el);
|
await appendChildren(node.children, el);
|
||||||
el.textContent += '*';
|
el.textContent += '*';
|
||||||
return el;
|
return el;
|
||||||
},
|
},
|
||||||
|
|
||||||
blockCode(node) {
|
blockCode(node) {
|
||||||
const pre = doc.createElement('pre');
|
const pre = doc.createElement('pre');
|
||||||
const inner = doc.createElement('code');
|
const inner = doc.createElement('code');
|
||||||
|
|
||||||
const nodes = node.props.code
|
const nodes = node.props.code
|
||||||
.split(/\r\n|\r|\n/)
|
.split(/\r\n|\r|\n/)
|
||||||
.map((x) => doc.createTextNode(x));
|
.map((x) => doc.createTextNode(x));
|
||||||
|
|
||||||
for (const x of intersperse<FIXME | 'br'>('br', nodes)) {
|
for (const x of intersperse<FIXME | 'br'>('br', nodes)) {
|
||||||
inner.appendChild(x === 'br' ? doc.createElement('br') : x);
|
inner.appendChild(x === 'br' ? doc.createElement('br') : x);
|
||||||
}
|
}
|
||||||
|
|
||||||
pre.appendChild(inner);
|
pre.appendChild(inner);
|
||||||
return pre;
|
return pre;
|
||||||
},
|
},
|
||||||
|
|
||||||
async center(node) {
|
async center(node) {
|
||||||
const el = doc.createElement('div');
|
const el = doc.createElement('div');
|
||||||
await appendChildren(node.children, el);
|
await appendChildren(node.children, el);
|
||||||
return el;
|
return el;
|
||||||
},
|
},
|
||||||
|
|
||||||
emojiCode(node) {
|
emojiCode(node) {
|
||||||
return doc.createTextNode(`\u200B:${node.props.name}:\u200B`);
|
return doc.createTextNode(`\u200B:${node.props.name}:\u200B`);
|
||||||
},
|
},
|
||||||
|
|
||||||
unicodeEmoji(node) {
|
unicodeEmoji(node) {
|
||||||
return doc.createTextNode(node.props.emoji);
|
return doc.createTextNode(node.props.emoji);
|
||||||
},
|
},
|
||||||
|
|
||||||
hashtag: (node) => {
|
hashtag: (node) => {
|
||||||
const a = doc.createElement('a');
|
const a = doc.createElement('a');
|
||||||
a.setAttribute('href', `${this.config.url}/tags/${node.props.hashtag}`);
|
a.setAttribute('href', `${this.config.url}/tags/${node.props.hashtag}`);
|
||||||
a.textContent = `#${node.props.hashtag}`;
|
a.textContent = `#${node.props.hashtag}`;
|
||||||
a.setAttribute('rel', 'tag');
|
a.setAttribute('rel', 'tag');
|
||||||
a.setAttribute('class', 'hashtag');
|
a.setAttribute('class', 'hashtag');
|
||||||
return a;
|
return a;
|
||||||
},
|
},
|
||||||
|
|
||||||
inlineCode(node) {
|
inlineCode(node) {
|
||||||
const el = doc.createElement('code');
|
const el = doc.createElement('code');
|
||||||
el.textContent = node.props.code;
|
el.textContent = node.props.code;
|
||||||
return el;
|
return el;
|
||||||
},
|
},
|
||||||
|
|
||||||
mathInline(node) {
|
mathInline(node) {
|
||||||
const el = doc.createElement('code');
|
const el = doc.createElement('code');
|
||||||
el.textContent = node.props.formula;
|
el.textContent = node.props.formula;
|
||||||
return el;
|
return el;
|
||||||
},
|
},
|
||||||
|
|
||||||
mathBlock(node) {
|
mathBlock(node) {
|
||||||
const el = doc.createElement('code');
|
const el = doc.createElement('code');
|
||||||
el.textContent = node.props.formula;
|
el.textContent = node.props.formula;
|
||||||
return el;
|
return el;
|
||||||
},
|
},
|
||||||
|
|
||||||
async link(node) {
|
async link(node) {
|
||||||
const a = doc.createElement('a');
|
const a = doc.createElement('a');
|
||||||
a.setAttribute('rel', 'nofollow noopener noreferrer');
|
a.setAttribute('rel', 'nofollow noopener noreferrer');
|
||||||
a.setAttribute('target', '_blank');
|
a.setAttribute('target', '_blank');
|
||||||
a.setAttribute('href', node.props.url);
|
a.setAttribute('href', node.props.url);
|
||||||
await appendChildren(node.children, a);
|
await appendChildren(node.children, a);
|
||||||
return a;
|
return a;
|
||||||
},
|
},
|
||||||
|
|
||||||
async mention(node) {
|
async mention(node) {
|
||||||
const { username, host, acct } = node.props;
|
const { username, host, acct } = node.props;
|
||||||
const resolved = mentionedRemoteUsers.find(remoteUser => remoteUser.username === username && remoteUser.host === host);
|
const resolved = mentionedRemoteUsers.find(remoteUser => remoteUser.username === username && remoteUser.host === host);
|
||||||
|
|
||||||
const el = doc.createElement('span');
|
const el = doc.createElement('span');
|
||||||
if (!resolved) {
|
if (!resolved) {
|
||||||
el.textContent = acct;
|
el.textContent = acct;
|
||||||
} else {
|
} else {
|
||||||
el.setAttribute('class', 'h-card');
|
el.setAttribute('class', 'h-card');
|
||||||
el.setAttribute('translate', 'no');
|
el.setAttribute('translate', 'no');
|
||||||
const a = doc.createElement('a');
|
const a = doc.createElement('a');
|
||||||
a.setAttribute('href', resolved.url ? resolved.url : resolved.uri);
|
a.setAttribute('href', resolved.url ? resolved.url : resolved.uri);
|
||||||
a.className = 'u-url mention';
|
a.className = 'u-url mention';
|
||||||
const span = doc.createElement('span');
|
const span = doc.createElement('span');
|
||||||
span.textContent = resolved.username || username;
|
span.textContent = resolved.username || username;
|
||||||
a.textContent = '@';
|
a.textContent = '@';
|
||||||
a.appendChild(span);
|
a.appendChild(span);
|
||||||
el.appendChild(a);
|
el.appendChild(a);
|
||||||
}
|
}
|
||||||
|
|
||||||
return el;
|
return el;
|
||||||
},
|
},
|
||||||
|
|
||||||
async quote(node) {
|
async quote(node) {
|
||||||
const el = doc.createElement('blockquote');
|
const el = doc.createElement('blockquote');
|
||||||
await appendChildren(node.children, el);
|
await appendChildren(node.children, el);
|
||||||
return el;
|
return el;
|
||||||
},
|
},
|
||||||
|
|
||||||
text(node) {
|
text(node) {
|
||||||
const el = doc.createElement('span');
|
const el = doc.createElement('span');
|
||||||
const nodes = node.props.text
|
const nodes = node.props.text
|
||||||
.split(/\r\n|\r|\n/)
|
.split(/\r\n|\r|\n/)
|
||||||
.map((x) => doc.createTextNode(x));
|
.map((x) => doc.createTextNode(x));
|
||||||
|
|
||||||
for (const x of intersperse<FIXME | 'br'>('br', nodes)) {
|
for (const x of intersperse<FIXME | 'br'>('br', nodes)) {
|
||||||
el.appendChild(x === 'br' ? doc.createElement('br') : x);
|
el.appendChild(x === 'br' ? doc.createElement('br') : x);
|
||||||
}
|
}
|
||||||
|
|
||||||
return el;
|
return el;
|
||||||
},
|
},
|
||||||
|
|
||||||
url(node) {
|
url(node) {
|
||||||
const a = doc.createElement('a');
|
const a = doc.createElement('a');
|
||||||
a.setAttribute('rel', 'nofollow noopener noreferrer');
|
a.setAttribute('rel', 'nofollow noopener noreferrer');
|
||||||
a.setAttribute('target', '_blank');
|
a.setAttribute('target', '_blank');
|
||||||
a.setAttribute('href', node.props.url);
|
a.setAttribute('href', node.props.url);
|
||||||
a.textContent = node.props.url.replace(/^https?:\/\//, '');
|
a.textContent = node.props.url.replace(/^https?:\/\//, '');
|
||||||
return a;
|
return a;
|
||||||
},
|
},
|
||||||
|
|
||||||
search: (node) => {
|
search: (node) => {
|
||||||
const a = doc.createElement('a');
|
const a = doc.createElement('a');
|
||||||
a.setAttribute('href', `https"google.com/${node.props.query}`);
|
a.setAttribute('href', `https"google.com/${node.props.query}`);
|
||||||
a.textContent = node.props.content;
|
a.textContent = node.props.content;
|
||||||
return a;
|
return a;
|
||||||
},
|
},
|
||||||
|
|
||||||
async plain(node) {
|
async plain(node) {
|
||||||
const el = doc.createElement('span');
|
const el = doc.createElement('span');
|
||||||
await appendChildren(node.children, el);
|
await appendChildren(node.children, el);
|
||||||
return el;
|
return el;
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
await appendChildren(nodes, doc.body);
|
await appendChildren(nodes, doc.body);
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,7 @@ import type { MiUserProfile, UserProfilesRepository, UsersRepository } from '@/m
|
||||||
import { bindThis } from '@/decorators.js';
|
import { bindThis } from '@/decorators.js';
|
||||||
import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js';
|
import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js';
|
||||||
import type { MiLocalUser } from '@/models/User.js';
|
import type { MiLocalUser } from '@/models/User.js';
|
||||||
|
import { secureishCompare } from '@/misc/secure-ish-compare.js';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class UserAuthService {
|
export class UserAuthService {
|
||||||
|
@ -27,7 +28,9 @@ export class UserAuthService {
|
||||||
public async twoFactorAuthenticate(profile: MiUserProfile, token: string): Promise<void> {
|
public async twoFactorAuthenticate(profile: MiUserProfile, token: string): Promise<void> {
|
||||||
if (profile.twoFactorBackupSecret?.includes(token)) {
|
if (profile.twoFactorBackupSecret?.includes(token)) {
|
||||||
await this.userProfilesRepository.update({ userId: profile.userId }, {
|
await this.userProfilesRepository.update({ userId: profile.userId }, {
|
||||||
twoFactorBackupSecret: profile.twoFactorBackupSecret.filter((secret) => secret !== token),
|
twoFactorBackupSecret: profile.twoFactorBackupSecret.filter(
|
||||||
|
(secret) => !secureishCompare(secret, token)
|
||||||
|
),
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
const delta = OTPAuth.TOTP.validate({
|
const delta = OTPAuth.TOTP.validate({
|
||||||
|
|
File diff suppressed because one or more lines are too long
33
packages/backend/src/misc/secure-ish-compare.ts
Normal file
33
packages/backend/src/misc/secure-ish-compare.ts
Normal file
|
@ -0,0 +1,33 @@
|
||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: dakkar and other sharkey contributors
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
import * as crypto from 'node:crypto';
|
||||||
|
|
||||||
|
export function secureishCompare(expected: string, given:string) {
|
||||||
|
const expectedLen = expected.length;
|
||||||
|
const givenLen = given.length;
|
||||||
|
|
||||||
|
/*
|
||||||
|
this ensures that the two strings are the same length, so
|
||||||
|
`timingSafeEqual` will not throw an error
|
||||||
|
|
||||||
|
notice that we perform the same operations regardless of the
|
||||||
|
length of the strings, we're trying not to leak timing
|
||||||
|
information!
|
||||||
|
*/
|
||||||
|
const paddedExpected = Buffer.from(expected + given);
|
||||||
|
const paddedGiven = Buffer.from(given + expected);
|
||||||
|
|
||||||
|
/*
|
||||||
|
if the two strings were equal, `sortOfEqual` will be true
|
||||||
|
|
||||||
|
if will be true in other cases, too! like `abc` and `abcabc`; but
|
||||||
|
then, `expectedLen` and `givenLen` would be different, and we'd
|
||||||
|
return false
|
||||||
|
*/
|
||||||
|
const sortOfEqual = crypto.timingSafeEqual(paddedExpected, paddedGiven);
|
||||||
|
|
||||||
|
return sortOfEqual && (givenLen === expectedLen);
|
||||||
|
}
|
|
@ -46,6 +46,7 @@ export class ExportAntennasProcessorService {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const [path, cleanup] = await createTemp();
|
const [path, cleanup] = await createTemp();
|
||||||
|
// eslint-disable-next-line detect-non-literal-fs-filename
|
||||||
const stream = fs.createWriteStream(path, { flags: 'a' });
|
const stream = fs.createWriteStream(path, { flags: 'a' });
|
||||||
const write = (input: string): Promise<void> => {
|
const write = (input: string): Promise<void> => {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
|
|
|
@ -38,6 +38,7 @@ import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOption
|
||||||
import type { FindOptionsWhere } from 'typeorm';
|
import type { FindOptionsWhere } from 'typeorm';
|
||||||
import type Logger from '@/logger.js';
|
import type Logger from '@/logger.js';
|
||||||
import { LoggerService } from '@/core/LoggerService.js';
|
import { LoggerService } from '@/core/LoggerService.js';
|
||||||
|
import { secureishCompare } from '@/misc/secure-ish-compare.js';
|
||||||
|
|
||||||
const ACTIVITY_JSON = 'application/activity+json; charset=utf-8';
|
const ACTIVITY_JSON = 'application/activity+json; charset=utf-8';
|
||||||
const LD_JSON = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"; charset=utf-8';
|
const LD_JSON = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"; charset=utf-8';
|
||||||
|
@ -287,7 +288,7 @@ export class ActivityPubServerService {
|
||||||
|
|
||||||
const hash = crypto.createHash('sha256').update(request.rawBody).digest('base64');
|
const hash = crypto.createHash('sha256').update(request.rawBody).digest('base64');
|
||||||
|
|
||||||
if (hash !== digestValue) {
|
if (!secureishCompare(hash, digestValue)) {
|
||||||
// Invalid digest
|
// Invalid digest
|
||||||
reply.code(401);
|
reply.code(401);
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -42,7 +42,7 @@ export class AuthenticateService implements OnApplicationShutdown {
|
||||||
|
|
||||||
@bindThis
|
@bindThis
|
||||||
public async authenticate(token: string | null | undefined): Promise<[MiLocalUser | null, MiAccessToken | null]> {
|
public async authenticate(token: string | null | undefined): Promise<[MiLocalUser | null, MiAccessToken | null]> {
|
||||||
if (token == null) {
|
if (token == null) { // eslint-disable-line detect-possible-timing-attacks
|
||||||
return [null, null];
|
return [null, null];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -76,7 +76,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
|
||||||
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: me.id });
|
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: me.id });
|
||||||
|
|
||||||
if (profile.twoFactorEnabled) {
|
if (profile.twoFactorEnabled) {
|
||||||
if (token == null) {
|
if (token == null) { // eslint-disable-line detect-possible-timing-attacks
|
||||||
throw new Error('authentication failed');
|
throw new Error('authentication failed');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -208,7 +208,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
|
||||||
|
|
||||||
// Compare password
|
// Compare password
|
||||||
if (profile.twoFactorEnabled) {
|
if (profile.twoFactorEnabled) {
|
||||||
if (token == null) {
|
if (token == null) { // eslint-disable-line detect-possible-timing-attacks
|
||||||
throw new Error('authentication failed');
|
throw new Error('authentication failed');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: me.id });
|
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: me.id });
|
||||||
|
|
||||||
if (profile.twoFactorEnabled) {
|
if (profile.twoFactorEnabled) {
|
||||||
if (token == null) {
|
if (token == null) { // eslint-disable-line detect-possible-timing-attacks
|
||||||
throw new Error('authentication failed');
|
throw new Error('authentication failed');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
|
|
||||||
// Compare password
|
// Compare password
|
||||||
if (profile.twoFactorEnabled) {
|
if (profile.twoFactorEnabled) {
|
||||||
if (token == null) {
|
if (token == null) { // eslint-disable-line detect-possible-timing-attacks
|
||||||
throw new Error('authentication failed');
|
throw new Error('authentication failed');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: me.id });
|
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: me.id });
|
||||||
|
|
||||||
if (profile.twoFactorEnabled) {
|
if (profile.twoFactorEnabled) {
|
||||||
if (token == null) {
|
if (token == null) { // eslint-disable-line detect-possible-timing-attacks
|
||||||
throw new Error('authentication failed');
|
throw new Error('authentication failed');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: me.id });
|
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: me.id });
|
||||||
|
|
||||||
if (profile.twoFactorEnabled) {
|
if (profile.twoFactorEnabled) {
|
||||||
if (token == null) {
|
if (token == null) { // eslint-disable-line detect-possible-timing-attacks
|
||||||
throw new Error('authentication failed');
|
throw new Error('authentication failed');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: me.id });
|
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: me.id });
|
||||||
|
|
||||||
if (profile.twoFactorEnabled) {
|
if (profile.twoFactorEnabled) {
|
||||||
if (token == null) {
|
if (token == null) { // eslint-disable-line detect-possible-timing-attacks
|
||||||
throw new Error('authentication failed');
|
throw new Error('authentication failed');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -77,7 +77,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: me.id });
|
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: me.id });
|
||||||
|
|
||||||
if (profile.twoFactorEnabled) {
|
if (profile.twoFactorEnabled) {
|
||||||
if (token == null) {
|
if (token == null) { // eslint-disable-line detect-possible-timing-attacks
|
||||||
throw new Error('authentication failed');
|
throw new Error('authentication failed');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -200,7 +200,7 @@ export class ClientServerService {
|
||||||
const url = decodeURI(request.routeOptions.url);
|
const url = decodeURI(request.routeOptions.url);
|
||||||
if (url === bullBoardPath || url.startsWith(bullBoardPath + '/')) {
|
if (url === bullBoardPath || url.startsWith(bullBoardPath + '/')) {
|
||||||
const token = request.cookies.token;
|
const token = request.cookies.token;
|
||||||
if (token == null) {
|
if (token == null) { // eslint-disable-line detect-possible-timing-attacks
|
||||||
reply.code(401).send('Login required');
|
reply.code(401).send('Login required');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
25
packages/backend/test/unit/misc/secure-ish-compare.ts
Normal file
25
packages/backend/test/unit/misc/secure-ish-compare.ts
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: dakkar and other sharkey contributors
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { secureishCompare } from '@/misc/secure-ish-compare.js';
|
||||||
|
|
||||||
|
describe(secureishCompare, () => {
|
||||||
|
it('should return true if strings are equal', () => {
|
||||||
|
expect(secureishCompare('abc','abc')).toBe(true);
|
||||||
|
expect(secureishCompare('aaa','aaa')).toBe(true);
|
||||||
|
});
|
||||||
|
it('should return false if strings are different', () => {
|
||||||
|
expect(secureishCompare('abc','def')).toBe(false);
|
||||||
|
});
|
||||||
|
it('should return false if one is prefix of the other', () => {
|
||||||
|
expect(secureishCompare('abc','abcabc')).toBe(false);
|
||||||
|
expect(secureishCompare('abcabc','abc')).toBe(false);
|
||||||
|
expect(secureishCompare('aaa','aa')).toBe(false);
|
||||||
|
});
|
||||||
|
it('should return false if strings are very different', () => {
|
||||||
|
expect(secureishCompare('abc','defghi')).toBe(false);
|
||||||
|
expect(secureishCompare('defghi','abc')).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
|
@ -117,6 +117,7 @@ self.addEventListener('fetch', function (event) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate unique request ID.
|
// Generate unique request ID.
|
||||||
|
// eslint-disable-next-line node_insecure_random_generator
|
||||||
const requestId = Math.random().toString(16).slice(2)
|
const requestId = Math.random().toString(16).slice(2)
|
||||||
|
|
||||||
event.respondWith(
|
event.respondWith(
|
||||||
|
|
|
@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<MkCustomEmoji v-if="'isCustomEmoji' in emoji && emoji.isCustomEmoji" :name="emoji.emoji" :class="$style.emoji"/>
|
<MkCustomEmoji v-if="'isCustomEmoji' in emoji && emoji.isCustomEmoji" :name="emoji.emoji" :class="$style.emoji"/>
|
||||||
<MkEmoji v-else :emoji="emoji.emoji" :class="$style.emoji"/>
|
<MkEmoji v-else :emoji="emoji.emoji" :class="$style.emoji"/>
|
||||||
<!-- eslint-disable-next-line vue/no-v-html -->
|
<!-- eslint-disable-next-line vue/no-v-html -->
|
||||||
<span v-if="q" :class="$style.emojiName" v-html="sanitizeHtml(emoji.name.replace(q, `<b>${q}</b>`))"></span>
|
<span v-if="q" :class="$style.emojiName" v-html="sanitizeHtml(emoji.name.replace(q, `<b>${q}</b>`))"></span><!-- njsscan-ignore:vue_template -->
|
||||||
<span v-else v-text="emoji.name"></span>
|
<span v-else v-text="emoji.name"></span>
|
||||||
<span v-if="emoji.aliasOf" :class="$style.emojiAlias">({{ emoji.aliasOf }})</span>
|
<span v-if="emoji.aliasOf" :class="$style.emojiAlias">({{ emoji.aliasOf }})</span>
|
||||||
</li>
|
</li>
|
||||||
|
|
|
@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
<!-- eslint-disable vue/no-v-html -->
|
<!-- eslint-disable vue/no-v-html -->
|
||||||
<template>
|
<template>
|
||||||
<div :class="[$style.codeBlockRoot, { [$style.codeEditor]: codeEditor }]" v-html="html"></div>
|
<div :class="[$style.codeBlockRoot, { [$style.codeEditor]: codeEditor }]" v-html="html"></div><!-- njsscan-ignore:vue_template -->
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
|
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div v-if="block" :class="$style.block" v-html="renderedFormula"></div>
|
<div v-if="block" :class="$style.block" v-html="renderedFormula"></div><!-- njsscan-ignore:vue_template -->
|
||||||
<span v-else v-html="renderedFormula"></span>
|
<span v-else v-html="renderedFormula"></span><!-- njsscan-ignore:vue_template -->
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
|
|
|
@ -24,7 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<template #suffix><i v-if="agreeServerRules" class="ph-check ph-bold ph-lg" style="color: var(--success)"></i></template>
|
<template #suffix><i v-if="agreeServerRules" class="ph-check ph-bold ph-lg" style="color: var(--success)"></i></template>
|
||||||
|
|
||||||
<ol class="_gaps_s" :class="$style.rules">
|
<ol class="_gaps_s" :class="$style.rules">
|
||||||
<li v-for="item in instance.serverRules" :class="$style.rule"><div :class="$style.ruleText" v-html="sanitizeHtml(item)"></div></li>
|
<li v-for="item in instance.serverRules" :class="$style.rule"><div :class="$style.ruleText" v-html="sanitizeHtml(item)"></div></li><!-- njsscan-ignore:vue_template -->
|
||||||
</ol>
|
</ol>
|
||||||
|
|
||||||
<MkSwitch :modelValue="agreeServerRules" style="margin-top: 16px;" @update:modelValue="updateAgreeServerRules">{{ i18n.ts.agree }}</MkSwitch>
|
<MkSwitch :modelValue="agreeServerRules" style="margin-top: 16px;" @update:modelValue="updateAgreeServerRules">{{ i18n.ts.agree }}</MkSwitch>
|
||||||
|
|
|
@ -16,7 +16,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
</h1>
|
</h1>
|
||||||
<div :class="$style.mainAbout">
|
<div :class="$style.mainAbout">
|
||||||
<!-- eslint-disable-next-line vue/no-v-html -->
|
<!-- eslint-disable-next-line vue/no-v-html -->
|
||||||
<div v-html="sanitizeHtml(meta.description) || i18n.ts.headlineMisskey"></div>
|
<div v-html="sanitizeHtml(meta.description) || i18n.ts.headlineMisskey"></div><!-- njsscan-ignore:vue_template -->
|
||||||
</div>
|
</div>
|
||||||
<div v-if="instance.disableRegistration" :class="$style.mainWarn">
|
<div v-if="instance.disableRegistration" :class="$style.mainWarn">
|
||||||
<MkInfo warn>{{ i18n.ts.invitationRequiredToRegister }}</MkInfo>
|
<MkInfo warn>{{ i18n.ts.invitationRequiredToRegister }}</MkInfo>
|
||||||
|
|
|
@ -20,7 +20,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
<MkKeyValue>
|
<MkKeyValue>
|
||||||
<template #key>{{ i18n.ts.description }}</template>
|
<template #key>{{ i18n.ts.description }}</template>
|
||||||
<template #value><div v-html="sanitizeHtml(instance.description)"></div></template>
|
<template #value><div v-html="sanitizeHtml(instance.description)"></div></template><!-- njsscan-ignore:vue_template -->
|
||||||
</MkKeyValue>
|
</MkKeyValue>
|
||||||
|
|
||||||
<FormSection>
|
<FormSection>
|
||||||
|
@ -29,8 +29,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<template #key>Sharkey</template>
|
<template #key>Sharkey</template>
|
||||||
<template #value>{{ version }}</template>
|
<template #value>{{ version }}</template>
|
||||||
</MkKeyValue>
|
</MkKeyValue>
|
||||||
<div v-html="i18n.tsx.poweredByMisskeyDescription({ name: instance.name ?? host })">
|
<div v-html="i18n.tsx.poweredByMisskeyDescription({ name: instance.name ?? host })"></div><!-- njsscan-ignore:vue_template -->
|
||||||
</div>
|
|
||||||
<FormLink to="/about-sharkey">{{ i18n.ts.aboutMisskey }}</FormLink>
|
<FormLink to="/about-sharkey">{{ i18n.ts.aboutMisskey }}</FormLink>
|
||||||
</div>
|
</div>
|
||||||
</FormSection>
|
</FormSection>
|
||||||
|
@ -53,7 +52,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<template #label>{{ i18n.ts.serverRules }}</template>
|
<template #label>{{ i18n.ts.serverRules }}</template>
|
||||||
|
|
||||||
<ol class="_gaps_s" :class="$style.rules">
|
<ol class="_gaps_s" :class="$style.rules">
|
||||||
<li v-for="item, index in instance.serverRules" :key="index" :class="$style.rule"><div :class="$style.ruleText" v-html="sanitizeHtml(item)"></div></li>
|
<li v-for="item, index in instance.serverRules" :key="index" :class="$style.rule"><div :class="$style.ruleText" v-html="sanitizeHtml(item)"></div></li><!-- njsscan-ignore:vue_template -->
|
||||||
</ol>
|
</ol>
|
||||||
</MkFolder>
|
</MkFolder>
|
||||||
<FormLink v-if="instance.tosUrl" :to="instance.tosUrl" external>{{ i18n.ts.termsOfService }}</FormLink>
|
<FormLink v-if="instance.tosUrl" :to="instance.tosUrl" external>{{ i18n.ts.termsOfService }}</FormLink>
|
||||||
|
|
|
@ -32,7 +32,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
<MkSelect v-model="rolePermission" :readonly="readonly">
|
<MkSelect v-model="rolePermission" :readonly="readonly">
|
||||||
<template #label><i class="ph-shield ph-bold ph-lg-lock"></i> {{ i18n.ts._role.permission }}</template>
|
<template #label><i class="ph-shield ph-bold ph-lg-lock"></i> {{ i18n.ts._role.permission }}</template>
|
||||||
<template #caption><div v-html="i18n.ts._role.descriptionOfPermission.replaceAll('\n', '<br>')"></div></template>
|
<template #caption><div v-html="i18n.ts._role.descriptionOfPermission.replaceAll('\n', '<br>')"></div></template><!-- njsscan-ignore:vue_template -->
|
||||||
<option value="normal">{{ i18n.ts.normalUser }}</option>
|
<option value="normal">{{ i18n.ts.normalUser }}</option>
|
||||||
<option value="moderator">{{ i18n.ts.moderator }}</option>
|
<option value="moderator">{{ i18n.ts.moderator }}</option>
|
||||||
<option value="administrator">{{ i18n.ts.administrator }}</option>
|
<option value="administrator">{{ i18n.ts.administrator }}</option>
|
||||||
|
@ -40,7 +40,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
<MkSelect v-model="role.target" :readonly="readonly">
|
<MkSelect v-model="role.target" :readonly="readonly">
|
||||||
<template #label><i class="ph-users ph-bold ph-lg"></i> {{ i18n.ts._role.assignTarget }}</template>
|
<template #label><i class="ph-users ph-bold ph-lg"></i> {{ i18n.ts._role.assignTarget }}</template>
|
||||||
<template #caption><div v-html="i18n.ts._role.descriptionOfAssignTarget.replaceAll('\n', '<br>')"></div></template>
|
<template #caption><div v-html="i18n.ts._role.descriptionOfAssignTarget.replaceAll('\n', '<br>')"></div></template><!-- njsscan-ignore:vue_template -->
|
||||||
<option value="manual">{{ i18n.ts._role.manual }}</option>
|
<option value="manual">{{ i18n.ts._role.manual }}</option>
|
||||||
<option value="conditional">{{ i18n.ts._role.conditional }}</option>
|
<option value="conditional">{{ i18n.ts._role.conditional }}</option>
|
||||||
</MkSelect>
|
</MkSelect>
|
||||||
|
|
|
@ -27,6 +27,11 @@ export function checkWordMute(note: Record<string, any>, me: Record<string, any>
|
||||||
if (!regexp) return false;
|
if (!regexp) return false;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
/*
|
||||||
|
this could actually be a problem, but not here: here it's
|
||||||
|
user-supplied regexes running on the user's browser
|
||||||
|
|
||||||
|
eslint-disable-next-line detect-non-literal-regexp */
|
||||||
return new RegExp(regexp[1], regexp[2]).test(text);
|
return new RegExp(regexp[1], regexp[2]).test(text);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
// This should never happen due to input sanitisation.
|
// This should never happen due to input sanitisation.
|
||||||
|
|
|
@ -31,7 +31,7 @@ export function misskeyApi<
|
||||||
const promise = new Promise<_ResT>((resolve, reject) => {
|
const promise = new Promise<_ResT>((resolve, reject) => {
|
||||||
// Append a credential
|
// Append a credential
|
||||||
if ($i) (data as any).i = $i.token;
|
if ($i) (data as any).i = $i.token;
|
||||||
if (token !== undefined) (data as any).i = token;
|
if (token !== undefined) (data as any).i = token; // eslint-disable-line detect-possible-timing-attacks
|
||||||
|
|
||||||
// Send request
|
// Send request
|
||||||
window.fetch(`${apiUrl}/${endpoint}`, {
|
window.fetch(`${apiUrl}/${endpoint}`, {
|
||||||
|
|
|
@ -1470,6 +1470,11 @@ export default class Misskey implements MegalodonInterface {
|
||||||
*/
|
*/
|
||||||
public async uploadMedia(file: any, _options?: { description?: string; focus?: string }): Promise<Response<Entity.Attachment>> {
|
public async uploadMedia(file: any, _options?: { description?: string; focus?: string }): Promise<Response<Entity.Attachment>> {
|
||||||
const formData = new FormData()
|
const formData = new FormData()
|
||||||
|
/*
|
||||||
|
this is called from MastodonApiServerService and `file` is
|
||||||
|
generated by `falstify` upload code, so should be safe
|
||||||
|
|
||||||
|
eslint-disable-next-line detect-non-literal-fs-filename */
|
||||||
formData.append('file', fs.createReadStream(file.path), {
|
formData.append('file', fs.createReadStream(file.path), {
|
||||||
contentType: file.mimetype,
|
contentType: file.mimetype,
|
||||||
});
|
});
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
* SPDX-License-Identifier: AGPL-3.0-only
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
// eslint-disable detect-non-literal-fs-filename
|
||||||
|
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
const packageJsonPath = __dirname + '/../package.json'
|
const packageJsonPath = __dirname + '/../package.json'
|
||||||
|
|
||||||
|
@ -13,7 +15,7 @@ function build() {
|
||||||
fs.mkdirSync(__dirname + '/../built', { recursive: true });
|
fs.mkdirSync(__dirname + '/../built', { recursive: true });
|
||||||
fs.writeFileSync(__dirname + '/../built/meta.json', JSON.stringify({ version: meta.version }), 'utf-8');
|
fs.writeFileSync(__dirname + '/../built/meta.json', JSON.stringify({ version: meta.version }), 'utf-8');
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error(e)
|
console.error(e) // njsscan-ignore:generic_error_disclosure
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
// trims dependencies for production
|
// trims dependencies for production
|
||||||
// only run after a full build
|
// only run after a full build
|
||||||
|
// eslint-disable detect-non-literal-fs-filename
|
||||||
|
|
||||||
import fs from 'node:fs'
|
import fs from 'node:fs'
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue