Merge branch 'main' into main

tests/domain-utils.test.js

@@ -31,9 +31,13 @@ describe('validateDomainData', () => {
     })),
     { ...defaultDomain, record: { CNAME: 'sd', A: ['121,3213'] } },
     { ...defaultDomain, record: { A: ['121', '12'], FOOBAR: ['sd'] } },
+    { ...defaultDomain, record: { A: [] } },
+    { ...defaultDomain, record: { A: ['11122'], URL: 'foobar' } },
     { ...defaultDomain, owner: {}, },
     { ...defaultDomain, owner: { username: 'hwelo', }, },
     { ...defaultDomain, owner: { email: 'hwelo' }, },
+    { ...defaultDomain, record: { CNAME: 'http://foobar.com' } },
+    { ...defaultDomain, record: { CNAME: 'https://foobar.com' } },
   ];
 
   const validCases = [

utils/domain.js

@@ -17,6 +17,7 @@ const getDomains = () =>
     })));
 
 const between = (min, max) => num => num >= min && num <= max;
+const testRegex = regex => str => !!(str && str.match(regex));
 
 const validate = pattern => data => R.compose(
   invalidPairs => invalidPairs.length ? { errors: invalidPairs, valid: false } : { errors: [], valid: true },
@@ -24,9 +25,15 @@ const validate = pattern => data => R.compose(
   R.toPairs,
 )(pattern);
 
-const validateNameRecord = type => R.allPass([
+const validateCnameRecord = key => R.allPass([
+  R.propSatisfies(R.is(String), key),
   R.compose(R.equals(1), R.length, R.reject(R.equals('URL')), R.keys),
-  R.propSatisfies(R.is(String), type),
+  R.propSatisfies(R.complement(testRegex(/^https?:\/\//ig)), key),
+]);
+
+const validateARecord = key => R.allPass([
+  R.compose(R.equals(1), R.length, R.keys),
+  R.propSatisfies(R.compose(R.gte(R.__, 1), R.length), key),
 ]);
 
 const validateDomainData = validate({
@@ -36,7 +43,7 @@ const validateDomainData = validate({
       R.equals('@'),
       R.allPass([
         R.compose(between(2, 100), R.length),
-        str => str && str.match(/^[a-z0-9\-]+$/ig),
+        testRegex(/^[a-z0-9\-]+$/g),
       ])
     ]),
   },
@@ -54,13 +61,13 @@ const validateDomainData = validate({
     ]),
   },
   record: {
-    reason: 'Invalid record',
+    reason: 'Invalid record. CNAME records have to be a host name and A records has to be a list of ips',
     fn: R.allPass([
       R.is(Object),
       R.compose(R.isEmpty, R.flip(R.difference)(VALID_RECORD_TYPES), R.keys),
       R.cond([
-        [R.prop('CNAME'),  validateNameRecord('CNAME')],
+        [R.prop('CNAME'),  validateCnameRecord('CNAME')],
-        [R.prop('A'),      R.propSatisfies(R.is(Array), 'A')],
+        [R.prop('A'),      validateARecord('A')],
         [R.prop('URL'),    R.propSatisfies(R.is(String), 'URL')],
         [R.T, R.T],
       ]),