Resolve #47 Check boot subdomains before SSL generation on user request

wise-team · Nov 25, 2018 · cfad60f · cfad60f
1 parent 128b0ac
commit cfad60f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/engrave/src/modules/SSL.ts b/engrave/src/modules/SSL.ts
@@ -99,7 +99,7 @@ export class SSLModule {
         else return false;
     }
 
-    private static async checkIfDomainPointsEngraveServer(domain: string) {
+    static async checkIfDomainPointsEngraveServer(domain: string) {
         return new Promise ( (resolve, reject) => {
             dns.lookup(domain, null, (error, address, family) => {
                 if(error) reject(error);

diff --git a/engrave/src/routes/dashboard/settings.ts b/engrave/src/routes/dashboard/settings.ts
@@ -79,13 +79,19 @@ router.post('/settings', RoutesVlidators.isLoggedAndConfigured, async (req: IExt
 
 router.post('/ssl', RoutesVlidators.isLoggedAndConfigured, async (req: IExtendedRequest, res: express.Response) => {
     try {
-        console.log("Asked for SSl enable on: ", req.session.blogger.domain);
-        await SSLModule.generateCertificatesForDomain(req.session.blogger.domain);
-        let blog = await Blogs.findOne({ steem_username: req.session.steemconnect.name});
-        await NginxModule.generateNginxSettings(blog);
-        blog.ssl = true;
-        await blog.save();
-        res.json({ success: "SSL enabled!" });
+        const domain =  req.session.blogger.domain;
+        if(await SSLModule.checkIfDomainPointsEngraveServer(domain) &&
+            await SSLModule.checkIfDomainPointsEngraveServer('www.' + domain)) {
+            console.log("Asked for SSl enable on: ", req.session.blogger.domain);
+            await SSLModule.generateCertificatesForDomain(req.session.blogger.domain);
+            let blog = await Blogs.findOne({ steem_username: req.session.steemconnect.name});
+            await NginxModule.generateNginxSettings(blog);
+            blog.ssl = true;
+            await blog.save();
+            res.json({ success: "SSL enabled!" });            
+        } else {
+            res.json({ error: "Your domain is not pointing to our server. Edit DNS records or contact us" });            
+        }
     } catch (error) {
         res.json({ error: "SSL could not be enabled. Try again or contact admin" });
     }