mirrors/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-11-29 09:29:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix WebSocket notifications

Browse source 
Ignore a missing `id` query param; it's unclear what this ID represents,
but it wasn't being used in the existing bitwarden_rs code, and no longer
seems to be sent in the latest versions of the official clients.
This commit is contained in:
Jeremy Lin 2020-03-26 19:26:44 -07:00
parent 255a06382d
commit 862d401077
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/api/notifications.rs
View file

@ -152,6 +152,9 @@ impl WSHandler {
impl Handler for WSHandler { impl Handler for WSHandler {
fn on_open(&mut self, hs: Handshake) -> ws::Result<()> { fn on_open(&mut self, hs: Handshake) -> ws::Result<()> {
// Path == "/notifications/hub?id=<id>==&access_token=<access_token>" // Path == "/notifications/hub?id=<id>==&access_token=<access_token>"
//
// We don't use `id`, and as of around 2020-03-25, the official clients
// no longer seem to pass `id` (only `access_token`).
let path = hs.request.resource(); let path = hs.request.resource();
let (_id, access_token) = match path.split('?').nth(1) { let (_id, access_token) = match path.split('?').nth(1) {
@ -170,10 +173,11 @@ impl Handler for WSHandler {
match (id, access_token) { match (id, access_token) {
(Some(a), Some(b)) => (a, b), (Some(a), Some(b)) => (a, b),
_ => return self.err("Missing id or access token"), (None, Some(b)) => ("", b), // Ignore missing `id`.
_ => return self.err("Missing access token"),
} }
} }
None => return self.err("Missing query path"), None => return self.err("Missing query parameters"),
}; };
// Validate the user // Validate the user