DO DNS API break means this value must atleast be 30

(cherry picked from commit 8cd5c15c2b)

CHANGES

@@ -1625,3 +1625,9 @@
 * Fix name.com DNS backend issue for naked domains
 * Add DigitalOcean Frankfurt (fra1) region for backup storage
 
+[4.1.3]
+* Update manifest format package
+
+[4.1.4]
+* Add CLOUDRON_ prefix to MySQL addon variables
+

package-lock.json

@@ -620,9 +620,9 @@
       }
     },
     "cloudron-manifestformat": {
-      "version": "2.14.2",
-      "resolved": "https://registry.npmjs.org/cloudron-manifestformat/-/cloudron-manifestformat-2.14.2.tgz",
-      "integrity": "sha512-+VQwlP/2NY0VIjPTkANhlg8DrS62IxkAVS7B7KG6DrzRp+hRCejbDMQjUB8GvyPSVQGerqUoEu5R/tc4/UBiAA==",
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/cloudron-manifestformat/-/cloudron-manifestformat-2.15.0.tgz",
+      "integrity": "sha512-hSL+n/ttjrjZby/tSa5YSTRUAcxfzAi9CFUSPyu3dx8OMxzHsDyTvtKHjwBtIZ0Fjz7B3THfR3kfvIgP0lULSg==",
       "requires": {
         "cron": "^1.0.9",
         "java-packagename-regex": "^1.0.0",

package.json

@@ -20,7 +20,7 @@
     "async": "^2.6.2",
     "aws-sdk": "^2.441.0",
     "body-parser": "^1.18.3",
-    "cloudron-manifestformat": "^2.14.2",
+    "cloudron-manifestformat": "^2.15.0",
     "connect": "^3.6.6",
     "connect-ensure-login": "^0.1.1",
     "connect-lastmile": "^1.0.2",

src/addons.js

@@ -1069,11 +1069,11 @@ function setupMySql(app, options, callback) {
                 ];
 
                 if (options.multipleDatabases) {
-                    env = env.concat({ name: 'MYSQL_DATABASE_PREFIX', value: `${data.prefix}_` });
+                    env = env.concat({ name: `${envPrefix}MYSQL_DATABASE_PREFIX`, value: `${data.prefix}_` });
                 } else {
                     env = env.concat(
-                        { name: 'MYSQL_URL', value: `mysql://${data.username}:${data.password}@mysql/${data.database}` },
-                        { name: 'MYSQL_DATABASE', value: data.database }
+                        { name: `${envPrefix}MYSQL_URL`, value: `mysql://${data.username}:${data.password}@mysql/${data.database}` },
+                        { name: `${envPrefix}MYSQL_DATABASE`, value: data.database }
                     );
                 }
 

src/appdb.js

@@ -621,13 +621,13 @@ function getAddonConfigByAppId(appId, callback) {
     });
 }
 
-function getAppIdByAddonConfigValue(addonId, name, value, callback) {
+function getAppIdByAddonConfigValue(addonId, namePattern, value, callback) {
     assert.strictEqual(typeof addonId, 'string');
-    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof namePattern, 'string');
     assert.strictEqual(typeof value, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT appId FROM appAddonConfigs WHERE addonId = ? AND name = ? AND value = ?', [ addonId, name, value ], function (error, results) {
+    database.query('SELECT appId FROM appAddonConfigs WHERE addonId = ? AND name LIKE ? AND value = ?', [ addonId, namePattern, value ], function (error, results) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
         if (results.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
 

src/dns/digitalocean.js

@@ -111,7 +111,7 @@ function upsert(domainObject, location, type, values, callback) {
                 name: name,
                 data: value,
                 priority: priority,
-                ttl: 1
+                ttl: 30 // Recent DO DNS API break means this value must atleast be 30
             };
 
             if (i >= result.length) {

src/ldap.js

@@ -560,13 +560,13 @@ function authenticateMailAddon(req, res, next) {
 
         if (addonId === 'recvmail' && !domain.enabled) return next(new ldap.NoSuchObjectError(req.dn.toString()));
 
-        let name;
-        if (addonId === 'sendmail') name = 'MAIL_SMTP_PASSWORD';
-        else if (addonId === 'recvmail') name = 'MAIL_IMAP_PASSWORD';
+        let namePattern; // manifest v2 has a CLOUDRON_ prefix for names
+        if (addonId === 'sendmail') namePattern = '%MAIL_SMTP_PASSWORD';
+        else if (addonId === 'recvmail') namePattern = '%MAIL_IMAP_PASSWORD';
         else return next(new ldap.OperationsError('Invalid DN'));
 
         // note: with sendmail addon, apps can send mail without a mailbox (unlike users)
-        appdb.getAppIdByAddonConfigValue(addonId, name, req.credentials || '', function (error, appId) {
+        appdb.getAppIdByAddonConfigValue(addonId, namePattern, req.credentials || '', function (error, appId) {
             if (error && error.reason !== DatabaseError.NOT_FOUND) return next(new ldap.OperationsError(error.message));
             if (appId) { // matched app password
                 eventlog.add(eventlog.ACTION_APP_LOGIN, { authType: 'ldap', mailboxId: email }, { appId: appId, addonId: addonId });