github/peerjs-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use self-rolled CORS

Browse Source
This commit is contained in:
Michelle Bu 2014-11-01 21:48:46 -07:00
parent f41c1e7b2e
commit 63446067fa
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/server.js
View File

@ -2,6 +2,7 @@ var util = require('./util');
var bodyParser = require('body-parser'); var bodyParser = require('body-parser');
var WebSocketServer = require('ws').Server; var WebSocketServer = require('ws').Server;
var url = require('url'); var url = require('url');
var cors = require('cors');
var app = exports = module.exports = {}; var app = exports = module.exports = {};
@ -140,7 +141,7 @@ app._checkKey = function(key, ip, cb) {
app._initializeHTTP = function() { app._initializeHTTP = function() {
var self = this; var self = this;
this.use(util.allowCrossDomain); this.use(cors());
this.get('/', function(req, res, next) { this.get('/', function(req, res, next) {
res.send(require('../app.json')); res.send(require('../app.json'));
@ -182,11 +183,11 @@ app._initializeHTTP = function() {
if (isAllowed) { if (isAllowed) {
res.send(Object.keys(self._clients[key])); res.send(Object.keys(self._clients[key]));
} else { } else {
res.send(401); res.sendStatus(401);
} }
}); });
} else { } else {
res.send(404); res.sendStatus(404);
} }
}); });
@ -197,7 +198,7 @@ app._initializeHTTP = function() {
var client; var client;
if (!self._clients[key] || !(client = self._clients[key][id])) { if (!self._clients[key] || !(client = self._clients[key][id])) {
if (req.params.retry) { if (req.params.retry) {
res.send(401); res.sendStatus(401);
} else { } else {
// Retry this request // Retry this request
req.params.retry = true; req.params.retry = true;
@ -208,7 +209,7 @@ app._initializeHTTP = function() {
// Auth the req // Auth the req
if (req.params.token !== client.token) { if (req.params.token !== client.token) {
res.send(401); res.sendStatus(401);
return; return;
} else { } else {
self._handleTransmission(key, { self._handleTransmission(key, {
@ -217,7 +218,7 @@ app._initializeHTTP = function() {
dst: req.body.dst, dst: req.body.dst,
payload: req.body.payload payload: req.body.payload
}); });
res.send(200); res.sendStatus(200);
} }
}; };

7
lib/util.js
View File

@ -25,13 +25,6 @@ var util = {
}, },
prettyError: function (msg) { prettyError: function (msg) {
console.log('ERROR PeerServer: ', msg); console.log('ERROR PeerServer: ', msg);
},
allowCrossDomain: function(req, res, next) {
res.setHeader('Access-Control-Allow-Origin', '*');
res.setHeader('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,OPTIONS');
res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
next();
} }
}; };