Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix to allow zero length client identifiers in MQTT v5.0 #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2021
Merged

fix to allow zero length client identifiers in MQTT v5.0 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,37 @@ testParseGenerate('no clientId with 3.1.1', {
0, 0 // Client ID length
]))

testParseGenerateDefaults('no clientId with 5.0', {
cmd: 'connect',
protocolId: 'MQTT',
protocolVersion: 5,
clean: true,
keepalive: 60,
properties:
{
receiveMaximum: 20
},
clientId: ''
}, Buffer.from(
[16, 16, 0, 4, 77, 81, 84, 84, 5, 2, 0, 60, 3, 33, 0, 20, 0, 0]
), {
cmd: 'connect',
retain: false,
qos: 0,
dup: false,
length: 16,
topic: null,
payload: null,
protocolId: 'MQTT',
protocolVersion: 5,
clean: true,
keepalive: 60,
properties: {
receiveMaximum: 20
},
clientId: ''
}, { protocolVersion: 5 })

testParseGenerateDefaults('default connect', {
cmd: 'connect',
clientId: 'test'
Expand Down
4 changes: 2 additions & 2 deletions writeToStream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ function connect (packet, stream, opts) {
return false
} else length += 1

// ClientId might be omitted in 3.1.1, but only if cleanSession is set to 1
// ClientId might be omitted in 3.1.1 and 5, but only if cleanSession is set to 1
if ((typeof clientId === 'string' || Buffer.isBuffer(clientId)) &&
(clientId || protocolVersion === 4) && (clientId || clean)) {
(clientId || protocolVersion >= 4) && (clientId || clean)) {
length += clientId.length + 2
} else {
if (protocolVersion < 4) {
Expand Down