snapshot of https://github.com/RocketChat/Rocket.Chat.git (develop, 2026-09-16; blobs > 131072B omitted)
Some checks failed
Create issues from TODOs / todos (push) Failing after 3s
Close inactive issues / close-issues (push) Has been cancelled
Deploy GitHub Pages / deploy-preview (push) Has been cancelled
CI / ⚙️ Variables Setup (push) Has been cancelled
CI / ⚙️ Test Guard (push) Has been cancelled
CI / 🚀 Notify external services - draft (push) Has been cancelled
CI / 📦 Build Packages (push) Has been cancelled
CI / 📦 Meteor Build (coverage) (push) Has been cancelled
CI / 📦 Meteor Build (production) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], fips) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Publish Docker Images (ghcr.io) (push) Has been cancelled
CI / 📦 Track Image Sizes (push) Has been cancelled
CI / 🔎 Code Check - Action Lint (push) Has been cancelled
CI / 🔎 Code Check (push) Has been cancelled
CI / 🔨 Test Storybook (push) Has been cancelled
CI / 🔨 Test Unit (push) Has been cancelled
CI / 🔨 Test API (CE) (push) Has been cancelled
CI / 🔨 Test API Livechat (CE) (push) Has been cancelled
CI / 🔨 Test UI (CE) (push) Has been cancelled
CI / 🔨 Test API (EE) (push) Has been cancelled
CI / 🔨 Test API Livechat (EE) (push) Has been cancelled
CI / 🔨 Test API Apps (deno-runtime - EE) (push) Has been cancelled
CI / 🔨 Test UI (EE) (push) Has been cancelled
CI / 🔨 Test API (FIPS) (push) Has been cancelled
CI / 🔨 Test API Livechat (FIPS) (push) Has been cancelled
CI / 🔨 Test UI (FIPS) (push) Has been cancelled
CI / 🔨 Test Federation Matrix (push) Has been cancelled
CI / 📊 Report Coverage (push) Has been cancelled
CI / ✅ Tests Done (push) Has been cancelled
CI / 🚀 Publish build assets (push) Has been cancelled
CI / 🚀 Publish Docker Images (DockerHub) (push) Has been cancelled
CI / 🚀 Notify external services (push) Has been cancelled
CI / Update Version Durability (push) Has been cancelled
Release / Release (push) Has been cancelled
Auto-close duplicate issues / auto-close-duplicates (push) Failing after 1s
Code scanning - action / CodeQL-Build (push) Failing after 1s
Some checks failed
Create issues from TODOs / todos (push) Failing after 3s
Close inactive issues / close-issues (push) Has been cancelled
Deploy GitHub Pages / deploy-preview (push) Has been cancelled
CI / ⚙️ Variables Setup (push) Has been cancelled
CI / ⚙️ Test Guard (push) Has been cancelled
CI / 🚀 Notify external services - draft (push) Has been cancelled
CI / 📦 Build Packages (push) Has been cancelled
CI / 📦 Meteor Build (coverage) (push) Has been cancelled
CI / 📦 Meteor Build (production) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], fips) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Publish Docker Images (ghcr.io) (push) Has been cancelled
CI / 📦 Track Image Sizes (push) Has been cancelled
CI / 🔎 Code Check - Action Lint (push) Has been cancelled
CI / 🔎 Code Check (push) Has been cancelled
CI / 🔨 Test Storybook (push) Has been cancelled
CI / 🔨 Test Unit (push) Has been cancelled
CI / 🔨 Test API (CE) (push) Has been cancelled
CI / 🔨 Test API Livechat (CE) (push) Has been cancelled
CI / 🔨 Test UI (CE) (push) Has been cancelled
CI / 🔨 Test API (EE) (push) Has been cancelled
CI / 🔨 Test API Livechat (EE) (push) Has been cancelled
CI / 🔨 Test API Apps (deno-runtime - EE) (push) Has been cancelled
CI / 🔨 Test UI (EE) (push) Has been cancelled
CI / 🔨 Test API (FIPS) (push) Has been cancelled
CI / 🔨 Test API Livechat (FIPS) (push) Has been cancelled
CI / 🔨 Test UI (FIPS) (push) Has been cancelled
CI / 🔨 Test Federation Matrix (push) Has been cancelled
CI / 📊 Report Coverage (push) Has been cancelled
CI / ✅ Tests Done (push) Has been cancelled
CI / 🚀 Publish build assets (push) Has been cancelled
CI / 🚀 Publish Docker Images (DockerHub) (push) Has been cancelled
CI / 🚀 Notify external services (push) Has been cancelled
CI / Update Version Durability (push) Has been cancelled
Release / Release (push) Has been cancelled
Auto-close duplicate issues / auto-close-duplicates (push) Failing after 1s
Code scanning - action / CodeQL-Build (push) Failing after 1s
This commit is contained in:
110
apps/meteor/server/lib/2fa/loginHandler.ts
Normal file
110
apps/meteor/server/lib/2fa/loginHandler.ts
Normal file
@@ -0,0 +1,110 @@
|
||||
import { Accounts } from 'meteor/accounts-base';
|
||||
import { check } from 'meteor/check';
|
||||
import { Meteor } from 'meteor/meteor';
|
||||
import { OAuth } from 'meteor/oauth';
|
||||
|
||||
import { checkCodeForUser } from './code';
|
||||
import { callbacks } from '../callbacks';
|
||||
|
||||
const isMeteorError = (error: any): error is Meteor.Error => {
|
||||
return error?.meteorError !== undefined;
|
||||
};
|
||||
|
||||
const isCredentialWithError = (credential: any): credential is { error: Error } => {
|
||||
return credential?.error !== undefined;
|
||||
};
|
||||
|
||||
Accounts.registerLoginHandler('totp', function (options) {
|
||||
if (!options.totp?.code) {
|
||||
return;
|
||||
}
|
||||
|
||||
// @ts-expect-error - not sure how to type this yet
|
||||
return Accounts._runLoginHandlers(this, options.totp.login);
|
||||
});
|
||||
|
||||
callbacks.add(
|
||||
'onValidateLogin',
|
||||
async (login) => {
|
||||
if (
|
||||
!login.user ||
|
||||
login.type === 'resume' ||
|
||||
login.type === 'proxy' ||
|
||||
login.type === 'cas' ||
|
||||
(login.type === 'password' && login.methodName === 'resetPassword') ||
|
||||
login.methodName === 'verifyEmail'
|
||||
) {
|
||||
return login;
|
||||
}
|
||||
|
||||
const [loginArgs] = login.methodArguments;
|
||||
const { totp } = loginArgs;
|
||||
|
||||
await checkCodeForUser({
|
||||
user: login.user,
|
||||
code: totp?.code,
|
||||
options: { disablePasswordFallback: true },
|
||||
});
|
||||
|
||||
return login;
|
||||
},
|
||||
callbacks.priority.MEDIUM,
|
||||
'2fa',
|
||||
);
|
||||
|
||||
const copyTo = <T extends Error>(from: T, to: T): T => {
|
||||
Object.getOwnPropertyNames(to).forEach((key) => {
|
||||
const idx: keyof T = key as keyof T;
|
||||
to[idx] = from[idx];
|
||||
});
|
||||
|
||||
return to;
|
||||
};
|
||||
|
||||
const recreateError = (errorDoc: Error | Meteor.Error): Error | Meteor.Error => {
|
||||
if (isMeteorError(errorDoc)) {
|
||||
const error = new Meteor.Error('');
|
||||
return copyTo(errorDoc, error);
|
||||
}
|
||||
|
||||
const error = new Error();
|
||||
return copyTo(errorDoc, error);
|
||||
};
|
||||
|
||||
OAuth._retrievePendingCredential = async function (key, ...args): Promise<string | Error | void> {
|
||||
const credentialSecret = args.length > 0 && args[0] !== undefined ? args[0] : undefined;
|
||||
check(key, String);
|
||||
|
||||
const pendingCredential = await OAuth._pendingCredentials.findOneAsync({
|
||||
key,
|
||||
credentialSecret,
|
||||
});
|
||||
|
||||
if (!pendingCredential) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (isCredentialWithError(pendingCredential.credential)) {
|
||||
await OAuth._pendingCredentials.removeAsync({
|
||||
_id: pendingCredential._id,
|
||||
});
|
||||
return recreateError(pendingCredential.credential.error);
|
||||
}
|
||||
|
||||
// Work-around to make the credentials reusable for 2FA
|
||||
const future = new Date();
|
||||
future.setMinutes(future.getMinutes() + 2);
|
||||
|
||||
await OAuth._pendingCredentials.updateAsync(
|
||||
{
|
||||
_id: pendingCredential._id,
|
||||
},
|
||||
{
|
||||
$set: {
|
||||
createdAt: future,
|
||||
},
|
||||
},
|
||||
);
|
||||
|
||||
return OAuth.openSecret(pendingCredential.credential);
|
||||
};
|
||||
Reference in New Issue
Block a user