Skip to content
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

Protect against stanza ID spoofing #25

Merged
merged 2 commits into from
Apr 10, 2014
Merged

Protect against stanza ID spoofing #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f403e07
Complain if trackId not supplied with a stanza
Apr 10, 2014
305cf0c
Implement stanza ID spoofing
Apr 10, 2014
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
34 changes: 17 additions & 17 deletions lib/pubsub.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ PubSub.prototype.createNode = function(data, callback) {
)
}
}
this.manager.trackId(stanza.root().attr('id'), function(stanza) {
this.manager.trackId(stanza, function(stanza) {
if (stanza.attrs.type === 'error')
return callback(self._parseError(stanza))
callback(null, true)
Expand All @@ -100,7 +100,7 @@ PubSub.prototype.deleteNode = function(data, callback) {
if (data.redirect)
stanza.c('redirect', { uri: data.redirect })

this.manager.trackId(stanza.root().attr('id'), function(stanza) {
this.manager.trackId(stanza, function(stanza) {
if ('error' === stanza.attrs.type)
return callback(self._parseError(stanza), null)
callback(null, true)
Expand All @@ -120,7 +120,7 @@ PubSub.prototype.subscribe = function(data, callback) {
var self = this
var stanza = this._getStanza(data, 'set', 'subscribe')

this.manager.trackId(stanza.root().attr('id'), function(stanza) {
this.manager.trackId(stanza, function(stanza) {
if (stanza.attrs.type === 'error')
return callback(self._parseError(stanza), null)
var subscription = stanza.getChild('pubsub').getChild('subscription')
Expand All @@ -146,7 +146,7 @@ PubSub.prototype.unsubscribe = function(data, callback) {

var self = this
var stanza = this._getStanza(data, 'set', 'unsubscribe')
this.manager.trackId(stanza.root().attr('id'), function(stanza) {
this.manager.trackId(stanza, function(stanza) {
if (stanza.attrs.type === 'error')
return callback(self._parseError(stanza), null)
callback(null, true)
Expand Down Expand Up @@ -174,7 +174,7 @@ PubSub.prototype.setSubscription = function(data, callback) {
{ jid: data.jid, subscription: data.subscription }
)

this.manager.trackId(stanza.root().attr('id'), function(stanza) {
this.manager.trackId(stanza, function(stanza) {
if ('error' === stanza.attrs.type)
return callback(self._parseError(stanza), null)
callback(null, true)
Expand All @@ -193,7 +193,7 @@ PubSub.prototype.subscriptionConfigurationGet = function(data, callback) {
var self = this
var stanza = this._getStanza(data, 'get', 'options')

this.manager.trackId(stanza.root().attr('id'), function(stanza) {
this.manager.trackId(stanza, function(stanza) {
if (stanza.attrs.type === 'error')
return callback(self._parseError(stanza), null)
var data = dataForm.parseFields(
Expand All @@ -213,7 +213,7 @@ PubSub.prototype.subscriptionDefaultConfigurationGet = function(data, callback)
var self = this
var stanza = this._getStanza(data, 'get', 'default')

this.manager.trackId(stanza.root().attr('id'), function(stanza) {
this.manager.trackId(stanza, function(stanza) {
if (stanza.attrs.type === 'error')
return callback(self._parseError(stanza), null)
var data = dataForm.parseFields(
Expand Down Expand Up @@ -241,7 +241,7 @@ PubSub.prototype.subscriptionConfigurationSet = function(data, callback) {
} catch(e) {
return this._clientError('Badly formatted data form', data, callback)
}
this.manager.trackId(stanza.root().attr('id'), function(stanza) {
this.manager.trackId(stanza, function(stanza) {
if (stanza.attrs.type === 'error')
return callback(self._parseError(stanza), null)
callback(null, true)
Expand Down Expand Up @@ -280,7 +280,7 @@ PubSub.prototype.publish = function(data, callback) {
)
}
}
this.manager.trackId(stanza.root().attr('id'), function(stanza) {
this.manager.trackId(stanza, function(stanza) {
if (stanza.attrs.type === 'error')
return callback(self._parseError(stanza), null)
callback(null, {
Expand All @@ -301,7 +301,7 @@ PubSub.prototype.deleteItem = function(data, callback) {
var self = this
var stanza = this._getStanza(data, 'set', 'retract')
stanza.c('item', { id: data.id })
this.manager.trackId(stanza.root().attr('id'), function(stanza) {
this.manager.trackId(stanza, function(stanza) {
if (stanza.attrs.type === 'error')
return callback(self._parseError(stanza), null)
callback(null, true)
Expand All @@ -318,7 +318,7 @@ PubSub.prototype.purgeNode = function(data, callback) {

var self = this
var stanza = this._getStanza(data, 'set', 'purge')
this.manager.trackId(stanza.root().attr('id'), function(stanza) {
this.manager.trackId(stanza, function(stanza) {
if (stanza.attrs.type === 'error')
return callback(self._parseError(stanza), null)
callback(null, true)
Expand All @@ -335,7 +335,7 @@ PubSub.prototype.getNodeConfiguration = function(data, callback) {

var self = this
var stanza = this._getStanza(data, 'get', 'configure', this.NS_OWNER)
this.manager.trackId(stanza.root().attr('id'), function(stanza) {
this.manager.trackId(stanza, function(stanza) {
if ('error' === stanza.attrs.type)
return callback(self._parseError(stanza), null)
var data = dataForm.parseFields(
Expand Down Expand Up @@ -363,7 +363,7 @@ PubSub.prototype.setNodeConfiguration = function(data, callback) {
} catch(e) {
return this._clientError('Badly formatted data form', data, callback)
}
this.manager.trackId(stanza.root().attr('id'), function(stanza) {
this.manager.trackId(stanza, function(stanza) {
if ('error' === stanza.attrs.type)
return callback(self._parseError(stanza), null)
callback(null, true)
Expand Down Expand Up @@ -402,7 +402,7 @@ PubSub.prototype.getItems = function(data, callback) {
}
if (data.rsm) rsm.build(stanza.root().getChild('pubsub'), data.rsm)

this.manager.trackId(stanza.root().attr('id'), function(stanza) {
this.manager.trackId(stanza, function(stanza) {
if (stanza.attrs.type === 'error')
return callback(self._parseError(stanza), null)
var items = []
Expand Down Expand Up @@ -433,7 +433,7 @@ PubSub.prototype.getAffiliations = function(data, callback) {
var self = this
var stanza = this._getStanza(data, 'get', 'affiliations', owner)
if (data.rsm) rsm.build(stanza.root().getChild('pubsub'), data.rsm)
this.manager.trackId(stanza.root().attr('id'), function(stanza) {
this.manager.trackId(stanza, function(stanza) {
if (stanza.attrs.type === 'error')
return callback(self._parseError(stanza), null)
var affiliations = []
Expand Down Expand Up @@ -470,7 +470,7 @@ PubSub.prototype.setAffiliation = function(data, callback) {
var detail = { jid: data.jid }
if (data.affiliation) detail.affiliation = data.affiliation
stanza.c('affiliation', detail)
this.manager.trackId(stanza.root().attr('id'), function(stanza) {
this.manager.trackId(stanza, function(stanza) {
if ('error' === stanza.attrs.type)
return callback(self._parseError(stanza), null)
callback(null, true)
Expand All @@ -491,7 +491,7 @@ PubSub.prototype.getSubscriptions = function(data, callback) {
var self = this
var stanza = this._getStanza(data, 'get', 'subscriptions', owner)
if (data.rsm) rsm.build(stanza.root().getChild('pubsub'), data.rsm)
this.manager.trackId(stanza.root().attr('id'), function(stanza) {
this.manager.trackId(stanza, function(stanza) {
if (stanza.attrs.type === 'error')
return callback(self._parseError(stanza), null)
var subscriptions = []
Expand Down
2 changes: 2 additions & 0 deletions test/lib/pubsub.affiliations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ describe('Publish-Subscribe', function() {
socket: socket,
client: xmpp,
trackId: function(id, callback) {
if (typeof id !== 'object')
throw new Error('Stanza protection ID not added')
this.callback = callback
},
makeCallback: function(error, data) {
Expand Down
2 changes: 2 additions & 0 deletions test/lib/pubsub.configuration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ describe('Publish-Subscribe', function() {
socket: socket,
client: xmpp,
trackId: function(id, callback) {
if (typeof id !== 'object')
throw new Error('Stanza protection ID not added')
this.callback = callback
},
makeCallback: function(error, data) {
Expand Down
2 changes: 2 additions & 0 deletions test/lib/pubsub.create.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ describe('Publish-Subscribe', function() {
socket: socket,
client: xmpp,
trackId: function(id, callback) {
if (typeof id !== 'object')
throw new Error('Stanza protection ID not added')
this.callback = callback
},
makeCallback: function(error, data) {
Expand Down
2 changes: 2 additions & 0 deletions test/lib/pubsub.events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ describe('Publish-Subscribe', function() {
socket: socket,
client: xmpp,
trackId: function(id, callback) {
if (typeof id !== 'object')
throw new Error('Stanza protection ID not added')
this.callback = callback
},
makeCallback: function(error, data) {
Expand Down
2 changes: 2 additions & 0 deletions test/lib/pubsub.items.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ describe('Publish-Subscribe', function() {
socket: socket,
client: xmpp,
trackId: function(id, callback) {
if (typeof id !== 'object')
throw new Error('Stanza protection ID not added')
this.callback = callback
},
makeCallback: function(error, data) {
Expand Down
2 changes: 2 additions & 0 deletions test/lib/pubsub.subscribe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ describe('Publish-Subscribe', function() {
socket: socket,
client: xmpp,
trackId: function(id, callback) {
if (typeof id !== 'object')
throw new Error('Stanza protection ID not added')
this.callback = callback
},
makeCallback: function(error, data) {
Expand Down
2 changes: 2 additions & 0 deletions test/lib/pubsub.subscription.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ describe('Publish-Subscribe', function() {
socket: socket,
client: xmpp,
trackId: function(id, callback) {
if (typeof id !== 'object')
throw new Error('Stanza protection ID not added')
this.callback = callback
},
makeCallback: function(error, data) {
Expand Down