@peerbit/server 5.8.2 → 5.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@peerbit/server",
-	"version": "5.8.2",
+	"version": "5.8.3",
 	"author": "dao.xyz",
 	"repository": {
 		"type": "git",

package/src/cli.ts

@@ -218,6 +218,11 @@ export const cli = async (args?: string[]) => {
 						describe:
 							"Setup a testing domain with SSL (no guarantess on how long the domain will be available)",
 						builder: {
+							email: {
+								describe: "Email for Lets security messages",
+								type: "string",
+								demandOption: true,
+							},
 							outdir: {
 								describe: "Output path for Nginx config",
 								type: "string",
@@ -232,7 +237,7 @@ export const cli = async (args?: string[]) => {
 						},
 						handler: async (args) => {
 							const domain = await createTestDomain();
-							await startCertbot(domain, args.wait);
+							await startCertbot(domain, args.email, args.wait);
 							exit();
 						},
 					})
@@ -300,7 +305,7 @@ export const cli = async (args?: string[]) => {
 										}
 									: undefined,
 							});
-							await startCertbot(args.domain, args.wait);
+							await startCertbot(args.domain, args.email, args.wait);
 							exit();
 						},
 					})

package/src/domain.ts

@@ -121,11 +121,23 @@ export const createTestDomain = async () => {
 	return domain;
 };
 
+const validateEmail = (email: any) => {
+	return String(email)
+		.toLowerCase()
+		.match(
+			/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
+		);
+};
+
 export const startCertbot = async (
 	domain: string,
+	email: string,
 	waitForUp = false,
 	dockerProcessName = "nginx-certbot",
 ): Promise<void> => {
+	if (!validateEmail(email)) {
+		throw new Error("Email for SSL renenewal is invalid");
+	}
 	const { installDocker, startContainer } = await import("./docker.js");
 
 	const nginxConfigPath = await getNginxFolderPath();
@@ -141,7 +153,7 @@ export const startCertbot = async (
 	// copy ui from node_modules to home for permission reasons (volume will not work otherwise)
 	const certbotDockerCommand = `cp -r ${uiPath} $(pwd)/ui && docker pull jonasal/nginx-certbot:latest && docker run -d --net=host \
 	--restart unless-stopped \
-	${isTest ? "--env STAGING=1" : ""}\
+	--env CERTBOT_EMAIL=${email} ${isTest ? "--env STAGING=1" : ""}\
     -v $(pwd)/nginx_secrets:/etc/letsencrypt \
     -v ${nginxConfigPath}:/etc/nginx/user_conf.d:ro \
     -v $(pwd)/ui:/usr/share/nginx/html:ro \