a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pull request: 3684 validate client id in the mobileconfig form 

Closes #3684

Squashed commit of the following:

commit 78e9862f7a06262f91c28d6ddcc10512560eedae
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Oct 15 14:39:36 2021 +0300

    fix build

commit 3ed4ee69590f238396dd3aab2b62f110baa6d681
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Oct 15 13:39:12 2021 +0300

    client: validate client id in the mobileconfig form
This commit is contained in:
Ildar Kamalov 2021-10-15 15:01:50 +03:00
parent 2796e65468
commit 3fa38fb420
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/components/ui/Guide/MobileConfigForm.js
View File

@ -14,7 +14,7 @@ import {
toNumber, toNumber,
} from '../../../helpers/form'; } from '../../../helpers/form';
import { import {
validateClientId, validateConfigClientId,
validateServerName, validateServerName,
validatePort, validatePort,
validateIsSafePort, validateIsSafePort,
@ -132,7 +132,7 @@ const MobileConfigForm = ({ invalid }) => {
component={renderInputField} component={renderInputField}
className="form-control" className="form-control"
placeholder={i18next.t('client_id_placeholder')} placeholder={i18next.t('client_id_placeholder')}
validate={validateClientId} validate={validateConfigClientId}
/> />
</div> </div>
<div className="form__group form__group--settings"> <div className="form__group form__group--settings">

2
client/src/helpers/constants.js
View File

@ -24,7 +24,7 @@ export const R_UNIX_ABSOLUTE_PATH = /^(\/[^/\x00]+)+$/;
// eslint-disable-next-line no-control-regex // eslint-disable-next-line no-control-regex
export const R_WIN_ABSOLUTE_PATH = /^([a-zA-Z]:)?(\\|\/)(?:[^\\/:*?"<>|\x00]+\\)*[^\\/:*?"<>|\x00]*$/; export const R_WIN_ABSOLUTE_PATH = /^([a-zA-Z]:)?(\\|\/)(?:[^\\/:*?"<>|\x00]+\\)*[^\\/:*?"<>|\x00]*$/;
export const R_CLIENT_ID = /^[a-z0-9-]{1,64}$/; export const R_CLIENT_ID = /^[a-z0-9-]{1,63}$/;
export const HTML_PAGES = { export const HTML_PAGES = {
INSTALL: '/install.html', INSTALL: '/install.html',

15
client/src/helpers/validators.js
View File

@ -83,6 +83,21 @@ export const validateClientId = (value) => {
return undefined; return undefined;
}; };
/**
* @param value {string}
* @returns {undefined|string}
*/
export const validateConfigClientId = (value) => {
if (!value) {
return undefined;
}
const formattedValue = value.trim();
if (formattedValue && !R_CLIENT_ID.test(formattedValue)) {
return 'form_error_client_id_format';
}
return undefined;
};
/** /**
* @param value {string} * @param value {string}
* @returns {undefined|string} * @returns {undefined|string}