mirakurun 3.9.0-beta.25 → 3.9.0-beta.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/api.d.ts +2 -0
- package/api.yml +8 -0
- package/bin/postinstall.js +7 -8
- package/doc/Configuration.md +4 -0
- package/doc/Platforms.md +36 -4
- package/docker/container-init.sh +7 -0
- package/docker/docker-compose.yml +2 -6
- package/lib/Mirakurun/Server.d.ts +0 -1
- package/lib/Mirakurun/Server.js +7 -17
- package/lib/Mirakurun/Server.js.map +1 -1
- package/lib/Mirakurun/api/status.js +1 -0
- package/lib/Mirakurun/api/status.js.map +1 -1
- package/lib/Mirakurun/config.d.ts +2 -0
- package/lib/Mirakurun/config.js +46 -3
- package/lib/Mirakurun/config.js.map +1 -1
- package/lib/Mirakurun/rpc.js +3 -4
- package/lib/Mirakurun/rpc.js.map +1 -1
- package/lib/Mirakurun/system.d.ts +4 -2
- package/lib/Mirakurun/system.js +42 -8
- package/lib/Mirakurun/system.js.map +1 -1
- package/lib/ui/index.js +2237 -4
- package/lib/ui/index.js.map +1 -1
- package/package.json +2 -5
package/CHANGELOG.md
CHANGED
|
@@ -9,6 +9,7 @@ Performance improvements, fixes for memory leaks and bugs related to EPG process
|
|
|
9
9
|
### Server Changes
|
|
10
10
|
|
|
11
11
|
- **config/server**: Add `disableWebUI` (Env: `DISABLE_WEB_UI` for Docker) to disable Web UI.
|
|
12
|
+
- **config/server**: Add `allowIPv4CidrRanges`, `allowIPv6CidrRanges` (Env: `ALLOW_IPV4_CIDR_RANGES`, `ALLOW_IPV6_CIDR_RANGES` for Docker) to allow optional IP range.
|
|
12
13
|
- **config/server**: Change several default values based on typical usage.
|
|
13
14
|
- `programGCInterval`: `900000` (15 mins) → `3600000` (1 hour)
|
|
14
15
|
- `epgGatheringInterval`: `900000` (15 mins) → `3600000` (30 mins)
|
|
@@ -41,6 +42,7 @@ Performance improvements, fixes for memory leaks and bugs related to EPG process
|
|
|
41
42
|
- **ui/status**: Fix "EPG Gathering Network IDs" hex strings to upper case.
|
|
42
43
|
- **ui/status**: Fix handle tuner updates to correctly. (bug) [#109](https://github.com/Chinachu/Mirakurun/pull/109)
|
|
43
44
|
- **ui/config**: Add "EPG Gathering Interval" setting in Config/Server.
|
|
45
|
+
- **ui/config**: Add "Allow IPv4 CIDR Ranges", "Allow IPv6 CIDR Ranges" setting in Config/Server.
|
|
44
46
|
- **ui/heart**: Add confirmation before accessing opencollective. [#106](https://github.com/Chinachu/Mirakurun/issues/106)
|
|
45
47
|
|
|
46
48
|
### Client Changes
|
|
@@ -53,13 +55,17 @@ Performance improvements, fixes for memory leaks and bugs related to EPG process
|
|
|
53
55
|
- Update base image to `node:16.13.1-buster-slim`.
|
|
54
56
|
- Fixed the exit signal handling properly.
|
|
55
57
|
- When a `SIGHUP` is received in a container, only the node process can be restarted quickly.
|
|
58
|
+
- Add startup script (it runs `/opt/bin/startup`) support.
|
|
56
59
|
- default `docker-compose.yml` volumes has been changed:
|
|
57
60
|
- `/usr/local/mirakurun/*` → `/opt/mirakurun/*`
|
|
61
|
+
- default `docker-compose.yml` network_mode has been changed to `host`.
|
|
62
|
+
- it enables IPv6 options.
|
|
58
63
|
|
|
59
64
|
### Other Changes
|
|
60
65
|
|
|
61
66
|
- **package**: Drop engine support `node@12`.
|
|
62
67
|
- **package**: Update dependencies.
|
|
68
|
+
- remove `colors` package for urgent security reasons.
|
|
63
69
|
|
|
64
70
|
## 3.8.0 (2021-08-10)
|
|
65
71
|
|
package/api.d.ts
CHANGED
package/api.yml
CHANGED
|
@@ -489,6 +489,14 @@ definitions:
|
|
|
489
489
|
type: boolean
|
|
490
490
|
disableWebUI:
|
|
491
491
|
type: boolean
|
|
492
|
+
allowIPv4CidrRanges:
|
|
493
|
+
type: array
|
|
494
|
+
items:
|
|
495
|
+
type: string
|
|
496
|
+
allowIPv6CidrRanges:
|
|
497
|
+
type: array
|
|
498
|
+
items:
|
|
499
|
+
type: string
|
|
492
500
|
|
|
493
501
|
ConfigTuners:
|
|
494
502
|
type: array
|
package/bin/postinstall.js
CHANGED
|
@@ -23,14 +23,13 @@ const fs = require("fs");
|
|
|
23
23
|
const path = require("path");
|
|
24
24
|
const child_process = require("child_process");
|
|
25
25
|
const semver = require("semver");
|
|
26
|
-
const colors = require("colors");
|
|
27
26
|
const pkg = require("../package.json");
|
|
28
27
|
|
|
29
28
|
// node check
|
|
30
29
|
if (semver.satisfies(process.version, pkg.engines.node) === true) {
|
|
31
|
-
console.log("Version:", `node@${process.version}
|
|
30
|
+
console.log("Version:", `node@${process.version}`, "[OK]");
|
|
32
31
|
} else {
|
|
33
|
-
console.error("Version:", `node@${process.version}
|
|
32
|
+
console.error("Version:", `node@${process.version}`, "[NG]", "Expected:", pkg.engines.node);
|
|
34
33
|
process.exit(1);
|
|
35
34
|
}
|
|
36
35
|
|
|
@@ -57,9 +56,9 @@ if (process.platform === "linux" || process.platform === "darwin") {
|
|
|
57
56
|
const pm2Version = child_process.execSync("pm2 -v", { encoding: "utf8" }).trim();
|
|
58
57
|
const pm2Expected = ">=2.4.0";
|
|
59
58
|
if (semver.satisfies(pm2Version, pm2Expected) === true) {
|
|
60
|
-
console.log("Version:", `pm2@${pm2Version}
|
|
59
|
+
console.log("Version:", `pm2@${pm2Version}`, "[OK]");
|
|
61
60
|
} else {
|
|
62
|
-
console.error("Version:", `pm2@${pm2Version}
|
|
61
|
+
console.error("Version:", `pm2@${pm2Version}`, "[NG]", "Expected:", pm2Expected);
|
|
63
62
|
process.exit(1);
|
|
64
63
|
}
|
|
65
64
|
|
|
@@ -72,7 +71,7 @@ if (process.platform === "linux" || process.platform === "darwin") {
|
|
|
72
71
|
]
|
|
73
72
|
});
|
|
74
73
|
} catch (e) {
|
|
75
|
-
console.log("Caution: `pm2 startup` has failed. you can try fix yourself."
|
|
74
|
+
console.log("Caution: `pm2 startup` has failed. you can try fix yourself.");
|
|
76
75
|
}
|
|
77
76
|
|
|
78
77
|
child_process.execSync("pm2 start processes.json", {
|
|
@@ -95,9 +94,9 @@ if (process.platform === "linux" || process.platform === "darwin") {
|
|
|
95
94
|
const winserVersion = child_process.execSync("winser -v", { encoding: "utf8" }).replace(/^[a-z]+ /, "").trim();
|
|
96
95
|
const winserExpected = ">=1.0.3 <2.0.0";
|
|
97
96
|
if (semver.satisfies(winserVersion, winserExpected) === true) {
|
|
98
|
-
console.log("Version:", `winser@${winserVersion}
|
|
97
|
+
console.log("Version:", `winser@${winserVersion}`, "[OK]");
|
|
99
98
|
} else {
|
|
100
|
-
console.error("Version:", `winser@${winserVersion}
|
|
99
|
+
console.error("Version:", `winser@${winserVersion}`, "[NG]", "Expected:", winserExpected);
|
|
101
100
|
process.exit(1);
|
|
102
101
|
}
|
|
103
102
|
|
package/doc/Configuration.md
CHANGED
|
@@ -27,6 +27,8 @@ epgRetrievalTime: 600000 # integer (ms)
|
|
|
27
27
|
logoDataInterval: 604800000 # integer (ms)
|
|
28
28
|
disableEITParsing: false # boolean
|
|
29
29
|
disableWebUI: false # boolean
|
|
30
|
+
allowIPv4CidrRanges: ["10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"] # array of string
|
|
31
|
+
allowIPv6CidrRanges: ["fc00::/7"] # array of string
|
|
30
32
|
```
|
|
31
33
|
|
|
32
34
|
### Environment Values (Docker)
|
|
@@ -43,6 +45,8 @@ EPG_RETRIEVAL_TIME
|
|
|
43
45
|
LOGO_DATA_INTERVAL
|
|
44
46
|
DISABLE_EIT_PARSING
|
|
45
47
|
DISABLE_WEB_UI
|
|
48
|
+
ALLOW_IPV4_CIDR_RANGES
|
|
49
|
+
ALLOW_IPV6_CIDR_RANGES
|
|
46
50
|
```
|
|
47
51
|
|
|
48
52
|
## tuners.yml
|
package/doc/Platforms.md
CHANGED
|
@@ -93,11 +93,41 @@ see: [Configuration.md](Configuration.md)
|
|
|
93
93
|
|
|
94
94
|
### 💡 How to Use: Non-DVB Devices
|
|
95
95
|
|
|
96
|
+
#### option: **using custom startup script**
|
|
97
|
+
|
|
98
|
+
```sh
|
|
99
|
+
mkdir -p /opt/mirakurun/opt/bin
|
|
100
|
+
vim /opt/mirakurun/opt/bin/startup # example ↓
|
|
101
|
+
chmod +x /opt/mirakurun/opt/bin/startup
|
|
102
|
+
```
|
|
103
|
+
```bash
|
|
104
|
+
#!/bin/bash
|
|
105
|
+
|
|
106
|
+
if !(type "recpt1" > /dev/null 2>&1); then
|
|
107
|
+
apt-get update
|
|
108
|
+
apt-get install -y --no-install-recommends git autoconf automake
|
|
109
|
+
|
|
110
|
+
cd /tmp
|
|
111
|
+
git clone https://github.com/stz2012/recpt1.git
|
|
112
|
+
cd recpt1/recpt1
|
|
113
|
+
./autogen.sh
|
|
114
|
+
./configure --prefix /opt
|
|
115
|
+
make
|
|
116
|
+
make install
|
|
117
|
+
fi
|
|
118
|
+
|
|
119
|
+
recpt1 -v
|
|
120
|
+
```
|
|
121
|
+
```sh
|
|
122
|
+
docker-compose down
|
|
123
|
+
docker-compose run --rm -e SETUP=true mirakurun
|
|
124
|
+
docker-compose up -d
|
|
125
|
+
```
|
|
126
|
+
|
|
127
|
+
#### option: **using static build**
|
|
128
|
+
|
|
96
129
|
```sh
|
|
97
|
-
$
|
|
98
|
-
/usr/local/bin/recpt1
|
|
99
|
-
$ cp /usr/local/bin/recpt1 /opt/mirakurun/opt/bin/
|
|
100
|
-
$ vim /opt/mirakurun/config/tuners.yml
|
|
130
|
+
$ cp /usr/local/bin/something-static /opt/mirakurun/opt/bin/
|
|
101
131
|
```
|
|
102
132
|
|
|
103
133
|
### 💡 Locations (Container)
|
|
@@ -112,6 +142,7 @@ $ vim /opt/mirakurun/config/tuners.yml
|
|
|
112
142
|
* `programs.json`
|
|
113
143
|
* Opt: `/opt/`
|
|
114
144
|
* `bin/`
|
|
145
|
+
* `bin/startup` - custom startup script (optional)
|
|
115
146
|
|
|
116
147
|
### 💡 Locations (Host)
|
|
117
148
|
|
|
@@ -125,6 +156,7 @@ $ vim /opt/mirakurun/config/tuners.yml
|
|
|
125
156
|
* `programs.json`
|
|
126
157
|
* Opt: `/opt/mirakurun/opt/`
|
|
127
158
|
* `bin/`
|
|
159
|
+
* `bin/startup` - custom startup script (optional)
|
|
128
160
|
|
|
129
161
|
## Linux
|
|
130
162
|
|
package/docker/container-init.sh
CHANGED
|
@@ -37,6 +37,13 @@ if [ -f "/app-data/programs.yml" -a ! -f "$PROGRAMS_DB_PATH" ]; then
|
|
|
37
37
|
cp -v "/app-data/programs.yml" "$PROGRAMS_DB_PATH"
|
|
38
38
|
fi
|
|
39
39
|
|
|
40
|
+
# custom startup script
|
|
41
|
+
if [ -e "/opt/bin/startup" ]; then
|
|
42
|
+
echo "executing /opt/bin/startup..."
|
|
43
|
+
/opt/bin/startup
|
|
44
|
+
echo "done."
|
|
45
|
+
fi
|
|
46
|
+
|
|
40
47
|
# only for test purpose
|
|
41
48
|
if !(type "arib-b25-stream-test" > /dev/null 2>&1); then
|
|
42
49
|
npm --prefix /opt install arib-b25-stream-test
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
version: "3.7"
|
|
2
|
-
networks:
|
|
3
|
-
default:
|
|
4
|
-
name: mirakurun
|
|
5
2
|
services:
|
|
6
3
|
mirakurun:
|
|
7
4
|
build:
|
|
@@ -14,11 +11,10 @@ services:
|
|
|
14
11
|
- SYS_NICE
|
|
15
12
|
environment:
|
|
16
13
|
TZ: Asia/Tokyo
|
|
14
|
+
DOCKER_NETWORK: host
|
|
17
15
|
# LOG_LEVEL: "3"
|
|
18
16
|
# DEBUG: "true"
|
|
19
|
-
|
|
20
|
-
- 40772:40772
|
|
21
|
-
# - 9229:9229
|
|
17
|
+
network_mode: host
|
|
22
18
|
devices:
|
|
23
19
|
- /dev/bus:/dev/bus
|
|
24
20
|
- /dev/dvb:/dev/dvb
|
package/lib/Mirakurun/Server.js
CHANGED
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isPermittedHost = void 0;
|
|
4
3
|
const fs = require("fs");
|
|
5
4
|
const http = require("http");
|
|
6
|
-
const ip = require("ip");
|
|
7
5
|
const express = require("express");
|
|
8
6
|
const cors = require("cors");
|
|
9
7
|
const openapi = require("express-openapi");
|
|
@@ -35,7 +33,7 @@ class Server {
|
|
|
35
33
|
if (serverConfig.port) {
|
|
36
34
|
while (true) {
|
|
37
35
|
try {
|
|
38
|
-
if (system.
|
|
36
|
+
if (system.getIPv4AddressesForListen().length > 0) {
|
|
39
37
|
break;
|
|
40
38
|
}
|
|
41
39
|
}
|
|
@@ -47,13 +45,13 @@ class Server {
|
|
|
47
45
|
}
|
|
48
46
|
addresses = [
|
|
49
47
|
...addresses,
|
|
50
|
-
...system.
|
|
48
|
+
...system.getIPv4AddressesForListen(),
|
|
51
49
|
"127.0.0.1"
|
|
52
50
|
];
|
|
53
51
|
if (serverConfig.disableIPv6 !== true) {
|
|
54
52
|
addresses = [
|
|
55
53
|
...addresses,
|
|
56
|
-
...system.
|
|
54
|
+
...system.getIPv6AddressesForListen(),
|
|
57
55
|
"::1"
|
|
58
56
|
];
|
|
59
57
|
}
|
|
@@ -65,7 +63,7 @@ class Server {
|
|
|
65
63
|
if (!origin) {
|
|
66
64
|
return callback(null, true);
|
|
67
65
|
}
|
|
68
|
-
if (isPermittedHost(origin, serverConfig.hostname)) {
|
|
66
|
+
if (system.isPermittedHost(origin, serverConfig.hostname)) {
|
|
69
67
|
return callback(null, true);
|
|
70
68
|
}
|
|
71
69
|
return callback(new Error("Not allowed by CORS"));
|
|
@@ -78,18 +76,18 @@ class Server {
|
|
|
78
76
|
app.use(express.urlencoded({ extended: false }));
|
|
79
77
|
app.use(express.json());
|
|
80
78
|
app.use((req, res, next) => {
|
|
81
|
-
if (req.ip &&
|
|
79
|
+
if (req.ip && system.isPermittedIPAddress(req.ip) === false) {
|
|
82
80
|
req.socket.end();
|
|
83
81
|
return;
|
|
84
82
|
}
|
|
85
83
|
if (req.get("Origin") !== undefined) {
|
|
86
|
-
if (!isPermittedHost(req.get("Origin"), serverConfig.hostname)) {
|
|
84
|
+
if (!system.isPermittedHost(req.get("Origin"), serverConfig.hostname)) {
|
|
87
85
|
res.status(403).end();
|
|
88
86
|
return;
|
|
89
87
|
}
|
|
90
88
|
}
|
|
91
89
|
if (req.get("Referer") !== undefined) {
|
|
92
|
-
if (!isPermittedHost(req.get("Referer"), serverConfig.hostname)) {
|
|
90
|
+
if (!system.isPermittedHost(req.get("Referer"), serverConfig.hostname)) {
|
|
93
91
|
res.status(403).end();
|
|
94
92
|
return;
|
|
95
93
|
}
|
|
@@ -171,13 +169,5 @@ class Server {
|
|
|
171
169
|
log.info("RPC interface is enabled");
|
|
172
170
|
}
|
|
173
171
|
}
|
|
174
|
-
function isPermittedHost(url, allowedHostname) {
|
|
175
|
-
const u = new URL(url);
|
|
176
|
-
if (u.hostname === "localhost" || u.hostname === allowedHostname || ip.isPrivate(u.hostname) === true) {
|
|
177
|
-
return true;
|
|
178
|
-
}
|
|
179
|
-
return false;
|
|
180
|
-
}
|
|
181
|
-
exports.isPermittedHost = isPermittedHost;
|
|
182
172
|
exports.default = Server;
|
|
183
173
|
//# sourceMappingURL=Server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../../src/Mirakurun/Server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../../src/Mirakurun/Server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/Mirakurun/api/status.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/Mirakurun/api/status.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,8 @@ export interface Server {
|
|
|
15
15
|
readonly logoDataInterval?: number;
|
|
16
16
|
readonly disableEITParsing?: true;
|
|
17
17
|
readonly disableWebUI?: true;
|
|
18
|
+
readonly allowIPv4CidrRanges?: string[];
|
|
19
|
+
readonly allowIPv6CidrRanges?: string[];
|
|
18
20
|
}
|
|
19
21
|
export interface Tuner {
|
|
20
22
|
readonly name: string;
|
package/lib/Mirakurun/config.js
CHANGED
|
@@ -6,8 +6,9 @@ const path_1 = require("path");
|
|
|
6
6
|
const os_1 = require("os");
|
|
7
7
|
const fs = require("fs");
|
|
8
8
|
const yaml = require("js-yaml");
|
|
9
|
+
const ipnum = require("ip-num");
|
|
9
10
|
const log = require("./log");
|
|
10
|
-
const { DOCKER, SERVER_CONFIG_PATH, TUNERS_CONFIG_PATH, CHANNELS_CONFIG_PATH, HOSTNAME, LOG_LEVEL, MAX_LOG_HISTORY, MAX_BUFFER_BYTES_BEFORE_READY, EVENT_END_TIMEOUT, PROGRAM_GC_INTERVAL, EPG_GATHERING_INTERVAL, EPG_RETRIEVAL_TIME, LOGO_DATA_INTERVAL, DISABLE_EIT_PARSING, DISABLE_WEB_UI } = process.env;
|
|
11
|
+
const { DOCKER, DOCKER_NETWORK, SERVER_CONFIG_PATH, TUNERS_CONFIG_PATH, CHANNELS_CONFIG_PATH, HOSTNAME, LOG_LEVEL, MAX_LOG_HISTORY, MAX_BUFFER_BYTES_BEFORE_READY, EVENT_END_TIMEOUT, PROGRAM_GC_INTERVAL, EPG_GATHERING_INTERVAL, EPG_RETRIEVAL_TIME, LOGO_DATA_INTERVAL, DISABLE_EIT_PARSING, DISABLE_WEB_UI, ALLOW_IPV4_CIDR_RANGES, ALLOW_IPV6_CIDR_RANGES } = process.env;
|
|
11
12
|
const IS_DOCKER = DOCKER === "YES";
|
|
12
13
|
function loadServer() {
|
|
13
14
|
const path = SERVER_CONFIG_PATH;
|
|
@@ -42,10 +43,18 @@ function loadServer() {
|
|
|
42
43
|
}
|
|
43
44
|
}
|
|
44
45
|
const config = load("server", path);
|
|
46
|
+
if (!config.allowIPv4CidrRanges) {
|
|
47
|
+
config.allowIPv4CidrRanges = ["10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"];
|
|
48
|
+
}
|
|
49
|
+
if (!config.allowIPv6CidrRanges) {
|
|
50
|
+
config.allowIPv6CidrRanges = ["fc00::/7"];
|
|
51
|
+
}
|
|
45
52
|
if (IS_DOCKER) {
|
|
46
53
|
config.path = "/var/run/mirakurun.sock";
|
|
47
|
-
|
|
48
|
-
|
|
54
|
+
if (DOCKER_NETWORK !== "host") {
|
|
55
|
+
config.port = 40772;
|
|
56
|
+
config.disableIPv6 = true;
|
|
57
|
+
}
|
|
49
58
|
if (!config.hostname && typeof HOSTNAME !== "undefined" && HOSTNAME.trim().length > 0) {
|
|
50
59
|
config.hostname = HOSTNAME.trim();
|
|
51
60
|
}
|
|
@@ -79,12 +88,46 @@ function loadServer() {
|
|
|
79
88
|
if (DISABLE_WEB_UI === "true") {
|
|
80
89
|
config.disableWebUI = true;
|
|
81
90
|
}
|
|
91
|
+
if (typeof ALLOW_IPV4_CIDR_RANGES !== "undefined" && ALLOW_IPV4_CIDR_RANGES.trim().length > 0) {
|
|
92
|
+
config.allowIPv4CidrRanges = ALLOW_IPV4_CIDR_RANGES.split(",");
|
|
93
|
+
}
|
|
94
|
+
if (typeof ALLOW_IPV6_CIDR_RANGES !== "undefined" && ALLOW_IPV6_CIDR_RANGES.trim().length > 0) {
|
|
95
|
+
config.allowIPv6CidrRanges = ALLOW_IPV6_CIDR_RANGES.split(",");
|
|
96
|
+
}
|
|
82
97
|
log.info("load server config (merged w/ env): %s", JSON.stringify(config));
|
|
83
98
|
}
|
|
84
99
|
if (!config.hostname) {
|
|
85
100
|
config.hostname = (0, os_1.hostname)();
|
|
86
101
|
log.info("detected hostname: %s", config.hostname);
|
|
87
102
|
}
|
|
103
|
+
{
|
|
104
|
+
const validRanges = [];
|
|
105
|
+
for (const range of config.allowIPv4CidrRanges) {
|
|
106
|
+
const [valid, errors] = ipnum.Validator.isValidIPv4CidrRange(range);
|
|
107
|
+
if (valid) {
|
|
108
|
+
validRanges.push(range);
|
|
109
|
+
continue;
|
|
110
|
+
}
|
|
111
|
+
for (const error of errors) {
|
|
112
|
+
log.error("invalid server config property `allowIPv4CidrRanges`: %s - %s", range, error);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
config.allowIPv4CidrRanges = validRanges;
|
|
116
|
+
}
|
|
117
|
+
{
|
|
118
|
+
const validRanges = [];
|
|
119
|
+
for (const range of config.allowIPv6CidrRanges) {
|
|
120
|
+
const [valid, errors] = ipnum.Validator.isValidIPv6CidrRange(range);
|
|
121
|
+
if (valid) {
|
|
122
|
+
validRanges.push(range);
|
|
123
|
+
continue;
|
|
124
|
+
}
|
|
125
|
+
for (const error of errors) {
|
|
126
|
+
log.error("invalid server config property `allowIPv6CidrRanges`: %s - %s", range, error);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
config.allowIPv6CidrRanges = validRanges;
|
|
130
|
+
}
|
|
88
131
|
return config;
|
|
89
132
|
}
|
|
90
133
|
exports.loadServer = loadServer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/Mirakurun/config.ts"],"names":[],"mappings":";;;AAeA,iDAAyC;AACzC,+BAA+B;AAC/B,2BAA8B;AAC9B,yBAAyB;AACzB,gCAAgC;AAEhC,6BAA6B;AAI7B,MAAM,EACF,MAAM,EACN,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACpB,QAAQ,EACR,SAAS,EACT,eAAe,EACf,6BAA6B,EAC7B,iBAAiB,EACjB,mBAAmB,EACnB,sBAAsB,EACtB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,cAAc,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/Mirakurun/config.ts"],"names":[],"mappings":"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"}
|
package/lib/Mirakurun/rpc.js
CHANGED
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.initRPCNotifier = exports.createRPCServer = void 0;
|
|
4
|
-
const ip = require("ip");
|
|
5
4
|
const server_1 = require("jsonrpc2-ws/lib/server");
|
|
6
5
|
const log = require("./log");
|
|
7
6
|
const _1 = require("./_");
|
|
8
7
|
const status_1 = require("./status");
|
|
9
8
|
const Event_1 = require("./Event");
|
|
10
9
|
const log_1 = require("./log");
|
|
11
|
-
const
|
|
10
|
+
const system_1 = require("./system");
|
|
12
11
|
const status_2 = require("./api/status");
|
|
13
12
|
const common_1 = require("./common");
|
|
14
13
|
function createRPCServer(server) {
|
|
@@ -82,13 +81,13 @@ class NotifyManager {
|
|
|
82
81
|
}
|
|
83
82
|
}
|
|
84
83
|
function serverOnUpgrade(req, socket, head) {
|
|
85
|
-
if (req.socket.remoteAddress && !
|
|
84
|
+
if (req.socket.remoteAddress && !(0, system_1.isPermittedIPAddress)(req.socket.remoteAddress)) {
|
|
86
85
|
socket.write("HTTP/1.1 403 Forbidden\r\n\r\n");
|
|
87
86
|
socket.destroy();
|
|
88
87
|
return;
|
|
89
88
|
}
|
|
90
89
|
if (req.headers.origin !== undefined) {
|
|
91
|
-
if (!(0,
|
|
90
|
+
if (!(0, system_1.isPermittedHost)(req.headers.origin, _1.default.config.server.hostname)) {
|
|
92
91
|
socket.write("HTTP/1.1 403 Forbidden\r\n\r\n");
|
|
93
92
|
socket.destroy();
|
|
94
93
|
return;
|
package/lib/Mirakurun/rpc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../src/Mirakurun/rpc.ts"],"names":[],"mappings":";;;AAiBA,
|
|
1
|
+
{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../src/Mirakurun/rpc.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,4 @@
|
|
|
1
|
-
export declare function
|
|
2
|
-
export declare function
|
|
1
|
+
export declare function getIPv4AddressesForListen(): string[];
|
|
2
|
+
export declare function getIPv6AddressesForListen(): string[];
|
|
3
|
+
export declare function isPermittedIPAddress(addr: string): boolean;
|
|
4
|
+
export declare function isPermittedHost(url: string, allowedHostname?: string): boolean;
|