Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Return with NotFoundError when the requested deviceName/deviceNamePrefix is longer than 29 bytes.

Browse source
This commit is contained in:
fokinv 2016-10-07 10:42:23 +02:00 • committed by zakorgyula
parent 98f2233f2d
commit baa024e362
5 changed files with 3 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/script/dom/bluetooth.rs
View file

@ -9,7 +9,7 @@ use bluetooth_traits::scanfilter::{RequestDeviceoptions, ServiceUUIDSequence};
use core::clone::Clone; use core::clone::Clone;
use dom::bindings::codegen::Bindings::BluetoothBinding::{self, BluetoothMethods, BluetoothRequestDeviceFilter}; use dom::bindings::codegen::Bindings::BluetoothBinding::{self, BluetoothMethods, BluetoothRequestDeviceFilter};
use dom::bindings::codegen::Bindings::BluetoothBinding::RequestDeviceOptions; use dom::bindings::codegen::Bindings::BluetoothBinding::RequestDeviceOptions;
use dom::bindings::error::Error::{self, Security, Type}; use dom::bindings::error::Error::{self, NotFound, Security, Type};
use dom::bindings::error::Fallible; use dom::bindings::error::Fallible;
use dom::bindings::js::Root; use dom::bindings::js::Root;
use dom::bindings::reflector::{Reflectable, Reflector, reflect_dom_object}; use dom::bindings::reflector::{Reflectable, Reflector, reflect_dom_object};
@ -25,7 +25,6 @@ use std::rc::Rc;
const FILTER_EMPTY_ERROR: &'static str = "'filters' member, if present, must be nonempty to find any devices."; const FILTER_EMPTY_ERROR: &'static str = "'filters' member, if present, must be nonempty to find any devices.";
const FILTER_ERROR: &'static str = "A filter must restrict the devices in some way."; const FILTER_ERROR: &'static str = "A filter must restrict the devices in some way.";
const FILTER_NAME_TOO_LONG_ERROR: &'static str = "A 'name' or 'namePrefix' can't be longer then 29 bytes.";
// 248 is the maximum number of UTF-8 code units in a Bluetooth Device Name. // 248 is the maximum number of UTF-8 code units in a Bluetooth Device Name.
const MAX_DEVICE_NAME_LENGTH: usize = 248; const MAX_DEVICE_NAME_LENGTH: usize = 248;
// A device name can never be longer than 29 bytes. // A device name can never be longer than 29 bytes.
@ -213,7 +212,7 @@ fn canonicalize_filter(filter: &BluetoothRequestDeviceFilter) -> Fallible<Blueto
return Err(Type(NAME_TOO_LONG_ERROR.to_owned())); return Err(Type(NAME_TOO_LONG_ERROR.to_owned()));
} }
if name.len() > MAX_FILTER_NAME_LENGTH { if name.len() > MAX_FILTER_NAME_LENGTH {
return Err(Type(FILTER_NAME_TOO_LONG_ERROR.to_owned())); return Err(NotFound);
} }
// Step 2.4.4.2. // Step 2.4.4.2.
@ -233,7 +232,7 @@ fn canonicalize_filter(filter: &BluetoothRequestDeviceFilter) -> Fallible<Blueto
return Err(Type(NAME_TOO_LONG_ERROR.to_owned())); return Err(Type(NAME_TOO_LONG_ERROR.to_owned()));
} }
if name_prefix.len() > MAX_FILTER_NAME_LENGTH { if name_prefix.len() > MAX_FILTER_NAME_LENGTH {
return Err(Type(FILTER_NAME_TOO_LONG_ERROR.to_owned())); return Err(NotFound);
} }
// Step 2.4.5.2. // Step 2.4.5.2.

4
tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-name.html.ini
View file

@ -1,4 +0,0 @@
[max-length-for-name-in-adv-name.html]
type: testharness
[A device name longer than 29 must reject.]
expected: FAIL

4
tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-namePrefix.html.ini
View file

@ -1,4 +0,0 @@
[max-length-for-name-in-adv-namePrefix.html]
type: testharness
[A device name prefix longer than 29 must reject.]
expected: FAIL

4
tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-name.html.ini
View file

@ -1,4 +0,0 @@
[unicode-max-length-for-name-in-adv-name.html]
type: testharness
[Unicode string with utf8 representation between (29, 248\] bytes in 'name' must throw NotFoundError.]
expected: FAIL

4
tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-namePrefix.html.ini
View file

@ -1,4 +0,0 @@
[unicode-max-length-for-name-in-adv-namePrefix.html]
type: testharness
[Unicode string with utf8 representation between (29, 248\] bytes in 'namePrefix' must throw NotFoundError.]
expected: FAIL