jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

remove support for hyphentated domains

Browse Source 
this has not been used for a long time
This commit is contained in:
Girish Ramakrishnan
2020-08-15 18:40:59 -07:00
parent 2d607b394c
commit 510121bf54
6 changed files with 12 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/domains-test.js
+3 -57
View File
@@ -9,8 +9,7 @@ var async = require('async'),
database = require('../database.js'),
domains = require('../domains.js'),
expect = require('expect.js'),
settings = require('../settings.js'),
_ = require('underscore');
settings = require('../settings.js');
describe('Domains', function () {
before(function (done) {
@@ -71,19 +70,10 @@ describe('Domains', function () {
expect(domains.validateHostname('a0.x.y', domain)).to.be(null);
expect(domains.validateHostname('01', domain)).to.be(null);
});
it('hyphenatedSubdomains', function () {
let domainCopy = _.extend({}, domain);
domainCopy.config.hyphenatedSubdomains = true;
expect(domains.validateHostname('a', domain)).to.be(null);
expect(domains.validateHostname('a0-x', domain)).to.be(null);
expect(domains.validateHostname('a0.x', domain)).to.be.an(Error);
});
});
describe('getName', function () {
it('works with zoneName==domain (not hyphenated)', function () {
it('works with zoneName==domain', function () {
const domain = {
domain: 'example.com',
zoneName: 'example.com',
@@ -101,7 +91,7 @@ describe('Domains', function () {
expect(domains.getName(domain, 'www.dev', 'TXT')).to.be('www.dev');
});
it('works when zoneName!=domain (not hyphenated)', function () {
it('works when zoneName!=domain', function () {
const domain = {
domain: 'dev.example.com',
zoneName: 'example.com',
@@ -118,49 +108,5 @@ describe('Domains', function () {
expect(domains.getName(domain, 'www', 'TXT')).to.be('www.dev');
expect(domains.getName(domain, 'www.dev', 'TXT')).to.be('www.dev.dev');
});
it('works when hyphenated - level1', function () {
const domain = {
domain: 'customer.example.com',
zoneName: 'example.com',
config: {
hyphenatedSubdomains: true
}
};
expect(domains.getName(domain, '', 'A')).to.be('customer');
expect(domains.getName(domain, 'www', 'A')).to.be('www-customer');
expect(domains.getName(domain, 'www.dev', 'A')).to.be('www.dev-customer');
expect(domains.getName(domain, '', 'MX')).to.be('customer');
expect(domains.getName(domain, '', 'TXT')).to.be('customer');
expect(domains.getName(domain, '_dmarc', 'TXT')).to.be('_dmarc.customer');
expect(domains.getName(domain, 'cloudron._domainkey', 'TXT')).to.be('cloudron._domainkey.customer');
expect(domains.getName(domain, '_acme-challenge.my', 'TXT')).to.be('_acme-challenge.my-customer');
expect(domains.getName(domain, '_acme-challenge', 'TXT')).to.be('_acme-challenge');
});
it('works when hyphenated - level2', function () {
const domain = {
domain: 'customer.dev.example.com',
zoneName: 'example.com',
config: {
hyphenatedSubdomains: true
}
};
expect(domains.getName(domain, '', 'A')).to.be('customer.dev');
expect(domains.getName(domain, 'www', 'A')).to.be('www-customer.dev');
expect(domains.getName(domain, 'www.dev', 'A')).to.be('www.dev-customer.dev');
expect(domains.getName(domain, '', 'MX')).to.be('customer.dev');
expect(domains.getName(domain, '', 'TXT')).to.be('customer.dev');
expect(domains.getName(domain, '_dmarc', 'TXT')).to.be('_dmarc.customer.dev');
expect(domains.getName(domain, 'cloudron._domainkey', 'TXT')).to.be('cloudron._domainkey.customer.dev');
expect(domains.getName(domain, '_acme-challenge.my', 'TXT')).to.be('_acme-challenge.my-customer.dev');
expect(domains.getName(domain, '_acme-challenge', 'TXT')).to.be('_acme-challenge.dev');
});
});
});