depau/HackMD
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #716 from stbuehler/fix-referer

Browse source 
don't require referer to find note id in socket.io connections (fixes #623)
This commit is contained in:
Christoph (Sheogorath) Kern 2018-02-05 14:50:47 +01:00 committed by GitHub
commit f3358b49f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/realtime.js
View file

@ -272,9 +272,14 @@ function isReady () {
} }
function extractNoteIdFromSocket (socket) { function extractNoteIdFromSocket (socket) {
if (!socket || !socket.handshake || !socket.handshake.headers) { if (!socket || !socket.handshake) {
return false return false
} }
if (socket.handshake.query && socket.handshake.query.noteId) {
return socket.handshake.query.noteId
} else if (socket.handshake.headers) {
// this part is only for backward compatibility only; current code
// should be using noteId query parameter instead.
var referer = socket.handshake.headers.referer var referer = socket.handshake.headers.referer
if (!referer) { if (!referer) {
return false return false
@ -282,6 +287,9 @@ function extractNoteIdFromSocket (socket) {
var hostUrl = url.parse(referer) var hostUrl = url.parse(referer)
var noteId = config.urlpath ? hostUrl.pathname.slice(config.urlpath.length + 1, hostUrl.pathname.length).split('/')[1] : hostUrl.pathname.split('/')[1] var noteId = config.urlpath ? hostUrl.pathname.slice(config.urlpath.length + 1, hostUrl.pathname.length).split('/')[1] : hostUrl.pathname.split('/')[1]
return noteId return noteId
} else {
return false
}
} }
function parseNoteIdFromSocket (socket, callback) { function parseNoteIdFromSocket (socket, callback) {

3
public/js/index.js
View file

@ -1762,6 +1762,9 @@ window.havePermission = havePermission
var io = require('socket.io-client') var io = require('socket.io-client')
var socket = io.connect({ var socket = io.connect({
path: urlpath ? '/' + urlpath + '/socket.io/' : '', path: urlpath ? '/' + urlpath + '/socket.io/' : '',
query: {
noteId: noteid
},
timeout: 5000, // 5 secs to timeout, timeout: 5000, // 5 secs to timeout,
reconnectionAttempts: 20 // retry 20 times on connect failed reconnectionAttempts: 20 // retry 20 times on connect failed
}) })