mirrors
/
uptime-kuma
mirror of https://github.com/louislam/uptime-kuma.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Follow up #2852 (#3527)

This commit is contained in:
Louis Lam 2023-08-04 23:08:44 +08:00 committed by GitHub
parent bce4835362
commit c6e68fac97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/database.js
View File

@ -26,6 +26,8 @@ class Database {
static path; static path;
static dockerTLSDir;
/** /**
* @type {boolean} * @type {boolean}
*/ */
@ -112,6 +114,11 @@ class Database {
fs.mkdirSync(Database.screenshotDir, { recursive: true }); fs.mkdirSync(Database.screenshotDir, { recursive: true });
} }
Database.dockerTLSDir = path.join(Database.dataDir, "docker-tls/");
if (! fs.existsSync(Database.dockerTLSDir)) {
fs.mkdirSync(Database.dockerTLSDir, { recursive: true });
}
log.info("db", `Data Dir: ${Database.dataDir}`); log.info("db", `Data Dir: ${Database.dataDir}`);
} }

20
server/docker.js
View File

@ -3,13 +3,14 @@ const { R } = require("redbean-node");
const version = require("../package.json").version; const version = require("../package.json").version;
const https = require("https"); const https = require("https");
const fs = require("fs"); const fs = require("fs");
const path = require("path");
const Database = require("./database");
class DockerHost { class DockerHost {
static CertificateBasePath = process.env.DOCKER_TLS_DIR_PATH || "data/docker-tls/"; static CertificateFileNameCA = "ca.pem";
static CertificateFileNameCA = process.env.DOCKER_TLS_FILE_NAME_CA || "ca.pem"; static CertificateFileNameCert = "cert.pem";
static CertificateFileNameCert = process.env.DOCKER_TLS_FILE_NAME_CA || "cert.pem"; static CertificateFileNameKey = "key.pem";
static CertificateFileNameKey = process.env.DOCKER_TLS_FILE_NAME_CA || "key.pem";
/** /**
* Save a docker host * Save a docker host
@ -67,7 +68,6 @@ class DockerHost {
* @returns {number} Total amount of containers on the host * @returns {number} Total amount of containers on the host
*/ */
static async testDockerHost(dockerHost) { static async testDockerHost(dockerHost) {
const options = { const options = {
url: "/containers/json?all=true", url: "/containers/json?all=true",
headers: { headers: {
@ -141,11 +141,11 @@ class DockerHost {
}; };
let certOptions = {}; let certOptions = {};
let dirName = url.replace(/^https:\/\/([^/:]+)(\/|:).*$/, "$1"); let dirName = (new URL(url)).hostname;
let dirPath = DockerHost.CertificateBasePath + dirName + "/";
let caPath = dirPath + DockerHost.CertificateFileNameCA; let caPath = path.join(Database.dockerTLSDir, dirName, DockerHost.CertificateFileNameCA);
let certPath = dirPath + DockerHost.CertificateFileNameCert; let certPath = path.join(Database.dockerTLSDir, dirName, DockerHost.CertificateFileNameCert);
let keyPath = dirPath + DockerHost.CertificateFileNameKey; let keyPath = path.join(Database.dockerTLSDir, dirName, DockerHost.CertificateFileNameKey);
if (dockerType === "tcp" && fs.existsSync(caPath) && fs.existsSync(certPath) && fs.existsSync(keyPath)) { if (dockerType === "tcp" && fs.existsSync(caPath) && fs.existsSync(certPath) && fs.existsSync(keyPath)) {
let ca = fs.readFileSync(caPath); let ca = fs.readFileSync(caPath);