Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Add more 2FA formdetector tests and update detection logic (#1788)

Leendert de Borst5dae249efc22
diff --git a/apps/browser-extension/src/utils/formDetector/FieldPatterns.ts b/apps/browser-extension/src/utils/formDetector/FieldPatterns.ts
index c9f371222..68ad6d86f 100644
--- a/apps/browser-extension/src/utils/formDetector/FieldPatterns.ts
+++ b/apps/browser-extension/src/utils/formDetector/FieldPatterns.ts
@@ -50,7 +50,7 @@ export const EnglishFieldPatterns: FieldPatterns = {
birthDateDay: ['-day', 'birthdate_d', 'birthdayday', '_day', 'day'],
birthDateMonth: ['-month', 'birthdate_m', 'birthdaymonth', '_month', 'month'],
birthDateYear: ['-year', 'birthdate_y', 'birthdayyear', '_year', 'year'],
- totp: ['totp', 'otp', 'one-time', 'onetime', 'token', 'authenticator', '2fa', 'twofa', 'two-factor', 'mfa', 'security-code', 'auth-code', 'passcode', 'pin-code', 'pincode', 'google_code', 'verification-code', 'verificationcode']
+ totp: ['totp', 'otp', 'one-time', 'onetime', 'token', 'authenticator', '2fa', 'twofa', 'two-factor', 'mfa', 'security-code', 'auth-code', 'passcode', 'pin-code', 'pincode', 'google_code', 'verification-code', 'verificationcode', 'tfa', 'tfacode', 'second-factor']
};
/**
diff --git a/apps/browser-extension/src/utils/formDetector/FormDetector.ts b/apps/browser-extension/src/utils/formDetector/FormDetector.ts
index 249046f72..d082dc631 100644
--- a/apps/browser-extension/src/utils/formDetector/FormDetector.ts
+++ b/apps/browser-extension/src/utils/formDetector/FormDetector.ts
@@ -1057,7 +1057,12 @@ export class FormDetector {
// Check for numeric pattern attribute with length constraint
const pattern = input.getAttribute('pattern');
- if (pattern && /^\[0-9\]/.test(pattern) && maxLength === 6) {
+ if (pattern && (/^\[0-9\]/.test(pattern) || /^\\d/.test(pattern)) && (maxLength === 6 || maxLength === 1)) {
+ return input;
+ }
+
+ // Check for maxLength=1 with inputmode="numeric" (split TOTP inputs)
+ if (maxLength === 1 && inputMode === 'numeric') {
return input;
}
}
diff --git a/apps/browser-extension/src/utils/formDetector/__tests__/FormDetector.totp.test.ts b/apps/browser-extension/src/utils/formDetector/__tests__/FormDetector.totp.test.ts
index 91d8b64a6..2c50d4c07 100644
--- a/apps/browser-extension/src/utils/formDetector/__tests__/FormDetector.totp.test.ts
+++ b/apps/browser-extension/src/utils/formDetector/__tests__/FormDetector.totp.test.ts
@@ -30,4 +30,28 @@ describe('FormDetector TOTP tests', () => {
testField(FormField.Totp, 'google_code', htmlFile);
});
+
+ describe('English TOTP form 4 detection (Organizr style)', () => {
+ const htmlFile = 'en-totp-form4.html';
+
+ testField(FormField.Totp, 'tfaCode', htmlFile);
+ });
+
+ describe('English TOTP form 5 detection (Zenarmor OTP input)', () => {
+ const htmlFile = 'en-totp-form5.html';
+
+ testField(FormField.Totp, 'otp-input-0', htmlFile);
+ });
+
+ describe('English TOTP form 6 detection (Bitwarden Community)', () => {
+ const htmlFile = 'en-totp-form6.html';
+
+ testField(FormField.Totp, 'login-second-factor', htmlFile);
+ });
+
+ describe('English TOTP form 7 detection (Riot Games)', () => {
+ const htmlFile = 'en-totp-form7.html';
+
+ testField(FormField.Totp, 'riot-mfa-0', htmlFile);
+ });
});
diff --git a/apps/browser-extension/src/utils/formDetector/__tests__/test-forms/en-totp-form4.html b/apps/browser-extension/src/utils/formDetector/__tests__/test-forms/en-totp-form4.html
new file mode 100644
index 000000000..700a68009
--- /dev/null
+++ b/apps/browser-extension/src/utils/formDetector/__tests__/test-forms/en-totp-form4.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>2FA - Organizr</title>
+</head>
+<body>
+ <div id="tfa-div" class="form-group">
+ <div class="col-xs-12">
+ <div class="panel panel-warning animated tada">
+ <div class="panel-heading">
+ 2FA
+ <div class="pull-right"><a href="#" data-perform="panel-collapse"><i class="ti-minus"></i></a> <a href="#" data-perform="panel-dismiss"><i class="ti-close"></i></a>
+ </div>
+ </div>
+ <div class="panel-wrapper collapse in" aria-expanded="true">
+ <div class="panel-body">
+ <div class="input-group" style="width: 100%;">
+ <div class="input-group-addon hidden-xs"><i class="ti-lock"></i></div>
+ <input type="text" class="form-control tfa-input" id="tfaCode" name="tfaCode" placeholder="Code" data-lpignore="true" autocomplete="off" autocorrect="off" autocapitalize="off" maxlength="6" spellcheck="false" autofocus="" data-av-autocomplete="off">
+ </div>
+ <button class="btn btn-warning btn-lg btn-block text-uppercase waves-effect waves-light login-button m-t-10" type="submit" lang="en">Login</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
diff --git a/apps/browser-extension/src/utils/formDetector/__tests__/test-forms/en-totp-form5.html b/apps/browser-extension/src/utils/formDetector/__tests__/test-forms/en-totp-form5.html
new file mode 100644
index 000000000..026a479a5
--- /dev/null
+++ b/apps/browser-extension/src/utils/formDetector/__tests__/test-forms/en-totp-form5.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>OTP Verification - Zenarmor</title>
+</head>
+<body>
+ <form data-v-00a231f0="" class="otp-verification-form">
+ <form data-v-09843f95="" data-v-00a231f0="" class="widget-content" autocomplete="off" otp-type="app-code">
+ <div data-v-09843f95="" class="widget-otp-container">
+ <div data-v-09843f95="" class="otp-inputs-container">
+ <input data-v-09843f95="" type="text" id="otp-input-0" class="otp-input" maxlength="1" inputmode="numeric" pattern="[0-9]*" autocomplete="off" value="" data-av-autocomplete="off">
+ <input data-v-09843f95="" type="text" id="otp-input-1" class="otp-input" maxlength="1" inputmode="numeric" pattern="[0-9]*" autocomplete="off" value="" data-av-autocomplete="off">
+ <input data-v-09843f95="" type="text" id="otp-input-2" class="otp-input" maxlength="1" inputmode="numeric" pattern="[0-9]*" autocomplete="off" value="">
+ <span data-v-09843f95="" class="otp-separator"></span>
+ <input data-v-09843f95="" type="text" id="otp-input-3" class="otp-input" maxlength="1" inputmode="numeric" pattern="[0-9]*" autocomplete="off" value="">
+ <input data-v-09843f95="" type="text" id="otp-input-4" class="otp-input" maxlength="1" inputmode="numeric" pattern="[0-9]*" autocomplete="off" value="" data-av-autocomplete="off">
+ <input data-v-09843f95="" type="text" id="otp-input-5" class="otp-input" maxlength="1" inputmode="numeric" pattern="[0-9]*" autocomplete="off" value="">
+ </div>
+ </div>
+ </form>
+ <button data-v-00a231f0="" class="svn-button solid disabled info large auth-button continue-button" role="button" type="button" disabled="">
+ Login
+ <div></div>
+ </button>
+ </form>
+</body>
+</html>
diff --git a/apps/browser-extension/src/utils/formDetector/__tests__/test-forms/en-totp-form6.html b/apps/browser-extension/src/utils/formDetector/__tests__/test-forms/en-totp-form6.html
new file mode 100644
index 000000000..8c75f9b35
--- /dev/null
+++ b/apps/browser-extension/src/utils/formDetector/__tests__/test-forms/en-totp-form6.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>Login - Bitwarden Community</title>
+</head>
+<body>
+ <div class="d-otp">
+ <div class="d-otp-group">
+ <div class="d-otp-slot" data-index="0">
+ <span aria-hidden="true"> </span>
+ </div>
+ <div class="d-otp-slot" data-index="1">
+ <span aria-hidden="true"> </span>
+ </div>
+ <div class="d-otp-slot" data-index="2">
+ <span aria-hidden="true"> </span>
+ </div>
+ <div class="d-otp-slot" data-index="3">
+ <span aria-hidden="true"> </span>
+ </div>
+ <div class="d-otp-slot" data-index="4">
+ <span aria-hidden="true"> </span>
+ </div>
+ <div class="d-otp-slot" data-index="5">
+ <span aria-hidden="true"> </span>
+ </div>
+ </div>
+ <div class="d-otp-input-wrapper">
+ <input inputmode="numeric" autocomplete="off" data-slot="input-otp" class="d-otp-input second-factor-token-input" maxlength="6" aria-label="Enter 6 numbers" id="login-second-factor" autofocus="" data-av-autocomplete="one-time-code" data-av-field-type="username">
+ </div>
+ </div>
+</body>
+</html>
diff --git a/apps/browser-extension/src/utils/formDetector/__tests__/test-forms/en-totp-form7.html b/apps/browser-extension/src/utils/formDetector/__tests__/test-forms/en-totp-form7.html
new file mode 100644
index 000000000..650bbb7a7
--- /dev/null
+++ b/apps/browser-extension/src/utils/formDetector/__tests__/test-forms/en-totp-form7.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>Riot Games - Authentication</title>
+</head>
+<body>
+ <div class="sc-dExYQz eUYAKH">
+ <div class="sc-bOSxlg eRqoVn">
+ <div class="sc-fmSAUk dbLWZE">
+ <div class="sc-cbelXg gGiXFv">
+ <div class="sc-ktEKTO sc-jegxcv fApNkr dUizNf field">
+ <input minlength="1" maxlength="1" type="text" id="riot-mfa-0" lang="en" autocomplete="off" pattern="\d*" inputmode="numeric" value="" data-av-autocomplete="off">
+ </div>
+ <div class="sc-ktEKTO sc-jegxcv fApNkr dUizNf field">
+ <input minlength="1" maxlength="1" type="text" id="riot-mfa-1" lang="en" autocomplete="off" pattern="\d*" inputmode="numeric" value="" data-av-autocomplete="off">
+ </div>
+ <div class="sc-ktEKTO sc-jegxcv fApNkr dUizNf field">
+ <input minlength="1" maxlength="1" type="text" id="riot-mfa-2" lang="en" autocomplete="off" pattern="\d*" inputmode="numeric" value="">
+ </div>
+ <div class="sc-ktEKTO sc-jegxcv fApNkr dUizNf field">
+ <input minlength="1" maxlength="1" type="text" id="riot-mfa-3" lang="en" autocomplete="off" pattern="\d*" inputmode="numeric" value="">
+ </div>
+ <div class="sc-ktEKTO sc-jegxcv fApNkr dUizNf field">
+ <input minlength="1" maxlength="1" type="text" id="riot-mfa-4" lang="en" autocomplete="off" pattern="\d*" inputmode="numeric" value="">
+ </div>
+ <div class="sc-ktEKTO sc-jegxcv fApNkr dUizNf field">
+ <input minlength="1" maxlength="1" type="text" id="riot-mfa-5" lang="en" autocomplete="off" pattern="\d*" inputmode="numeric" value="">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div method="thirdparty" data-testid="mfa-rememberme-checkbox" class="sc-dXoxLi yIfkA">
+ <div class="sc-blLsxD fZODXg">
+ <div class="sc-fmSAUk dBSvZD CheckboxField">
+ <div class="sc-ktEKTO jyJJXs field">
+ <input id="rememberme" type="checkbox">
+ <svg role="img" viewBox="0 0 19 19" xmlns="http://www.w3.org/2000/svg" aria-label="checkmark" class="sc-hLseeU eHCXYC sc-fGFwAa iUwPLm">
+ <path d="M1.84791 10.5854L8.17372 16.5999L17.2764 5.99613" stroke-linejoin="round"></path>
+ </svg>
+ <label></label>
+ <span dir="ltr"></span>
+ </div>
+ </div>
+ <h6 class="sc-kFuwaP kPTutl sc-ieZDjg gkdjQh" color="black" dir="ltr">
+ <label for="rememberme">Remember this browser for 30 days</label>
+ </h6>
+ </div>
+ </div>
+ <div class="sc-bqWVmG hsXpWG">
+ <button disabled="" data-testid="btn-mfa-submit" class="sc-eDDNvR joBTcU">
+ <div class="sc-gLDzan gohLCB">
+ <svg role="img" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg" aria-label="forward" class="sc-hLseeU idnFbI sc-iAEyYk kOjeBb">
+ <path d="M22.8011 14.75L14.2234 6.70971L16.0474 5L26.8695 15.1441C27.3732 15.6163 27.3732 16.3817 26.8695 16.8538L16.0474 26.998L14.2234 25.2883L22.7989 17.25H4.75V14.75H22.8011Z"></path>
+ </svg>
+ </div>
+ </button>
+ </div>
+ <div class="sc-jFJHMl ilTSQE">
+ <span color="black" class="sc-kFuwaP dYvDdY" dir="ltr">
+ <a href="#" class="sc-qRumB fKscrR">Send me an email instead</a>
+ </span>
+ </div>
+ </div>
+</body>
+</html>