opensource/RSSHub
3
0
Fork 0
mirror of https://github.com/DIYgod/RSSHub.git synced 2026-09-01 14:57:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: blacklist in middleware/access-control

Browse Source
This commit is contained in:
DIYgod
2019-01-24 16:02:47 +08:00
parent d667a049b6
commit 36eae92311
6 changed files with 68 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/config.js
+2
View File
@@ -60,4 +60,6 @@ module.exports = {
host: process.env.PROXY_HOST || null,
port: process.env.PROXY_PORT || null,
},
blacklist: process.env.BLACKLIST && process.env.BLACKLIST.split(','),
whitelist: process.env.WHITELIST && process.env.WHITELIST.split(','),
};
lib/index.js
+7 -3
View File
@@ -125,15 +125,16 @@ app.use(mount('/protected', protected_router.routes())).use(protected_router.all
app.use(mount('/api', api_router.routes())).use(api_router.allowedMethods());
// connect
let server;
if (config.connect.port) {
app.listen(config.connect.port, parseInt(config.listenInaddrAny) ? null : '127.0.0.1');
server = app.listen(config.connect.port, parseInt(config.listenInaddrAny) ? null : '127.0.0.1');
logger.info('Listening Port ' + config.connect.port);
}
if (config.connect.socket) {
if (fs.existsSync(config.connect.socket)) {
fs.unlinkSync(config.connect.socket);
}
app.listen(config.connect.socket, parseInt(config.listenInaddrAny) ? null : '127.0.0.1');
server = app.listen(config.connect.socket, parseInt(config.listenInaddrAny) ? null : '127.0.0.1');
logger.info('Listening Unix Socket ' + config.connect.socket);
process.on('SIGINT', () => {
fs.unlinkSync(config.connect.socket);
@@ -141,4 +142,7 @@ if (config.connect.socket) {
});
}
module.exports = app;
module.exports = {
server: server,
app: app,
};
lib/middleware/access-control.js
+5 -6
View File
@@ -1,7 +1,6 @@
const art = require('art-template');
const path = require('path');
const blacklist = process.env.BLACKLIST && process.env.BLACKLIST.split(',');
const whitelist = process.env.WHITELIST && process.env.WHITELIST.split(',');
const config = require('../config');
const reject = (ctx) => {
ctx.response.status = 403;
@@ -21,13 +20,13 @@ module.exports = async (ctx, next) => {
if (requestPath === '/') {
await next();
} else {
if (whitelist) {
if (!(whitelist.indexOf(ip) !== -1 || whitelist.indexOf(requestPath) !== -1)) {
if (config.whitelist) {
if (!(config.whitelist.indexOf(ip) !== -1 || config.whitelist.indexOf(requestPath) !== -1)) {
reject(ctx);
}
} else {
if (blacklist) {
if (blacklist.indexOf(ip) !== -1 || blacklist.indexOf(requestPath) !== -1) {
if (config.blacklist) {
if (config.blacklist.indexOf(ip) !== -1 || config.blacklist.indexOf(requestPath) !== -1) {
reject(ctx);
}
}
lib/router.js
+5 -6
View File
@@ -86,23 +86,22 @@ router.get('/', async (ctx) => {
});
});
router.get('/test', (ctx) => {
router.get('/test/:id', (ctx) => {
ctx.state.data = {
title: 'DIYgod',
link: 'https://diygod.me/',
description: '测试路由 Test route',
title: `Test ${ctx.params.id}`,
link: 'https://github.com/DIYgod/RSSHub',
item: [
{
title: 'Title1',
description: 'Item1',
pubDate: new Date('2018-4-2').toUTCString(),
link: 'https://diygod.me/1',
link: 'https://github.com/DIYgod/RSSHub/issues/1',
},
{
title: 'Title2',
description: 'Item2',
pubDate: new Date('2018-4-10').toUTCString(),
link: 'https://diygod.me/2',
link: 'https://github.com/DIYgod/RSSHub/issues/2',
},
],
};
test/middleware/access-control.js
+37
View File
@@ -0,0 +1,37 @@
const supertest = require('supertest');
const Parser = require('rss-parser');
const parser = new Parser();
let server;
async function checkBlock(response) {
expect(response.status).toBe(403);
expect(await parser.parseString(response.text)).toMatchObject({
items: [],
title: '没有访问权限. Access denied.',
});
}
afterEach(() => {
process.env.BLACKLIST = undefined;
server.close();
});
describe('access-control', () => {
it(`blacklist`, async () => {
process.env.BLACKLIST = '/test/1,/test/2,233.233.233.233';
server = require('../../lib/index').server;
const request = supertest(server);
const response1 = await request.get('/test/1');
checkBlock(response1);
const response2 = await request.get('/test/2');
checkBlock(response2);
const response31 = await request.get('/test/3');
expect(response31.status).toBe(200);
const response32 = await request.get('/test/3').set('X-Forwarded-For', '233.233.233.233');
checkBlock(response32);
});
});
test/router.js
+12 -8
View File
@@ -1,6 +1,6 @@
const supertest = require('supertest');
const app = require('../lib/index');
const request = supertest(app.callback());
const { server } = require('../lib/index');
const request = supertest(server);
const Parser = require('rss-parser');
const parser = new Parser();
const config = require('../lib/config');
@@ -46,6 +46,10 @@ async function checkRSS(response) {
});
}
afterAll(() => {
server.close();
});
describe('router', () => {
// root
it(`/`, async () => {
@@ -56,14 +60,14 @@ describe('router', () => {
});
// route
it(`/test (origin)`, async () => {
const response = await request.get('/test');
it(`/test/1 (origin)`, async () => {
const response = await request.get('/test/1');
expect(response.status).toBe(200);
await checkRSS(response);
});
it(`/test (cache)`, async () => {
const response = await request.get('/test');
it(`/test/1 (cache)`, async () => {
const response = await request.get('/test/1');
expect(response.status).toBe(200);
if (config.cacheType === 'memory') {
expect(response.headers['x-koa-memory-cache']).toBe('true');
@@ -82,7 +86,7 @@ describe('router', () => {
status: 0,
data: {
test: {
routes: ['/test'],
routes: ['/test/:id'],
},
},
message: 'request returned 1 route',
@@ -96,7 +100,7 @@ describe('router', () => {
status: 0,
data: {
test: {
routes: ['/test'],
routes: ['/test/:id'],
},
},
message: expect.stringMatching(/request returned (\d+) routes/),