ad8f0f56 · permissionBRICK/SillyTavern

default/config.yaml+1 -1 Viewed

 # Listen for incoming connections
 listen: false
 # Listen on a specific address, supports IPv4 and IPv6
-listenAddress: 127.0.0.1
+listenAddress: 0.0.0.0
 # Enables IPv6 and/or IPv4 protocols. Need to have at least one enabled!
 # - Use option "auto" to automatically detect support
 # - Use true or false (no qoutes) to enable or disable each protocol

package-lock.json+13 -0 Viewed

                 "html-entities": "^2.5.2",
                 "iconv-lite": "^0.6.3",
                 "ip-matching": "^2.1.2",
+                "ip-regex": "^5.0.0",
                 "ipaddr.js": "^2.0.1",
                 "jimp": "^0.22.10",
                 "localforage": "^1.10.0",

             "integrity": "sha512-/ok+VhKMasgR5gvTRViwRFQfc0qYt9Vdowg6TO4/pFlDCob5ZjGPkwuOoQVCd5OrMm20zqh+1vA8KLJZTeWudg==",
             "license": "LGPL-3.0-only"
         },
+        "node_modules/ip-regex": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-5.0.0.tgz",
+            "integrity": "sha512-fOCG6lhoKKakwv+C6KdsOnGvgXnmgfmp0myi3bcNwj3qfwPAxRKWEuFhvEFF7ceYIz6+1jRZ+yguLFAmUNPEfw==",
+            "license": "MIT",
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/ipaddr.js": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",

package.json+1 -0 Viewed

         "html-entities": "^2.5.2",
         "iconv-lite": "^0.6.3",
         "ip-matching": "^2.1.2",
+        "ip-regex": "^5.0.0",
         "ipaddr.js": "^2.0.1",
         "jimp": "^0.22.10",
         "localforage": "^1.10.0",

server.js+7 -8 Viewed

 // net related library imports
 import fetch from 'node-fetch';
+import ipRegex from 'ip-regex';
 // Unrestrict console logs display limit
 util.inspect.defaultOptions.maxArrayLength = null;

 app.use('/api/speech', speechRouter);
 app.use('/api/azure', azureRouter);
-const ipv6_regex = /^(?:(?:[a-fA-F\d]{1,4}:){7}(?:[a-fA-F\d]{1,4}|:)|(?:[a-fA-F\d]{1,4}:){6}(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|:[a-fA-F\d]{1,4}|:)|(?:[a-fA-F\d]{1,4}:){5}(?::(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,2}|:)|(?:[a-fA-F\d]{1,4}:){4}(?:(?::[a-fA-F\d]{1,4}){0,1}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,3}|:)|(?:[a-fA-F\d]{1,4}:){3}(?:(?::[a-fA-F\d]{1,4}){0,2}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,4}|:)|(?:[a-fA-F\d]{1,4}:){2}(?:(?::[a-fA-F\d]{1,4}){0,3}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,5}|:)|(?:[a-fA-F\d]{1,4}:){1}(?:(?::[a-fA-F\d]{1,4}){0,4}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,6}|:)|(?::(?:(?::[a-fA-F\d]{1,4}){0,5}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,7}|:)))(?:%[0-9a-zA-Z]{1,})?$/m;
 const tavernUrlV6 = new URL(
     (cliArguments.ssl ? 'https://' : 'http://') +
-    (listen ? (ipv6_regex.test(listenAddress) ? `[${listenAddress}]` : '[::]') : '[::1]') +
+    (listen ? (ipRegex.v6({ exact: true }).test(listenAddress) ? `[${listenAddress}]` : '[::]') : '[::1]') +
     (':' + server_port),
 );
-const ipv4_regex = /^(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}$/m;
 const tavernUrl = new URL(
     (cliArguments.ssl ? 'https://' : 'http://') +
-    (listen ? (ipv4_regex.test(listenAddress) ? listenAddress : '0.0.0.0') : '127.0.0.1') +
+    (listen ? (ipRegex.v4({ exact: true }).test(listenAddress) ? listenAddress : '0.0.0.0') : '127.0.0.1') +
     (':' + server_port),
 );

@@ -790,9 +789,9 @@ const preSetupTasks = async function () {
790	async function getAutorunHostname(useIPv6, useIPv4) {	789	async function getAutorunHostname(useIPv6, useIPv4) {
791	if (autorunHostname === 'auto') {	790	if (autorunHostname === 'auto') {
792	if (listen) {	791	if (listen) {
793	if (ipv4_regex.test(listenAddress)) {	792	if (ipRegex.v4({ exact: true }).test(listenAddress)) {
794	return listenAddress;	793	return listenAddress;
795	} else if (ipv6_regex.test(listenAddress)) {	794	} else if (ipRegex.v6({ exact: true }).test(listenAddress)) {
796	return `[${listenAddress}]`;	795	return `[${listenAddress}]`;
797	}	796	}
798	}	797	}

     console.log('\n' + getSeparator(plainGoToLog.length) + '\n');
     if (listen) {
-        if (ipv4_regex.test(listenAddress)) {
+        if (ipRegex.v4({ exact: true }).test(listenAddress)) {
             console.log(
                 `SillyTavern is listening on the address ${listenAddress}. If you want to limit it only to internal localhost ([::1] or 127.0.0.1), change the setting in config.yaml to "listen: false". Check "access.log" file in the SillyTavern directory if you want to inspect incoming connections.\n`,
             );
-        } else if (ipv6_regex.test(listenAddress)) {
+        } else if (ipRegex.v6({ exact: true }).test(listenAddress)) {
             console.log(
                 `SillyTavern is listening on the address [${listenAddress}]. If you want to limit it only to internal localhost ([::1] or 127.0.0.1), change the setting in config.yaml to "listen: false". Check "access.log" file in the SillyTavern directory if you want to inspect incoming connections.\n`,
             );

Use IP Regex package, update default