bug fixes #2
							
								
								
									
										204
									
								
								lib/index.js
									
									
									
									
									
								
							
							
						
						
									
										204
									
								
								lib/index.js
									
									
									
									
									
								
							@ -5,13 +5,11 @@ var request; // = require('@root/request');
 | 
			
		||||
var parseString = require('xml2js').parseString;
 | 
			
		||||
parseString = util.promisify(parseString);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
const SANDBOX_URL = 'https://api.sandbox.namecheap.com/xml.response';
 | 
			
		||||
const PRODUCTION_URL = 'https://api.namecheap.com/xml.response';
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
var defaults = {
 | 
			
		||||
    baseUrl: PRODUCTION_URL
 | 
			
		||||
	baseUrl: SANDBOX_URL
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
function extend(obj) {
 | 
			
		||||
@ -24,19 +22,25 @@ function extend(obj) {
 | 
			
		||||
	return newObj;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function assign(obj1,obj2) {
 | 
			
		||||
    for (var attrname in obj2) { obj1[attrname] = obj2[attrname]; }
 | 
			
		||||
function assign(obj1, obj2) {
 | 
			
		||||
	for (var attrname in obj2) {
 | 
			
		||||
		obj1[attrname] = obj2[attrname];
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function requestUrl(baseUrl, params) {
 | 
			
		||||
    var queryString = Object.keys(params).map(function (key) {
 | 
			
		||||
        return encodeURIComponent(key) + '=' + encodeURIComponent(params[key]);
 | 
			
		||||
    }).join('&');
 | 
			
		||||
	var queryString = Object.keys(params)
 | 
			
		||||
		.map(function(key) {
 | 
			
		||||
			return (
 | 
			
		||||
				encodeURIComponent(key) + '=' + encodeURIComponent(params[key])
 | 
			
		||||
			);
 | 
			
		||||
		})
 | 
			
		||||
		.join('&');
 | 
			
		||||
	// console.debug(queryString);
 | 
			
		||||
	return baseUrl + '?' + queryString;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
module.exports.create = function (config) {
 | 
			
		||||
module.exports.create = function(config) {
 | 
			
		||||
	// config = { baseUrl, token }
 | 
			
		||||
	var baseUrl = config.baseUrl || defaults.baseUrl;
 | 
			
		||||
 | 
			
		||||
@ -50,162 +54,214 @@ module.exports.create = function (config) {
 | 
			
		||||
	function api(command, params) {
 | 
			
		||||
		var requestParams = extend(globalParams);
 | 
			
		||||
		requestParams['Command'] = command;
 | 
			
		||||
        assign(requestParams,params);
 | 
			
		||||
		assign(requestParams, params);
 | 
			
		||||
 | 
			
		||||
		var url = requestUrl(baseUrl, requestParams);
 | 
			
		||||
        // console.log(url);
 | 
			
		||||
		console.log('DEBUG >>> url: ' + url);
 | 
			
		||||
		console.log(
 | 
			
		||||
			'DEBUG >>> requestParams: ' + JSON.stringify(requestParams, null, 2)
 | 
			
		||||
		);
 | 
			
		||||
 | 
			
		||||
		return request({
 | 
			
		||||
			method: 'POST',
 | 
			
		||||
            url: url,
 | 
			
		||||
        }).then(function (response) {
 | 
			
		||||
			url: url
 | 
			
		||||
		}).then(function(response) {
 | 
			
		||||
			var responseBody = response.body;
 | 
			
		||||
			// console.log(responseBody);
 | 
			
		||||
            return parseString(responseBody).then(function (result) {
 | 
			
		||||
			return parseString(responseBody).then(function(result) {
 | 
			
		||||
				// check response status
 | 
			
		||||
				if (result['ApiResponse']['$']['Status'] === 'ERROR') {
 | 
			
		||||
                    for (let i = 0; i < result['ApiResponse']['Errors'].length; i++) {
 | 
			
		||||
                        console.log(result['ApiResponse']['Errors'][i])
 | 
			
		||||
					for (
 | 
			
		||||
						let i = 0;
 | 
			
		||||
						i < result['ApiResponse']['Errors'].length;
 | 
			
		||||
						i++
 | 
			
		||||
					) {
 | 
			
		||||
						console.log(
 | 
			
		||||
							'DEBUG >>> error: ' +
 | 
			
		||||
								JSON.stringify(
 | 
			
		||||
									result['ApiResponse']['Errors'][i][
 | 
			
		||||
										'Error'
 | 
			
		||||
									][0],
 | 
			
		||||
									null,
 | 
			
		||||
									2
 | 
			
		||||
								)
 | 
			
		||||
						);
 | 
			
		||||
					}
 | 
			
		||||
					throw new Error('API Error');
 | 
			
		||||
                } else { // Status="OK"
 | 
			
		||||
                    return result['ApiResponse']['CommandResponse'][0]
 | 
			
		||||
				} else {
 | 
			
		||||
					// Status="OK"
 | 
			
		||||
					return result['ApiResponse']['CommandResponse'][0];
 | 
			
		||||
				}
 | 
			
		||||
			});
 | 
			
		||||
		});
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return {
 | 
			
		||||
        init: function (deps) {
 | 
			
		||||
		init: function(deps) {
 | 
			
		||||
			request = deps.request;
 | 
			
		||||
			return null;
 | 
			
		||||
		},
 | 
			
		||||
 | 
			
		||||
		zones: function(data) {
 | 
			
		||||
            return api('namecheap.domains.getList',{}).then(function (zonesResponse) {
 | 
			
		||||
			return api('namecheap.domains.getList', {}).then(function(
 | 
			
		||||
				zonesResponse
 | 
			
		||||
			) {
 | 
			
		||||
				// console.log('zones');
 | 
			
		||||
				// console.log(zonesResponse);
 | 
			
		||||
                return zonesResponse['DomainGetListResult'].map(function (x) {
 | 
			
		||||
				return zonesResponse['DomainGetListResult'].map(function(x) {
 | 
			
		||||
					return x['Domain'][0]['$']['Name'];
 | 
			
		||||
				});
 | 
			
		||||
 | 
			
		||||
			});
 | 
			
		||||
		},
 | 
			
		||||
 | 
			
		||||
        set: function (data) {
 | 
			
		||||
		set: function(data) {
 | 
			
		||||
			console.log(`DEBUG >>> data: ${JSON.stringify(data, null, 2)}`);
 | 
			
		||||
			var ch = data.challenge;
 | 
			
		||||
			var txt = ch.dnsAuthorization;
 | 
			
		||||
 | 
			
		||||
			var params = {};
 | 
			
		||||
            var zone = ch.dnsZone;
 | 
			
		||||
			// var zone = ch.dnsZone;
 | 
			
		||||
			var zone = ch.identifier.value;
 | 
			
		||||
			console.log(`DEBUG >>> zone: ${zone}`);
 | 
			
		||||
 | 
			
		||||
			// the domain is the first part
 | 
			
		||||
            params['SLD'] = zone.split('.')[0];
 | 
			
		||||
			// params['SLD'] = zone.split('.')[0];
 | 
			
		||||
			// the rest of the components are the TLD
 | 
			
		||||
            params['TLD'] = zone.split('.').splice(1).join('.');
 | 
			
		||||
			// params['TLD'] = zone.split('.').splice(1).join('.');
 | 
			
		||||
 | 
			
		||||
			var domains = zone.split('.');
 | 
			
		||||
			console.log('DEBUG >>> ' + domains);
 | 
			
		||||
 | 
			
		||||
			// if you have subdomain foo.blah.com, SLD = blah and TLD = com
 | 
			
		||||
			params['TLD'] = domains[domains.length - 1];
 | 
			
		||||
			params['SLD'] = domains[domains.length - 2];
 | 
			
		||||
 | 
			
		||||
			console.log(`DEBUG >>> SLD: ${params['SLD']}`);
 | 
			
		||||
			console.log(`DEBUG >>> TLD: ${params['TLD']}`);
 | 
			
		||||
 | 
			
		||||
			// setting a host record overwrites all existing,
 | 
			
		||||
			// adding a new records means you've have to send back all previous records too
 | 
			
		||||
 | 
			
		||||
            return api('namecheap.domains.dns.getHosts',params).then(function (hostsResponse) {
 | 
			
		||||
                var currentHostRecordsCount = hostsResponse['DomainDNSGetHostsResult'][0]['host'].length;
 | 
			
		||||
			return api('namecheap.domains.dns.getHosts', params).then(function(
 | 
			
		||||
				hostsResponse
 | 
			
		||||
			) {
 | 
			
		||||
				var currentHostRecordsCount =
 | 
			
		||||
					hostsResponse['DomainDNSGetHostsResult'][0]['host'].length;
 | 
			
		||||
 | 
			
		||||
				for (var i = 0; i < currentHostRecordsCount; i++) {
 | 
			
		||||
					// console.log(hostsResponse['DomainDNSGetHostsResult'][i]['host'][0]);
 | 
			
		||||
                    var currentEntry =  hostsResponse['DomainDNSGetHostsResult'][0]['host'][i]['$'];
 | 
			
		||||
					var currentEntry =
 | 
			
		||||
						hostsResponse['DomainDNSGetHostsResult'][0]['host'][i][
 | 
			
		||||
							'$'
 | 
			
		||||
						];
 | 
			
		||||
 | 
			
		||||
                    params['HostName'+(i+1)] = currentEntry['Name'];
 | 
			
		||||
                    params['RecordType'+(i+1)] = currentEntry['Type'];
 | 
			
		||||
                    params['Address'+(i+1)] = currentEntry['Address'];
 | 
			
		||||
                    params['TTL'+(i+1)] = currentEntry['TTL'];
 | 
			
		||||
					params['HostName' + (i + 1)] = currentEntry['Name'];
 | 
			
		||||
					params['RecordType' + (i + 1)] = currentEntry['Type'];
 | 
			
		||||
					params['Address' + (i + 1)] = currentEntry['Address'];
 | 
			
		||||
					params['TTL' + (i + 1)] = currentEntry['TTL'];
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
                params['HostName'+(currentHostRecordsCount+1)] = ch.dnsPrefix;
 | 
			
		||||
                params['RecordType'+(currentHostRecordsCount+1)] = 'TXT';
 | 
			
		||||
                params['Address'+(currentHostRecordsCount+1)] = txt;
 | 
			
		||||
                params['TTL'+(currentHostRecordsCount+1)] = 100; // in minutes
 | 
			
		||||
				params['HostName' + (currentHostRecordsCount + 1)] =
 | 
			
		||||
					ch.dnsPrefix;
 | 
			
		||||
				params['RecordType' + (currentHostRecordsCount + 1)] = 'TXT';
 | 
			
		||||
				params['Address' + (currentHostRecordsCount + 1)] = txt;
 | 
			
		||||
				params['TTL' + (currentHostRecordsCount + 1)] = 100; // in minutes
 | 
			
		||||
 | 
			
		||||
				// console.log(params);
 | 
			
		||||
 | 
			
		||||
                return api('namecheap.domains.dns.setHosts',params).then(function (setHostResponse) {
 | 
			
		||||
				return api('namecheap.domains.dns.setHosts', params)
 | 
			
		||||
					.then(function(setHostResponse) {
 | 
			
		||||
						// console.log('setHost');
 | 
			
		||||
						// console.log(setHostResponse);
 | 
			
		||||
                    return true
 | 
			
		||||
                }).catch(function (err) {
 | 
			
		||||
                    throw new Error('record did not set. check subdomain, api key, etc');
 | 
			
		||||
						return true;
 | 
			
		||||
					})
 | 
			
		||||
					.catch(function(err) {
 | 
			
		||||
						throw new Error(
 | 
			
		||||
							'record did not set. check subdomain, api key, etc'
 | 
			
		||||
						);
 | 
			
		||||
					});
 | 
			
		||||
			});
 | 
			
		||||
 | 
			
		||||
		},
 | 
			
		||||
        remove: function (data) {
 | 
			
		||||
		remove: function(data) {
 | 
			
		||||
			var ch = data.challenge;
 | 
			
		||||
 | 
			
		||||
			var params = {};
 | 
			
		||||
            var zone = ch.dnsZone;
 | 
			
		||||
            // the domain is the first part
 | 
			
		||||
            params['SLD'] = zone.split('.')[0];
 | 
			
		||||
            // the rest of the components are the TLD
 | 
			
		||||
            params['TLD'] = zone.split('.').splice(1).join('.');
 | 
			
		||||
			var zone = ch.identifier.value;
 | 
			
		||||
			var domains = zone.split('.');
 | 
			
		||||
 | 
			
		||||
			params['TLD'] = domains[domains.length - 1];
 | 
			
		||||
			params['SLD'] = domains[domains.length - 2];
 | 
			
		||||
 | 
			
		||||
			// setting a host record overwrites all existing,
 | 
			
		||||
			// removing a new records means you've have to send back all previous records without removed
 | 
			
		||||
 | 
			
		||||
            return api('namecheap.domains.dns.getHosts',params).then(function (hostsResponse) {
 | 
			
		||||
                var currentHostRecordsCount = hostsResponse['DomainDNSGetHostsResult'][0]['host'].length;
 | 
			
		||||
			return api('namecheap.domains.dns.getHosts', params).then(function(
 | 
			
		||||
				hostsResponse
 | 
			
		||||
			) {
 | 
			
		||||
				var currentHostRecordsCount =
 | 
			
		||||
					hostsResponse['DomainDNSGetHostsResult'][0]['host'].length;
 | 
			
		||||
 | 
			
		||||
				for (var i = 0; i < currentHostRecordsCount; i++) {
 | 
			
		||||
					// console.log(hostsResponse['DomainDNSGetHostsResult'][i]['host'][0]);
 | 
			
		||||
                    var currentEntry =  hostsResponse['DomainDNSGetHostsResult'][0]['host'][i]['$'];
 | 
			
		||||
                    if(currentEntry['Address'] != ch.dnsAuthorization){
 | 
			
		||||
                        params['HostName'+(i+1)] = currentEntry['Name'];
 | 
			
		||||
                        params['RecordType'+(i+1)] = currentEntry['Type'];
 | 
			
		||||
                        params['Address'+(i+1)] = currentEntry['Address'];
 | 
			
		||||
                        params['TTL'+(i+1)] = currentEntry['TTL'];    
 | 
			
		||||
					var currentEntry =
 | 
			
		||||
						hostsResponse['DomainDNSGetHostsResult'][0]['host'][i][
 | 
			
		||||
							'$'
 | 
			
		||||
						];
 | 
			
		||||
					if (currentEntry['Address'] != ch.dnsAuthorization) {
 | 
			
		||||
						params['HostName' + (i + 1)] = currentEntry['Name'];
 | 
			
		||||
						params['RecordType' + (i + 1)] = currentEntry['Type'];
 | 
			
		||||
						params['Address' + (i + 1)] = currentEntry['Address'];
 | 
			
		||||
						params['TTL' + (i + 1)] = currentEntry['TTL'];
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
                return api('namecheap.domains.dns.setHosts',params).then(function (setHostResponse) {
 | 
			
		||||
				return api('namecheap.domains.dns.setHosts', params)
 | 
			
		||||
					.then(function(setHostResponse) {
 | 
			
		||||
						// console.log('setHost');
 | 
			
		||||
						// console.log(setHostResponse);
 | 
			
		||||
                    return true
 | 
			
		||||
                }).catch(function (err) {
 | 
			
		||||
                    throw new Error('record did not remove. check subdomain, api key, etc');
 | 
			
		||||
						return true;
 | 
			
		||||
					})
 | 
			
		||||
					.catch(function(err) {
 | 
			
		||||
						throw new Error(
 | 
			
		||||
							'record did not remove. check subdomain, api key, etc'
 | 
			
		||||
						);
 | 
			
		||||
					});
 | 
			
		||||
			});
 | 
			
		||||
 | 
			
		||||
		},
 | 
			
		||||
        get: function (data) {
 | 
			
		||||
		get: function(data) {
 | 
			
		||||
			var ch = data.challenge;
 | 
			
		||||
 | 
			
		||||
			var params = {};
 | 
			
		||||
            var zone = ch.dnsZone;
 | 
			
		||||
			var zone = ch.identifier.value;
 | 
			
		||||
			var domains = zone.split('.');
 | 
			
		||||
 | 
			
		||||
            // the domain is the first part
 | 
			
		||||
            params['SLD'] = zone.split('.')[0];
 | 
			
		||||
            // the rest of the components are the TLD
 | 
			
		||||
            params['TLD'] = zone.split('.').splice(1).join('.');
 | 
			
		||||
			params['TLD'] = domains[domains.length - 1];
 | 
			
		||||
			params['SLD'] = domains[domains.length - 2];
 | 
			
		||||
 | 
			
		||||
            return api('namecheap.domains.dns.getHosts',params).then(function (hostsResponse) {
 | 
			
		||||
			return api('namecheap.domains.dns.getHosts', params).then(function(
 | 
			
		||||
				hostsResponse
 | 
			
		||||
			) {
 | 
			
		||||
				// console.log('hosts');
 | 
			
		||||
				// console.log(hostsResponse);
 | 
			
		||||
                var currentHostRecords = hostsResponse['DomainDNSGetHostsResult'][0]['host'];
 | 
			
		||||
				var currentHostRecords =
 | 
			
		||||
					hostsResponse['DomainDNSGetHostsResult'][0]['host'];
 | 
			
		||||
 | 
			
		||||
                var entries = currentHostRecords.filter(function (x) {
 | 
			
		||||
				var entries = currentHostRecords.filter(function(x) {
 | 
			
		||||
					return x['$']['Type'] === 'TXT';
 | 
			
		||||
				});
 | 
			
		||||
 | 
			
		||||
                var entry = entries.filter(function (x) {
 | 
			
		||||
				var entry = entries.filter(function(x) {
 | 
			
		||||
					// console.log('data', x.data);
 | 
			
		||||
					// console.log('dnsAuth', ch.dnsAuthorization, ch);
 | 
			
		||||
					return x['$']['Address'] === ch.dnsAuthorization;
 | 
			
		||||
				})[0];
 | 
			
		||||
 | 
			
		||||
				if (entry) {
 | 
			
		||||
                    return {dnsAuthorization: entry['$']['Address']};
 | 
			
		||||
					return { dnsAuthorization: entry['$']['Address'] };
 | 
			
		||||
				} else {
 | 
			
		||||
					return null;
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
			});
 | 
			
		||||
 | 
			
		||||
		}
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										9
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										9
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							@ -26,15 +26,6 @@
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		},
 | 
			
		||||
    "acme-dns-01-test": {
 | 
			
		||||
      "version": "3.3.1",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/acme-dns-01-test/-/acme-dns-01-test-3.3.1.tgz",
 | 
			
		||||
      "integrity": "sha512-di2/n19FDLc/pe4CDxd/FpxuuCZG7CHEQVjWr96vvtxe5XNNgdHi2eJqVP0z9WBf9s61zxslyRPrAWzTN8ZVWw==",
 | 
			
		||||
      "dev": true,
 | 
			
		||||
      "requires": {
 | 
			
		||||
        "acme-challenge-test": "^3.3.1"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
		"sax": {
 | 
			
		||||
			"version": "1.2.4",
 | 
			
		||||
			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
 | 
			
		||||
 | 
			
		||||
@ -3,6 +3,10 @@
 | 
			
		||||
	"version": "3.0.0",
 | 
			
		||||
	"description": "Namecheap DNS for Let's Encrypt / ACME dns-01 challenges with ACME.js and Greenlock.js",
 | 
			
		||||
	"main": "index.js",
 | 
			
		||||
	"files": [
 | 
			
		||||
		"lib",
 | 
			
		||||
		"test.js"
 | 
			
		||||
	],
 | 
			
		||||
	"scripts": {
 | 
			
		||||
		"test": "node ./test.js"
 | 
			
		||||
	},
 | 
			
		||||
@ -30,7 +34,6 @@
 | 
			
		||||
		"xml2js": "^0.4.19"
 | 
			
		||||
	},
 | 
			
		||||
	"devDependencies": {
 | 
			
		||||
    "acme-challenge-test": "^3.3.2",
 | 
			
		||||
    "acme-dns-01-test": "^3.2.1"
 | 
			
		||||
		"acme-challenge-test": "^3.3.2"
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user