fix device_name escaping (Spotifyd#326)

* fix device_name escaping This commit encodes the device_name before sending it over as a query value to the spotify web api. Device names containing special characters should not crash the daemon anymore.
maringuu · Sep 23, 2019 · 10fc843 · 10fc843
1 parent 1197e00
commit 10fc843
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,6 +18,7 @@ keyring = { version = "0.7.1", optional = true }
 lazy_static = "1.4.0"
 libc = "0.2"
 log = "0.4.6"
+percent-encoding = "2.1.0"
 rspotify = "0.2.5"
 serde = { version = "1.0.99", features = ["derive"] }
 serde_ini = "0.2.0"

diff --git a/src/dbus_mpris.rs b/src/dbus_mpris.rs
@@ -18,6 +18,7 @@ use librespot::{
  },
 };
 use log::{info, warn};
+use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
 use rspotify::spotify::{
  client::Spotify, oauth2::TokenInfo as RspotifyToken, senum::*, util::datetime_to_timestamp,
 };
@@ -121,7 +122,7 @@ fn create_dbus_server(
  macro_rules! spotify_api_method {
  ([ $sp:ident, $device:ident $(, $m:ident: $t:ty)*] $f:expr) => {
  {
- let device_name = device_name.clone();
+ let device_name = utf8_percent_encode(&device_name, NON_ALPHANUMERIC).to_string();
  let token = api_token.clone();
  move |m| {
  let (p, c) = oneshot::channel();
@@ -143,7 +144,7 @@ fn create_dbus_server(
 
  macro_rules! spotify_api_property {
  ([ $sp:ident, $device:ident] $f:expr) => {{
- let device_name = device_name.clone();
+ let device_name = utf8_percent_encode(&device_name, NON_ALPHANUMERIC).to_string();
  let token = api_token.clone();
  move |i, _| {
  let $sp = create_spotify_api(&token);