New Facebook authentication flow

CHANGELOG.md

@@ -5,6 +5,30 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.6.2] - 11-12-2021
+### Added
+- Added HTTPS proxy support (#390)
+- Added `GET /instance` API endpoint (#403)
+
+### Fixed 
+- Fixed track repeat behavior (#383)
+- Fixed cache synchronization issue (b3d61f4c3bb7398e2f2246f6aa274f8d903c492b)
+- Minimize audio pop when using pipe (#389)
+- Fix CVE-2021-44228 (#438)
+
+## [1.6.1] - 18-07-2021
+### Added
+- Added `/discovery/list` API endpoint (#352)
+- Added environment variables to shell event hooks (#368)
+- Added `shell.executeWithBash` configuration option (#368)
+
+### Changed
+- Space volume events 500ms apart (#369)
+
+### Fixed
+- Removed redundant pfls message (#361)
+- Refresh AP pool before reconnecting (591fb92db5931d611779ab83f9747f4decaea3f7)
+
 ## [1.6.0] - 09-05-2021
 ### Added
 - Added extended metadata API (#311)

README.md

@@ -46,6 +46,7 @@ Snapshots for all variants are available [here](https://oss.sonatype.org/content
 - [ansible-role-librespot](https://github.com/xMordax/ansible-role-librespot/tree/master) - Ansible role that will build, install and configure librespot-java.
 - [spocon](https://github.com/spocon/spocon) - Install librespot-java from APT
 - [librespot-android](https://github.com/devgianlu/librespot-android) - Run librespot-java on your Android device
+- [MMM-LibrespotJava](https://github.com/l3d00m/MMM-LibrespotJava) - Show the current librespot-java playback on your [MagicMirror](https://github.com/MichMich/MagicMirror)
 
 # Special thanks
 - All the developers of [librespot](https://github.com/librespot-org/librespot) which started this project in Rust

api/README.md

@@ -42,6 +42,7 @@ All the endpoints will respond with `200` if successful or:
 - `GET /profile/{user_id}/following` Retrieve a list of profiles that the specified user is following
 
 ### Instance
+- `GET /instance` Returns a json model that contains basic information about the current session; `device_id`, `device_name`,`device_type`, `country_code`, and `preferred_locale`
 - `POST /instance/terminate` Terminates the API server.
 - `POST /instance/close` Closes the current session (and player).
 

api/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>xyz.gianlu.librespot</groupId>
         <artifactId>librespot-java</artifactId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>1.6.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -99,7 +99,7 @@
         <dependency>
             <groupId>io.undertow</groupId>
             <artifactId>undertow-core</artifactId>
-            <version>2.2.7.Final</version>
+            <version>2.2.14.Final</version>
         </dependency>
     </dependencies>
 </project>

api/src/main/java/xyz/gianlu/librespot/api/ApiServer.java

@@ -35,6 +35,8 @@ public class ApiServer {
     private Undertow undertow = null;
 
     public ApiServer(int port, @NotNull String host, @NotNull SessionWrapper wrapper) {
+        AbsSessionHandler instanceHandler = InstanceHandler.forSession(this, wrapper);
+
         this.port = port;
         this.host = host;
         this.wrapper = wrapper;
@@ -45,7 +47,8 @@ public ApiServer(int port, @NotNull String host, @NotNull SessionWrapper wrapper
                 .post("/token/{scope}", new TokensHandler(wrapper))
                 .post("/profile/{user_id}/{action}", new ProfileHandler(wrapper))
                 .post("/web-api/{endpoint}", new WebApiHandler(wrapper))
-                .post("/instance/{action}", InstanceHandler.forSession(this, wrapper))
+                .get("/instance", instanceHandler)
+                .post("/instance/{action}", instanceHandler)
                 .post("/discovery/{action}", new DiscoveryHandler())
                 .get("/events", events)
                 .setFallbackHandler(new PathHandler(ResponseCodeHandler.HANDLE_404)

api/src/main/java/xyz/gianlu/librespot/api/Utils.java

@@ -83,4 +83,9 @@ public static void internalError(@NotNull HttpServerExchange exchange, @NotNull
         exchange.setStatusCode(StatusCodes.INTERNAL_SERVER_ERROR);
         exchange.getResponseSender().send(String.format(INTERNAL_ERROR_BODY, reason));
     }
+
+    public static void methodNotAllowed(@NotNull HttpServerExchange exchange) {
+        exchange.setStatusCode(StatusCodes.METHOD_NOT_ALLOWED);
+        exchange.getResponseSender().send(StatusCodes.METHOD_NOT_ALLOWED_STRING);
+    }
 }

api/src/main/java/xyz/gianlu/librespot/api/handlers/DiscoveryHandler.java

@@ -21,22 +21,36 @@
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
 import io.undertow.util.Headers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import xyz.gianlu.librespot.ZeroconfServer;
 import xyz.gianlu.librespot.api.Utils;
 import xyz.gianlu.zeroconf.DiscoveredService;
 import xyz.gianlu.zeroconf.Zeroconf;
 
+import java.io.IOException;
 import java.util.Deque;
 import java.util.Map;
 
 /**
  * @author devgianlu
  */
 public final class DiscoveryHandler implements HttpHandler {
-    private final Zeroconf zeroconf;
+    private static final Logger LOGGER = LoggerFactory.getLogger(DiscoveryHandler.class);
+    private final Zeroconf.DiscoveredServices discoverer;
 
     public DiscoveryHandler() {
-        zeroconf = new Zeroconf();
+        Zeroconf zeroconf = new Zeroconf()
+                .setUseIpv4(true)
+                .setUseIpv6(false);
+
+        try {
+            zeroconf.addAllNetworkInterfaces();
+        } catch (IOException ex) {
+            LOGGER.error("Failed adding network interfaces for Zeroconf.", ex);
+        }
+
+        discoverer = zeroconf.discover(ZeroconfServer.SERVICE, "tcp", ".local");
     }
 
     @Override
@@ -57,7 +71,7 @@ public void handleRequest(HttpServerExchange exchange) throws Exception {
         switch (action) {
             case "list":
                 JsonArray array = new JsonArray();
-                for (DiscoveredService service : zeroconf.discover(ZeroconfServer.SERVICE, "tcp", ".local")) {
+                for (DiscoveredService service : discoverer.getServices()) {
                     JsonObject obj = new JsonObject();
                     obj.addProperty("name", service.name);
                     obj.addProperty("target", service.target);

api/src/main/java/xyz/gianlu/librespot/api/handlers/EventsHandler.java

@@ -54,9 +54,10 @@ public void onContextChanged(@NotNull Player player, @NotNull String newUri) {
     }
 
     @Override
-    public void onTrackChanged(@NotNull Player player, @NotNull PlayableId id, @Nullable MetadataWrapper metadata) {
+    public void onTrackChanged(@NotNull Player player, @NotNull PlayableId id, @Nullable MetadataWrapper metadata, boolean userInitiated) {
         JsonObject obj = new JsonObject();
         obj.addProperty("event", "trackChanged");
+        obj.addProperty("userInitiated", userInitiated);
         obj.addProperty("uri", id.toSpotifyUri());
         if (metadata != null) {
             if (metadata.track != null) obj.add("track", ProtobufToJson.convert(metadata.track));
@@ -138,6 +139,14 @@ public void onPanicState(@NotNull Player player) {
         dispatch(obj);
     }
 
+    @Override
+    public void onStartedLoading(@NotNull Player player) {
+    }
+
+    @Override
+    public void onFinishedLoading(@NotNull Player player) {
+    }
+
     @Override
     public void onSessionCleared(@NotNull Session old) {
         old.removeReconnectionListener(this);

api/src/main/java/xyz/gianlu/librespot/api/handlers/InstanceHandler.java

@@ -16,7 +16,10 @@
 
 package xyz.gianlu.librespot.api.handlers;
 
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSyntaxException;
 import io.undertow.server.HttpServerExchange;
+import io.undertow.util.Headers;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.gianlu.librespot.api.ApiServer;
@@ -55,6 +58,16 @@ private static String getAction(@NotNull HttpServerExchange exchange) throws IOE
         return action;
     }
 
+    private static String getInstanceInfo(@NotNull Session session) throws JsonSyntaxException {
+        JsonObject infoObj = new JsonObject();
+        infoObj.addProperty("device_id", session.deviceId());
+        infoObj.addProperty("device_name", session.deviceName());
+        infoObj.addProperty("device_type", session.deviceType().toString());
+        infoObj.addProperty("country_code", session.countryCode());
+        infoObj.addProperty("preferred_locale", session.preferredLocale());
+        return infoObj.toString();
+    }
+
     private static class SessionHandler extends AbsSessionHandler {
         private final ApiServer server;
 
@@ -71,19 +84,31 @@ protected void handleRequest(@NotNull HttpServerExchange exchange, @NotNull Sess
                 return;
             }
 
-            String action = getAction(exchange);
-            if (action == null) return;
-
-            switch (action) {
-                case "terminate":
-                    exchange.endExchange();
-                    new Thread(server::stop).start();
-                    break;
-                case "close":
-                    session.close();
+            String requestMethod = exchange.getRequestMethod().toString();
+            switch(requestMethod) {
+                case "GET":
+                    String info = getInstanceInfo(session);
+                    exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "application/json");
+                    exchange.getResponseSender().send(info);
+                    return;
+                case "POST":
+                    String action = getAction(exchange);
+                    if (action == null) return;
+
+                    switch (action) {
+                        case "terminate":
+                            exchange.endExchange();
+                            new Thread(server::stop).start();
+                            break;
+                        case "close":
+                            session.close();
+                            break;
+                        default:
+                            Utils.methodNotAllowed(exchange);
+                            break;
+                    }
                     break;
                 default:
-                    Utils.invalidParameter(exchange, "action");
                     break;
             }
         }
@@ -105,20 +130,31 @@ protected void handleRequest(@NotNull HttpServerExchange exchange, @NotNull Sess
                 return;
             }
 
-            String action = getAction(exchange);
-            if (action == null) return;
-
-            switch (action) {
-                case "terminate":
-                    exchange.endExchange();
-                    new Thread(server::stop).start();
-                    break;
-                case "close":
-                    player.close();
-                    session.close();
+            String requestMethod = exchange.getRequestMethod().toString();
+            switch(requestMethod) {
+                case "GET":
+                    String info = getInstanceInfo(session);
+                    exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "application/json");
+                    exchange.getResponseSender().send(info);
+                    return;
+                case "POST":
+                    String action = getAction(exchange);
+                    if (action == null) return;
+
+                    switch (action) {
+                        case "terminate":
+                            exchange.endExchange();
+                            new Thread(server::stop).start();
+                            break;
+                        case "close":
+                            session.close();
+                            break;
+                        default:
+                            Utils.methodNotAllowed(exchange);
+                            break;
+                    }
                     break;
                 default:
-                    Utils.invalidParameter(exchange, "action");
                     break;
             }
         }

dacp/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>xyz.gianlu.librespot</groupId>
         <artifactId>librespot-java</artifactId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>1.6.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

decoder-api/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>xyz.gianlu.librespot</groupId>
         <artifactId>librespot-java</artifactId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>1.6.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

lib/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>xyz.gianlu.librespot</groupId>
         <artifactId>librespot-java</artifactId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>1.6.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -116,14 +116,14 @@
         <dependency>
             <groupId>xyz.gianlu.zeroconf</groupId>
             <artifactId>zeroconf</artifactId>
-            <version>1.2.1</version>
+            <version>1.3.2</version>
         </dependency>
 
         <!-- HTTP -->
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.1</version>
+            <version>4.9.3</version>
         </dependency>
 
         <!-- Commons Net (NTP) -->

lib/src/main/java/xyz/gianlu/librespot/cache/CacheManager.java

@@ -33,7 +33,6 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
 import static xyz.gianlu.librespot.audio.storage.ChannelManager.CHUNK_SIZE;
@@ -55,7 +54,7 @@ public class CacheManager implements Closeable {
     private static final int HEADER_HASH = 253;
     private final File parent;
     private final CacheJournal journal;
-    private final Map<String, Handler> fileHandlers = new ConcurrentHashMap<>();
+    private final Map<String, Handler> fileHandlers = Collections.synchronizedMap(new HashMap<>());
 
     public CacheManager(@NotNull Session.Configuration conf) throws IOException {
         if (!conf.cacheEnabled) {

lib/src/main/java/xyz/gianlu/librespot/common/Utils.java

@@ -315,16 +315,23 @@ public static String artistsToString(List<Metadata.Artist> artists) {
     }
 
     @NotNull
-    public static String toBase64(@NotNull byte[] bytes, boolean padding) {
+    public static String toBase64(@NotNull byte[] bytes, boolean url, boolean padding) {
         byte[] encodedBytes;
         try {
             Class<?> clazz = Class.forName(JAVA_UTIL_BASE_64);
-            final Method getEncoder = clazz.getDeclaredMethod("getEncoder");
+
+            Method getEncoder;
+            if (url) getEncoder = clazz.getDeclaredMethod("getUrlEncoder");
+            else getEncoder = clazz.getDeclaredMethod("getEncoder");
+
             Class<?> encoderClazz = Class.forName("java.util.Base64$Encoder");
             Object encoder = getEncoder.invoke(null);
-            final Method withoutPadding = encoderClazz.getDeclaredMethod("withoutPadding");
-            if (!padding)
+
+            if (!padding) {
+                Method withoutPadding = encoderClazz.getDeclaredMethod("withoutPadding");
                 encoder = withoutPadding.invoke(encoder);
+            }
+
             final Method encode = encoderClazz.getDeclaredMethod("encode", byte[].class);
             encodedBytes = (byte[]) encode.invoke(encoder, bytes);
         } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) {
@@ -334,6 +341,8 @@ public static String toBase64(@NotNull byte[] bytes, boolean padding) {
                 int flags = 2; // Base64.NO_WRAP
                 if (!padding)
                     flags |= 1; // Base64.NO_PADDING
+                if (url)
+                    flags |= 8; // Base64.URL_SAFE
                 encodedBytes = (byte[]) encode.invoke(null, bytes, flags); // Base64.NO_WRAP | Base64.NO_PADDING
             } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored2) {
                 throw new NoClassDefFoundError("Base64 not available");
@@ -345,12 +354,12 @@ public static String toBase64(@NotNull byte[] bytes, boolean padding) {
 
     @NotNull
     public static String toBase64NoPadding(@NotNull byte[] bytes) {
-        return toBase64(bytes, false);
+        return toBase64(bytes, false, false);
     }
 
     @NotNull
     public static String toBase64(@NotNull byte[] bytes) {
-        return toBase64(bytes, true);
+        return toBase64(bytes,false, true);
     }
 
     @NotNull