prehistoric-systems/keepassxc-browser
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc-browser.git synced 2026-03-11 08:54:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix checking input width with segmented TOTP fields

Browse source
This commit is contained in:
varjolintu 2025-06-02 07:37:57 +03:00
parent dac9ceceff
commit eb92852122
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
keepassxc-browser/content/fields.js
View file

@ -2,6 +2,7 @@
const DEFAULT_SEGMENTED_TOTP_FIELDS = 6;
const MIN_SEGMENTED_TOTP_FIELDS = 4;
const MAX_SEGMENTED_FIELD_LENGTH = 100;
/**
* @Object kpxcFields
@ -104,25 +105,27 @@ kpxcFields.getSegmentedTOTPFields = function(inputs, combinations) {
// If ignoreFieldCount is true, number of TOTP fields are allowed to differ from the default (6),
// but 4 at minimum must exist.
const areFieldsSegmentedTotp = function(totpInputs, ignoreFieldCount = false) {
const fieldCountMatches = (ignoreFieldCount && totpInputs.length >= MIN_SEGMENTED_TOTP_FIELDS) ||
totpInputs.length === DEFAULT_SEGMENTED_TOTP_FIELDS;
const inputIsNumeric = (input) =>
(input.inputMode === 'numeric' || input.inputMode === '') && input.pattern.includes('0-9');
const inputIsText = (input) => input.offsetWidth < MAX_SEGMENTED_FIELD_LENGTH &&
(input.type === 'text' || input.type === 'number') && (input.maxLength === 1 || input.maxLength === -1);
return (
((ignoreFieldCount && totpInputs.length >= MIN_SEGMENTED_TOTP_FIELDS) ||
totpInputs.length === DEFAULT_SEGMENTED_TOTP_FIELDS) &&
totpInputs.every(
input =>
((input.inputMode === 'numeric' || input.inputMode === '') && input.pattern.includes('0-9')) ||
((input.type === 'text' || input.type === 'number') && (input.maxLength === 1 || input.maxLength === -1)) ||
input.type === 'tel'
)
fieldCountMatches &&
totpInputs.every(input => inputIsNumeric(input) || inputIsText(input) || input.type === 'tel')
);
};
const addTotpFieldsToCombination = function(inputFields, ignoreFieldCount = false) {
const totpInputs = Array.from(inputFields).filter(
(e) =>
matchesWithNodeName(e, 'INPUT') &&
e.type !== 'password' &&
e.type !== 'hidden' &&
e.type !== 'submit'
(field) =>
matchesWithNodeName(field, 'INPUT') &&
[ 'hidden', 'password', 'submit' ].includes(field.type) === false &&
field.offsetWidth < MAX_SEGMENTED_FIELD_LENGTH
);
if (areFieldsSegmentedTotp(totpInputs, ignoreFieldCount)) {

6
keepassxc-browser/content/totp-field.js
View file

@ -60,9 +60,11 @@ kpxcTOTPIcons.isAcceptedTOTPField = function(field) {
return false;
}
const includeCheck = (f) => id?.includes(f) || (name?.includes(f) || placeholder?.includes(f));
// Checks if the field id, name or placeholder includes some of the acceptedOTPFields but not any from ignoredTypes
if ((acceptedOTPFields.some(f => id?.includes(f) || (name?.includes(f) || placeholder?.includes(f))) || acceptedParents.some(s => field.closest(s)))
&& !ignoredTypes.some(f => id?.includes(f) || (name?.includes(f) || placeholder?.includes(f)))) {
if ((acceptedOTPFields.some(f => includeCheck(f)) || acceptedParents.some(s => field.closest(s)))
&& !ignoredTypes.some(f => includeCheck(f))) {
return true;
}