opensource/RSSHub
1
0
Fork 0
mirror of https://github.com/DIYgod/RSSHub.git synced 2025-12-04 19:59:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 使用环境变量赋予所有本地 IP 访问权限 (#4908)

Browse Source
This commit is contained in:
Henry Wang
2020-06-07 15:45:54 +01:00
committed by GitHub
parent 46f67b833d
commit 731a5d43f7
6 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/en/install/README.md
View File

@@ -325,7 +325,7 @@ For readers that do not support HTTP Basic authentication, please refer to [Acce
### Access Control Configuration ### Access Control Configuration
RSSHub supports access control via access key/code, whitelisting and blacklisting, enabling any will activate access control for all routes. RSSHub supports access control via access key/code, whitelisting and blacklisting, enabling any will activate access control for all routes. `ALLOW_LOCALHOST: true` will grant access to all localhost IP addresses.
#### White/blacklisting #### White/blacklisting

2
docs/install/README.md
View File

@@ -351,7 +351,7 @@ RSSHub 支持 `memory` 和 `redis` 两种缓存方式
### 访问控制配置 ### 访问控制配置
RSSHub 支持使用访问密钥 / 码，白名单和黑名单三种方式进行访问控制。开启任意选项将会激活全局访问控制，没有访问权限将会导致访问被拒绝。 RSSHub 支持使用访问密钥 / 码，白名单和黑名单三种方式进行访问控制。开启任意选项将会激活全局访问控制，没有访问权限将会导致访问被拒绝。同时可以通过 `ALLOW_LOCALHOST: true` 赋予所有本地 IP 访问权限。
#### 黑白名单 #### 黑白名单

1
lib/config.js
View File

@@ -95,6 +95,7 @@ const calculateValue = () => {
}, },
blacklist: envs.BLACKLIST && envs.BLACKLIST.split(','), blacklist: envs.BLACKLIST && envs.BLACKLIST.split(','),
whitelist: envs.WHITELIST && envs.WHITELIST.split(','), whitelist: envs.WHITELIST && envs.WHITELIST.split(','),
allowLocalhost: envs.ALLOW_LOCALHOST,
accessKey: envs.ACCESS_KEY, accessKey: envs.ACCESS_KEY,
enableCluster: envs.ENABLE_CLUSTER, enableCluster: envs.ENABLE_CLUSTER,
email: { email: {

5
lib/middleware/access-control.js
View File

@@ -1,5 +1,6 @@
const config = require('@/config').value; const config = require('@/config').value;
const md5 = require('@/utils/md5'); const md5 = require('@/utils/md5');
const isLocalhost = require('is-localhost-ip');
const reject = (ctx) => { const reject = (ctx) => {
ctx.response.status = 403; ctx.response.status = 403;
@@ -15,6 +16,8 @@ module.exports = async (ctx, next) => {
const isControlled = config.accessKey || config.whitelist || config.blacklist; const isControlled = config.accessKey || config.whitelist || config.blacklist;
const allowLocalhost = config.allowLocalhost && (await isLocalhost(ip));
const grant = async () => { const grant = async () => {
if (ctx.response.status !== 403) { if (ctx.response.status !== 403) {
await next(); await next();
@@ -24,7 +27,7 @@ module.exports = async (ctx, next) => {
if (requestPath === '/' || requestPath === '/robots.txt') { if (requestPath === '/' || requestPath === '/robots.txt') {
await next(); await next();
} else { } else {
if (!isControlled) { if (!isControlled || allowLocalhost) {
return await grant(); return await grant();
} }

1
package.json
View File

@@ -87,6 +87,7 @@
"hooman": "1.2.5", "hooman": "1.2.5",
"https-proxy-agent": "5.0.0", "https-proxy-agent": "5.0.0",
"iconv-lite": "0.5.1", "iconv-lite": "0.5.1",
"is-localhost-ip": "1.4.0",
"jsdom": "16.2.2", "jsdom": "16.2.2",
"json-bigint": "0.3.0", "json-bigint": "0.3.0",
"json5": "2.1.3", "json5": "2.1.3",

5
yarn.lock
View File

@@ -6699,6 +6699,11 @@ is-keyword-js@^1.0.3:
resolved "https://registry.yarnpkg.com/is-keyword-js/-/is-keyword-js-1.0.3.tgz#ac30dcf35b671f4b27b17f5cb57235126021132d" resolved "https://registry.yarnpkg.com/is-keyword-js/-/is-keyword-js-1.0.3.tgz#ac30dcf35b671f4b27b17f5cb57235126021132d"
integrity sha1-rDDc81tnH0snsX9ctXI1EmAhEy0= integrity sha1-rDDc81tnH0snsX9ctXI1EmAhEy0=
is-localhost-ip@1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/is-localhost-ip/-/is-localhost-ip-1.4.0.tgz#dd66aaabcbb5dbbc943e00adad5f715d2c3b3a1d"
integrity sha512-cN7SzlY7BVxSeoJu5equjsZaKSgD4HCfXrTwu0Jgbq5BbT1BU+D7Lyi/l1KO8H0un0JTlxcQaT/GWVapu+DIDg==
is-npm@^4.0.0: is-npm@^4.0.0:
version "4.0.0" version "4.0.0"
resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d" resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d"