updated ddns resolver to accept any domain/subdomain instead of domains/subdomains prefixed with ddns, update resolution to return ipv4 addresses

Author: sylphrena0

backend/internal/nginx.js

@@ -143,7 +143,7 @@ const internalNginx = {
 		if (typeof host.access_list !== 'undefined' && host.access_list && typeof host.access_list.clients !== 'undefined' && host.access_list.clients) {
 			for (const client of host.access_list.clients) {
 				const address = client.address;
-				if (ddnsResolver.requiresResolution(address)) {
+				if (ddnsResolver.ddnsRegex.test(address)) {
 					const p = ddnsResolver.resolveAddress(address)
 						.then((resolvedIP) => {
 							Object.defineProperty(client, 'resolvedAddress', {value: resolvedIP});

backend/lib/ddns_resolver/ddns_resolver.js

@@ -3,17 +3,8 @@ const logger = require('../../logger').ddns;
 const utils  = require('../utils');
 
 const ddnsResolver = {
-	/**
-     * Checks whether the address requires resolution (i.e. starts with ddns:)
-     * @param {String} address 
-     * @returns {boolean}
-     */
-	requiresResolution: (address) => {
-		if (typeof address !== 'undefined' && address && address.toLowerCase().startsWith('ddns:')) {
-			return true;
-		}
-		return false;
-	},
+	/** Pattern to match any valid domain/subdomain */
+	ddnsRegex: /'^((?!-)[A-Za-z\d-]{1,63}(?<!-)\.)+[A-Za-z]{2,6}$'/,
 
 	/**
      * Resolves the given address to its IP
@@ -35,9 +26,6 @@ const ddnsResolver = {
 		ddnsResolver._cache.delete(address);
 		// Reach here only if cache value doesn't exist or needs to be updated 
 		let host = address.toLowerCase();
-		if (host.startsWith('ddns:')) {
-			host = host.substring(5);
-		}
 		return ddnsResolver._queryHost(host)
 			.then((resolvedIP) => {
 				ddnsResolver._cache.set(address, [resolvedIP, Date.now()]);
@@ -64,7 +52,7 @@ const ddnsResolver = {
      * @returns {Promise}
      */
 	_queryHost: (host) => {
-		return utils.execSafe('getent', ['hosts', host])
+		return utils.execSafe('getent', ['ahostsv4', 'hosts', host])
 			.then((result) => {
 				if (result.length < 8) {
 					logger.error(`IP lookup for ${host} returned invalid output: ${result}`);

backend/lib/ddns_resolver/ddns_updater.js

@@ -63,7 +63,7 @@ const ddnsUpdater = {
 							continue;
 						}
 						for (const client of row.clients) {
-							if (!ddnsResolver.requiresResolution(client.address)) {
+							if (!ddnsResolver.ddnsRegex.test(client.address)) {
 								continue;
 							}
 							if (!usedAddresses.has(client.address)) {

backend/schema/components/access-list-object.json

@@ -40,7 +40,7 @@
 				},
 				{
 					"type": "string",
-					"pattern": "^ddns:[\\w\\.-]+$"
+					"pattern": "^((?!-)[A-Za-z\\d-]{1,63}(?<!-)\\.)+[A-Za-z]{2,6}$"
 				}
 			]
 		},

backend/schema/paths/nginx/access-lists/listID/put.json

@@ -76,7 +76,7 @@
 											},
 											{
 												"type": "string",
-												"pattern": "^ddns:[\\w\\.-]+$"
+												"pattern": "^((?!-)[A-Za-z\\d-]{1,63}(?<!-)\\.)+[A-Za-z]{2,6}$"
 											}
 										]
 									},

backend/schema/paths/nginx/access-lists/post.json

@@ -65,7 +65,7 @@
 											},
 											{
 												"type": "string",
-												"pattern": "^ddns:[\\w\\.-]+$"
+												"pattern": "^((?!-)[A-Za-z\\d-]{1,63}(?<!-)\\.)+[A-Za-z]{2,6}$"
 											}
 										]
 									},