Added logout feature + close old session in Zeroconf + send response for errors

Author: devgianlu

core/src/main/java/xyz/gianlu/librespot/core/Session.java

@@ -60,7 +60,7 @@
 /**
  * @author Gianlu
  */
-public final class Session implements Closeable, SubListener {
+public final class Session implements Closeable, SubListener, DealerClient.MessageListener {
     private static final Logger LOGGER = LogManager.getLogger(Session.class);
     private static final byte[] serverKey = new byte[]{
             (byte) 0xac, (byte) 0xe0, (byte) 0x46, (byte) 0x0b, (byte) 0xff, (byte) 0xc2, (byte) 0x30, (byte) 0xaf, (byte) 0xf4, (byte) 0x6b, (byte) 0xfe, (byte) 0xc3,
@@ -354,7 +354,8 @@ void authenticate(@NotNull Authentication.LoginCredentials credentials) throws I
         dealer.connect();
 
         LOGGER.info("Authenticated as {}!", apWelcome.getCanonicalUsername());
-        mercuryClient.interestedIn("spotify:user:attributes:update", this);
+        mercury().interestedIn("spotify:user:attributes:update", this);
+        dealer().addMessageListener(this, "hm://connect-state/v1/connect/logout");
     }
 
     /**
@@ -780,6 +781,17 @@ public void event(@NotNull MercuryClient.Response resp) {
         }
     }
 
+    @Override
+    public void onMessage(@NotNull String uri, @NotNull Map<String, String> headers, @NotNull byte[] payload) throws IOException {
+        if (uri.equals("hm://connect-state/v1/connect/logout")) {
+            try {
+                close();
+            } catch (IOException ex) {
+                LOGGER.error("Failed closing session due to logout.", ex);
+            }
+        }
+    }
+
     public interface ReconnectionListener {
         void onConnectionDropped();
 

core/src/main/java/xyz/gianlu/librespot/core/ZeroconfServer.java

@@ -217,7 +217,6 @@ public void close() throws IOException {
 
     public void closeSession() throws IOException {
         if (session != null) session.close();
-
         session = null;
     }
 
@@ -279,6 +278,12 @@ private void handleAddUser(OutputStream out, Map<String, String> params, String
         synchronized (connectionLock) {
             if (username.equals(connectingUsername)) {
                 LOGGER.info("{} is already trying to connect.", username);
+
+                out.write(httpVersion.getBytes());
+                out.write(" 403 Forbidden".getBytes()); // I don't think this is the Spotify way
+                out.write(EOL);
+                out.write(EOL);
+                out.flush();
                 return;
             }
         }
@@ -310,13 +315,25 @@ private void handleAddUser(OutputStream out, Map<String, String> params, String
 
         if (!Arrays.equals(mac, checksum)) {
             LOGGER.fatal("Mac and checksum don't match!");
+
+            out.write(httpVersion.getBytes());
+            out.write(" 400 Bad Request".getBytes()); // I don't think this is the Spotify way
+            out.write(EOL);
+            out.write(EOL);
+            out.flush();
             return;
         }
 
         Cipher aes = Cipher.getInstance("AES/CTR/NoPadding");
         aes.init(Cipher.DECRYPT_MODE, new SecretKeySpec(Arrays.copyOfRange(encryptionKey, 0, 16), "AES"), new IvParameterSpec(iv));
         byte[] decrypted = aes.doFinal(encrypted);
 
+        try {
+            closeSession();
+        } catch (IOException ex) {
+            LOGGER.warn("Failed closing previous session.", ex);
+        }
+
         try {
             synchronized (connectionLock) {
                 connectingUsername = username;
@@ -327,13 +344,6 @@ private void handleAddUser(OutputStream out, Map<String, String> params, String
             session = Session.from(inner);
             LOGGER.info("Accepted new user from {}. {deviceId: {}}", params.get("deviceName"), session.deviceId());
 
-            session.connect();
-            session.authenticate(credentials);
-
-            synchronized (connectionLock) {
-                connectingUsername = null;
-            }
-
             // Sending response
             String resp = DEFAULT_SUCCESSFUL_ADD_USER.toString();
             out.write(httpVersion.getBytes());
@@ -348,6 +358,14 @@ private void handleAddUser(OutputStream out, Map<String, String> params, String
             out.write(resp.getBytes());
             out.flush();
 
+
+            session.connect();
+            session.authenticate(credentials);
+
+            synchronized (connectionLock) {
+                connectingUsername = null;
+            }
+
             sessionListeners.forEach(l -> l.sessionChanged(session));
         } catch (Session.SpotifyAuthenticationException | MercuryClient.MercuryException ex) {
             LOGGER.fatal("Couldn't establish a new session.", ex);