@cocreate/acme 1.1.3 → 1.2.1

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+## [1.2.1](https://github.com/CoCreate-app/CoCreate-acme/compare/v1.2.0...v1.2.1) (2024-01-08)
+
+
+### Bug Fixes
+
+* handling hostPosition ([fa105b1](https://github.com/CoCreate-app/CoCreate-acme/commit/fa105b1a35927380cd88549d7675eebd2d80a163))
+
+# [1.2.0](https://github.com/CoCreate-app/CoCreate-acme/compare/v1.1.3...v1.2.0) (2024-01-08)
+
+
+### Bug Fixes
+
+* applied host to define environment/branch ([6931a9b](https://github.com/CoCreate-app/CoCreate-acme/commit/6931a9b81bfdf5b095534f7f42c6b9df1ea99141))
+* handle ssl from host array ([fd45091](https://github.com/CoCreate-app/CoCreate-acme/commit/fd450914804b389647af52a1c40f6569e44066cf))
+* setCertificate handle writeFileSync and hostPosition defined to save to host object ([29e794d](https://github.com/CoCreate-app/CoCreate-acme/commit/29e794de6d38584462ea926f3ef957d42b97c0bf))
+
+
+### Features
+
+* bumped CoCreate dependencies to their latest versions ([c25e34d](https://github.com/CoCreate-app/CoCreate-acme/commit/c25e34de1e47f660c773c7ea242e4ff2b060c936))
+* host contains sert and key ([11380ac](https://github.com/CoCreate-app/CoCreate-acme/commit/11380acb7463e13d14a3e6ea856c288cef1d26c4))
+* use crud.getHost and crud.getorganization ([574718b](https://github.com/CoCreate-app/CoCreate-acme/commit/574718b0ae035b63f6e70f4423ea1fd484bc80cc))
+
 ## [1.1.3](https://github.com/CoCreate-app/CoCreate-acme/compare/v1.1.2...v1.1.3) (2024-01-03)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/acme",
-  "version": "1.1.3",
+  "version": "1.2.1",
   "description": "An intergration with ACME and CoCreateJS.",
   "keywords": [
     "acme",

package/src/index.js

@@ -76,7 +76,7 @@ class CoCreateAcme {
         }
     }
 
-    async requestCertificate(host, organization_id, wildcard = false) {
+    async requestCertificate(host, hostPosition, organization_id, wildcard = false) {
         try {
 
             const self = this
@@ -102,9 +102,12 @@ class CoCreateAcme {
                 email: [email], // Replace with your email
                 termsOfServiceAgreed: true,
                 challengeCreateFn: async (authz, challenge, keyAuthorization) => {
+                    console.log(`Challenge added for host: ${host} token: ${challenge.token}`);
+
                     if (challenge.type === 'http-01') {
                         const httpChallenge = await self.crud.send({
                             method: 'object.create',
+                            host,
                             array: 'files',
                             object: {
                                 "content-type": "text/plain",
@@ -148,6 +151,7 @@ class CoCreateAcme {
                     if (challenge.type === 'http-01') {
                         self.crud.send({
                             method: 'object.delete',
+                            host,
                             array: 'files',
                             object: {
                                 _id: challenge_id
@@ -163,32 +167,25 @@ class CoCreateAcme {
 
             let expires = await forge.readCertificateInfo(cert);
             expires = expires.notAfter;
-            this.setCertificate(host, expires, organization_id)
-
-            /* Save the certificate and key */
-            fs.writeFileSync(hostKeyPath + 'fullchain.pem', cert);
-            // fs.chmodSync(keyPath + 'fullchain.pem', '444')
+            this.setCertificate(host, expires, organization_id, hostKeyPath, cert, key)
 
-            fs.writeFileSync(hostKeyPath + 'private-key.pem', key);
-            // fs.chmodSync(keyPath + 'private-key.pem', '400')
+            console.log(`saving host: ${host} at postion: ${hostPosition}`)
 
-            // process.emit('certificateCreated', host)
-            this.proxy.createServer(host)
-
-            let safeKey = host.replace(/\./g, '_');
-            let organization = await this.crud.send({
+            this.crud.send({
                 method: 'object.update',
+                host,
                 array: 'organizations',
                 object: {
                     _id: organization_id,
-                    ['ssl.' + safeKey]: { cert, key: key.toString('utf-8') }
+                    [`host[${hostPosition}]`]: { name: host, cert, key, expires },
                 },
-                organization_id,
+                organization_id
             });
 
-            console.log('Successfully created certificate!');
+            console.log(`Certificate successfully created for ${host}!'`);
             return true
         } catch (error) {
+            console.log(`Certificate failed to create for ${host}!`);
             delete hosts[host]
             return false
         }
@@ -197,68 +194,42 @@ class CoCreateAcme {
 
     async getCertificate(host, organization_id) {
         const hostKeyPath = keyPath + host + '/';
+        let hostPosition
 
         if (!organization_id) {
-            let org = await this.crud.send({
-                method: 'object.read',
-                array: 'organizations',
-                $filter: {
-                    query: [
-                        { key: "host", value: [host], operator: "$in" }
-                    ]
-                },
-                organization_id: process.env.organization_id
-            })
-
-            if (!org || !org.object || !org.object[0]) {
-                console.log('Organization could not be found');
+            let org = await this.crud.getHost(host)
+            if (org.error)
+                // console.log('Organization could not be found');
                 return false
-            } else {
-                organization_id = org.object[0]._id
-            }
-
+            else
+                organization_id = org._id
         }
 
-        let organization = await this.crud.send({
-            method: 'object.read',
-            array: 'organizations',
-            object: {
-                _id: organization_id
-            },
-            organization_id,
-        });
-
-        if (organization && organization.object && organization.object[0]) {
-
-            if (!organization.object[0].host || !organization.object[0].host.includes(host))
-                return false
+        let organization = await this.crud.getOrganization(organization_id, false);
+        if (organization.error)
+            return false
 
-            let safeKey = host.replace(/\./g, '_');
-            if (organization.object[0].ssl && organization.object[0].ssl[safeKey]) {
-                let cert = organization.object[0].ssl[safeKey].cert
-                let key = organization.object[0].ssl[safeKey].key
-                if (cert && key) {
-                    let expires = await forge.readCertificateInfo(cert);
-                    expires = expires.notAfter;
-                    if (this.isValid(expires)) {
-                        this.setCertificate(host, expires, organization_id)
-                        if (!fs.existsSync(hostKeyPath)) {
-                            fs.mkdirSync(hostKeyPath, { recursive: true });
+        if (organization.host) {
+            for (let i = 0; i < organization.host.length; i++) {
+                if (organization.host[i].name === host) {
+                    hostPosition = i
+                    if (organization.host[i].cert && organization.host[i].key) {
+                        let expires = await forge.readCertificateInfo(organization.host[i].cert);
+                        expires = expires.notAfter;
+                        if (this.isValid(expires)) {
+                            this.setCertificate(host, expires, organization_id, hostKeyPath, organization.host[i].cert, organization.host[i].key)
+                            return true
                         }
-
-                        fs.writeFileSync(hostKeyPath + 'fullchain.pem', cert);
-                        // fs.chmodSync(keyPath + 'fullchain.pem', '444')
-                        fs.writeFileSync(hostKeyPath + 'private-key.pem', key);
-                        // fs.chmodSync(keyPath + 'private-key.pem', '400')
-
-                        this.proxy.createServer(host)
-                        return true
                     }
+                    break
                 }
             }
+
+            if (!hostPosition && hostPosition !== 0)
+                return false
         }
 
-        return await this.requestCertificate(host, organization_id, false)
+        return await this.requestCertificate(host, hostPosition, organization_id, false)
     }
 
     async checkCertificate(host, organization_id, pathname = '') {
@@ -297,7 +268,7 @@ class CoCreateAcme {
         }
     }
 
-    setCertificate(host, expires, organization_id) {
+    setCertificate(host, expires, organization_id, hostKeyPath, cert, key) {
         // let expireDate = new Date(expires);
         // let currentDate = new Date();
 
@@ -323,6 +294,19 @@ class CoCreateAcme {
         // }, timeoutDuration);
 
         // Store the timeout and organization_id for later reference or cancellation
+
+        if (hostKeyPath) {
+            if (!fs.existsSync(hostKeyPath)) {
+                fs.mkdirSync(hostKeyPath, { recursive: true });
+            }
+            fs.writeFileSync(hostKeyPath + 'fullchain.pem', cert);
+            // fs.chmodSync(keyPath + 'fullchain.pem', '444')
+            fs.writeFileSync(hostKeyPath + 'private-key.pem', key);
+            // fs.chmodSync(keyPath + 'private-key.pem', '400')
+        }
+
+        this.proxy.createServer(host)
+
         certificates[host] = { expires, organization_id }
 
     }