From bdc41670a97401f8ded428df360556a1c40ccbd7 Mon Sep 17 00:00:00 2001 From: Paul Melnikow Date: Tue, 29 Sep 2020 21:05:55 -0400 Subject: [PATCH] Remove obsolete WebSocket logs monitor (#5629) This never worked in prod (see #1460) --- core/server/monitor.js | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/core/server/monitor.js b/core/server/monitor.js index b7d854b257..ef997d91e2 100644 --- a/core/server/monitor.js +++ b/core/server/monitor.js @@ -1,20 +1,7 @@ 'use strict' const config = require('config').util.toObject() -const secretIsValid = require('./secret-is-valid') const RateLimit = require('./rate-limit') -const log = require('./log') - -function secretInvalid(req, res) { - if (!secretIsValid(req.password)) { - // An unknown entity tries to connect. Let the connection linger for a minute. - setTimeout(() => { - res.json({ errors: [{ code: 'invalid_secrets' }] }) - }, 10000) - return true - } - return false -} function setRoutes({ rateLimit }, { server, metricInstance }) { const ipRateLimit = new RateLimit({ @@ -29,12 +16,6 @@ function setRoutes({ rateLimit }, { server, metricInstance }) { }) server.handle((req, res, next) => { - if (req.url.startsWith('/sys/')) { - if (secretInvalid(req, res)) { - return - } - } - if (rateLimit) { const ip = (req.headers['x-forwarded-for'] || '').split(', ')[0] || @@ -63,23 +44,6 @@ function setRoutes({ rateLimit }, { server, metricInstance }) { res.json({ ips: config.public.shields_ips }) }) - server.ws('/sys/logs', socket => { - const listener = (...msg) => socket.send(msg.join(' ')) - socket.on('close', () => log.removeListener(listener)) - socket.on('message', msg => { - let req - try { - req = JSON.parse(msg) - } catch (e) { - return - } - if (!secretIsValid(req.secret)) { - return socket.close() - } - log.addListener(listener) - }) - }) - server.get('/sys/rate-limit', (req, res) => { res.json({ ip: ipRateLimit.toJSON(), @@ -95,6 +59,4 @@ function setRoutes({ rateLimit }, { server, metricInstance }) { } } -module.exports = { - setRoutes, -} +module.exports = { setRoutes }