Merge 2471534 into 1eada99

lib/client.js

@@ -23,6 +23,7 @@ function Client (broker, conn, req) {
   this.parser = mqtt.parser()
   this.connected = false
   this.connackSent = false
+  this.authorized = false
   this.errored = false
   this.clean = true
   this._handling = 0
@@ -291,7 +292,7 @@ Client.prototype.close = function (done) {
     that.connected = false
     that.disconnected = true
 
-    if (that.broker.clients[that.id]) {
+    if (that.broker.clients[that.id] && that.authorized) {
       that.broker.unregisterClient(that)
     }
 

lib/handlers/connect.js

@@ -111,6 +111,7 @@ function authenticate (arg, done) {
       return
     }
     if (!err && successful) {
+      client.authorized = true
       return done()
     }
 

test/auth.js

@@ -924,3 +924,33 @@ test('prevent publish in QoS0 mode', function (t) {
     t.fail('Should have not recieved this packet')
   })
 })
+
+test('unauthorized connection should not unregister the correct one', function (t) {
+  t.plan(2)
+
+  var broker = aedes({
+    authenticate: function (client, username, password, callback) {
+      if (username === 'correct') {
+        callback(null, true)
+      } else {
+        const error = new Error()
+        error.returnCode = 1
+        callback(error, false)
+      }
+    }
+  })
+
+  connect(setup(broker), {
+    clientId: 'my-client',
+    username: 'correct'
+  }, function () {
+    t.equal(broker.connectedClients, 1, 'my-client connected')
+    connect(setup(broker), {
+      clientId: 'my-client',
+      username: 'unauthorized'
+    }, function () {
+      // other unauthorized connection with the same clientId should not unregister the correct one.
+      t.equal(broker.connectedClients, 1, 'my-client still connected')
+    })
+  })
+})