GGLinnk/foris-js
1
0
Fork 0
mirror of https://gitlab.nic.cz/turris/reforis/foris-js.git synced 2024-12-25 00:11:36 +01:00
Code Issues Releases Activity

Add SSID validation for bytes count

Browse Source
This commit is contained in:
Marek Sašek 2020-09-11 17:12:40 +02:00
parent 35b97ec0fe
commit 4d246540c1
No known key found for this signature in database
GPG Key ID: 8791897AFCF3602F
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/WiFiSettings/WiFiForm.js
View File

@ -105,6 +105,7 @@ function DeviceForm({
label="SSID"
value={formData.SSID}
error={formErrors.SSID || null}
helpText={HELP_TEXTS.ssid}
required
onChange={setFormValue((value) => ({
devices: {

1
src/common/WiFiSettings/WiFiGuestForm.js
View File

@ -57,6 +57,7 @@ export default function WifiGuestForm({
label="SSID"
value={formData.SSID}
error={formErrors.SSID}
helpText={HELP_TEXTS.ssid}
onChange={setFormValue((value) => ({
devices: {
[formData.id]: {

20
src/common/WiFiSettings/WiFiSettings.js
View File

@ -63,14 +63,10 @@ function prepDataToSubmit(formData) {
return formData;
}
function diacriticValidation(string) {
for (let i = 0; i < string.length; i++) {
const charCode = string.charCodeAt(i);
if (charCode < 32 || charCode > 127) {
return false;
}
}
return true;
export function byteCount(string) {
const buffer = Buffer.from(string, "utf-8");
const count = buffer.byteLength;
return count;
}
export function validator(formData) {
@ -81,10 +77,8 @@ export function validator(formData) {
if (device.SSID.length > 32)
errors.SSID = _("SSID can't be longer than 32 symbols");
if (device.SSID.length === 0) errors.SSID = _("SSID can't be empty");
if (!diacriticValidation(device.SSID))
errors.SSID = _(
"Your SSID contains non-standard characters. These are not forbidden, but could cause problems on some devices."
);
if (byteCount(device.SSID) > 32)
errors.SSID = _("SSID can't be longer than 32 bytes");
if (device.password.length < 8)
errors.password = _("Password must contain at least 8 symbols");
@ -96,6 +90,8 @@ export function validator(formData) {
guest_wifi_errors.SSID = _("SSID can't be longer than 32 symbols");
if (device.guest_wifi.SSID.length === 0)
guest_wifi_errors.SSID = _("SSID can't be empty");
if (byteCount(device.guest_wifi.SSID) > 32)
guest_wifi_errors.SSID = _("SSID can't be longer than 32 bytes");
if (device.guest_wifi.password.length < 8)
guest_wifi_errors.password = _(

3
src/common/WiFiSettings/constants.js
View File

@ -19,6 +19,9 @@ export const HWMODES = {
"11a": "5",
};
export const HELP_TEXTS = {
ssid: _(
`SSID which contains non-standard characters could cause problems on some devices.`
),
password: _(`
WPA2 pre-shared key, that is required to connect to the network.
`),