From d232974d8ae3e07ea701a4bbd0b3613d438ad286 Mon Sep 17 00:00:00 2001 From: hristoterezov Date: Mon, 2 Nov 2015 11:21:30 -0600 Subject: [PATCH] Adds basic validation for the conference name. --- JitsiConference.js | 61 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 18 deletions(-) diff --git a/JitsiConference.js b/JitsiConference.js index 9c5a00a7f..5a56257aa 100644 --- a/JitsiConference.js +++ b/JitsiConference.js @@ -18,6 +18,11 @@ var Statistics = require("./modules/statistics/statistics"); */ function JitsiConference(options) { + if(!options.name || options.name.toLowerCase() === options.name) { + console.error("Invalid conference name (no conference name passed or it" + + "contains invalid characters like capital letters)!"); + return; + } this.options = options; this.connection = this.options.connection; this.xmpp = this.connection.xmpp; @@ -36,14 +41,16 @@ function JitsiConference(options) { * @param password {string} the password */ JitsiConference.prototype.join = function (password) { - this.room.join(password); + if(this.room) + this.room.join(password); } /** * Leaves the conference. */ JitsiConference.prototype.leave = function () { - this.xmpp.leaveRoom(this.room.roomjid); + if(this.xmpp) + this.xmpp.leaveRoom(this.room.roomjid); this.room = null; } @@ -55,14 +62,16 @@ JitsiConference.prototype.leave = function () { * or a JitsiConferenceError if rejected. */ JitsiConference.prototype.createLocalTracks = function (options) { - return this.rtc.obtainAudioAndVideoPermissions(options || {}); + if(this.rtc) + return this.rtc.obtainAudioAndVideoPermissions(options || {}); } /** * Returns the local tracks. */ JitsiConference.prototype.getLocalTracks = function () { - return this.rtc.localStreams; + if(this.rtc) + return this.rtc.localStreams; }; @@ -75,7 +84,8 @@ JitsiConference.prototype.getLocalTracks = function () { * Note: consider adding eventing functionality by extending an EventEmitter impl, instead of rolling ourselves */ JitsiConference.prototype.on = function (eventId, handler) { - this.eventEmitter.on(eventId, handler); + if(this.eventEmitter) + this.eventEmitter.on(eventId, handler); } /** @@ -86,7 +96,8 @@ JitsiConference.prototype.on = function (eventId, handler) { * Note: consider adding eventing functionality by extending an EventEmitter impl, instead of rolling ourselves */ JitsiConference.prototype.off = function (eventId, handler) { - this.eventEmitter.removeListener(eventId, listener); + if(this.eventEmitter) + this.eventEmitter.removeListener(eventId, listener); } // Common aliases for event emitter @@ -99,7 +110,8 @@ JitsiConference.prototype.removeEventListener = JitsiConference.prototype.off * @param handler {Function} handler for the command */ JitsiConference.prototype.addCommandListener = function (command, handler) { - this.room.addPresenceListener(command, handler); + if(this.room) + this.room.addPresenceListener(command, handler); } /** @@ -107,7 +119,8 @@ JitsiConference.prototype.removeEventListener = JitsiConference.prototype.off * @param command {String} the name of the command */ JitsiConference.prototype.removeCommandListener = function (command) { - this.room.removePresenceListener(command); + if(this.room) + this.room.removePresenceListener(command); } /** @@ -115,7 +128,8 @@ JitsiConference.prototype.removeEventListener = JitsiConference.prototype.off * @param message the text message. */ JitsiConference.prototype.sendTextMessage = function (message) { - this.room.sendMessage(message); + if(this.room) + this.room.sendMessage(message); } /** @@ -124,8 +138,10 @@ JitsiConference.prototype.sendTextMessage = function (message) { * @param values Object with keys and values that will be send. **/ JitsiConference.prototype.sendCommand = function (name, values) { - this.room.addToPresence(name, values); - this.room.sendPresence(); + if(this.room) { + this.room.addToPresence(name, values); + this.room.sendPresence(); + } } /** @@ -145,7 +161,8 @@ JitsiConference.prototype.sendCommandOnce = function (name, values) { * @param persistent if false the command will be sent only one time **/ JitsiConference.prototype.removeCommand = function (name) { - this.room.removeFromPresence(name); + if(this.room) + this.room.removeFromPresence(name); } /** @@ -153,8 +170,10 @@ JitsiConference.prototype.removeCommand = function (name) { * @param name the display name to set */ JitsiConference.prototype.setDisplayName = function(name) { - this.room.addToPresence("nick", {attributes: {xmlns: 'http://jabber.org/protocol/nick'}, value: name}); - this.room.sendPresence(); + if(this.room){ + this.room.addToPresence("nick", {attributes: {xmlns: 'http://jabber.org/protocol/nick'}, value: name}); + this.room.sendPresence(); + } } /** @@ -162,7 +181,9 @@ JitsiConference.prototype.setDisplayName = function(name) { * @param id the identifier of the participant */ JitsiConference.prototype.selectParticipant = function(participantId) { - this.rtc.selectedEndpoint(participantId); + if (this.rtc) { + this.rtc.selectedEndpoint(participantId); + } } /** @@ -170,7 +191,8 @@ JitsiConference.prototype.selectParticipant = function(participantId) { * @param id the identifier of the participant */ JitsiConference.prototype.pinParticipant = function(participantId) { - this.rtc.pinEndpoint(participantId); + if(this.rtc) + this.rtc.pinEndpoint(participantId); } /** @@ -187,11 +209,14 @@ JitsiConference.prototype.getParticipants = function() { * @param id the id of the participant. */ JitsiConference.prototype.getParticipantById = function(id) { - return this.participants[id]; + if(this.participants) + return this.participants[id]; + return null; } JitsiConference.prototype.onMemberJoined = function (jid, email, nick) { - this.eventEmitter.emit(JitsiConferenceEvents.USER_JOINED, Strophe.getResourceFromJid(jid)); + if(this.eventEmitter) + this.eventEmitter.emit(JitsiConferenceEvents.USER_JOINED, Strophe.getResourceFromJid(jid)); // this.participants[jid] = new JitsiParticipant(); }