Skip to content

TLS-implementation #2

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

Open
DigidragonZX wants to merge 3 commits into
base: master
Choose a base branch
from
Open

TLS-implementation #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5a1928
Changes to allow TLS
Dec 21, 2018
73c460e
Fixed TLS implementation
Dec 21, 2018
4ad37c5
Some small if statements so that it works both with or without TLS (F…
Dec 21, 2018
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
25 changes: 18 additions & 7 deletions src/Mqtt/Mqtt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class Mqtt {
this.Event = Event
this.Helpers = Helpers
this.Config = Config

this.listeners = []

this.Event.fire('MQTT:Initializing')
Expand Down Expand Up @@ -139,13 +140,23 @@ class Mqtt {
}

_createClient () {
this.client = mqtt.connect(
`mqtt://${this.Config.get('mqtt.host')}:${this.Config.get('mqtt.port')}`,
{
username: this.Config.get('mqtt.username'),
password: this.Config.get('mqtt.password')
}
)
const options = {
username: (this.Config.get('mqtt.username') != '') ? this.Config.get('mqtt.username') : null,
password: (this.Config.get('mqtt.password') != '') ? this.Config.get('mqtt.password') : null,

// Necessary only if the server requires client certificate authentication
key: (fs.existsSync(this.Config.get('mqtt.key'))) ? fs.readFileSync(this.Config.get('mqtt.key')) : null,
cert: (fs.existsSync(this.Config.get('mqtt.cert'))) ? fs.readFileSync(this.Config.get('mqtt.cert')) : null,

// Necessary only if the server uses a self-signed certificate.
ca: [ (fs.existsSync(this.Config.get('mqtt.ca'))) ? fs.readFileSync(this.Config.get('mqtt.ca')) : null ],

// Necessary only if the server's cert isn't for "localhost".
checkServerIdentity: () => { return null; },
rejectUnauthorized: false,
}

this.client = mqtt.connect(`mqtt://${this.Config.get('mqtt.host')}:${this.Config.get('mqtt.port')}`, options)
this.client.on('connect', this._handleConnect.bind(this))
this.client.on('offline', this._handleDisconnect.bind(this))
this.client.on('close', this._handleDisconnect.bind(this))
Expand Down