mirror of
				https://github.com/NodeBB/NodeBB.git
				synced 2025-10-31 11:05:54 +01:00 
			
		
		
		
	feat: add invalid event name to error message
This commit is contained in:
		| @@ -25,6 +25,7 @@ | |||||||
| 	"invalid-username-or-password": "Please specify both a username and password", | 	"invalid-username-or-password": "Please specify both a username and password", | ||||||
| 	"invalid-search-term": "Invalid search term", | 	"invalid-search-term": "Invalid search term", | ||||||
| 	"invalid-url": "Invalid URL", | 	"invalid-url": "Invalid URL", | ||||||
|  | 	"invalid-event": "Invalid event: %1", | ||||||
| 	"local-login-disabled": "Local login system has been disabled for non-privileged accounts.", | 	"local-login-disabled": "Local login system has been disabled for non-privileged accounts.", | ||||||
| 	"csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again", | 	"csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again", | ||||||
|  |  | ||||||
|   | |||||||
| @@ -4,6 +4,7 @@ const os = require('os'); | |||||||
| const nconf = require('nconf'); | const nconf = require('nconf'); | ||||||
| const winston = require('winston'); | const winston = require('winston'); | ||||||
| const util = require('util'); | const util = require('util'); | ||||||
|  | const validator = require('validator'); | ||||||
| const cookieParser = require('cookie-parser')(nconf.get('secret')); | const cookieParser = require('cookie-parser')(nconf.get('secret')); | ||||||
|  |  | ||||||
| const db = require('../database'); | const db = require('../database'); | ||||||
| @@ -125,7 +126,8 @@ async function onMessage(socket, payload) { | |||||||
| 		if (process.env.NODE_ENV === 'development') { | 		if (process.env.NODE_ENV === 'development') { | ||||||
| 			winston.warn(`[socket.io] Unrecognized message: ${eventName}`); | 			winston.warn(`[socket.io] Unrecognized message: ${eventName}`); | ||||||
| 		} | 		} | ||||||
| 		return callback({ message: '[[error:invalid-event]]' }); | 		const escapedName = validator.escape(String(eventName)); | ||||||
|  | 		return callback({ message: `[[error:invalid-event, ${escapedName}]]` }); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	socket.previousEvents = socket.previousEvents || []; | 	socket.previousEvents = socket.previousEvents || []; | ||||||
|   | |||||||
| @@ -87,7 +87,7 @@ describe('socket.io', () => { | |||||||
| 	it('should return error for unknown event', (done) => { | 	it('should return error for unknown event', (done) => { | ||||||
| 		io.emit('unknown.event', (err) => { | 		io.emit('unknown.event', (err) => { | ||||||
| 			assert(err); | 			assert(err); | ||||||
| 			assert.equal(err.message, '[[error:invalid-event]]'); | 			assert.equal(err.message, '[[error:invalid-event, unknown.event]]'); | ||||||
| 			done(); | 			done(); | ||||||
| 		}); | 		}); | ||||||
| 	}); | 	}); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user