Improve validation of ROOT_URL

zodern · Feb 11, 2017 · 5852db8 · 5852db8
1 parent bd363b0
commit 5852db8
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 - Displays better message if it can not find the meteor app
 - Displays message if can not find pem for server
 - Improve validating server's `host` in config
+- Validator checks for `http://` or `https://` in `ROOT_URL`
 - Update documentation on using `mup` on Windows
 
 # 1.2.1

diff --git a/src/validate/meteor.js b/src/validate/meteor.js
@@ -24,10 +24,16 @@ const schema = joi.object().keys({
     allowIncompatibleUpdates: joi.boolean(),
     executable: joi.string()
   }),
-  env: joi.object().keys({
-    'ROOT_URL': joi.string().required(),
-    'MONGO_URL': joi.string()
-  }).pattern(/[\s\S]*/, [joi.string(), joi.number()]),
+  env: joi
+    .object()
+    .keys({
+      ROOT_URL: joi
+        .string()
+        .regex(new RegExp('^(http|https)://', 'i'))
+        .required(),
+      MONGO_URL: joi.string()
+    })
+    .pattern(/[\s\S]*/, [joi.string(), joi.number()]),
   log: joi.object().keys({
     driver: joi.string(),
     opts: joi.object()
@@ -36,30 +42,41 @@ const schema = joi.object().keys({
   nginx: joi.object().keys({
     clientUploadLimit: joi.string().trim()
   }),
-  ssl: joi.object().keys({
-    autogenerate: joi.object().keys({
-      email: joi.string().email().required(),
-      domains: joi.string().required()
-    }).label('autogenerate'),
-    crt: joi.string().trim(),
-    key: joi.string().trim(),
-    port: joi.number()
-  }).and('crt', 'key')
+  ssl: joi
+    .object()
+    .keys({
+      autogenerate: joi
+        .object()
+        .keys({
+          email: joi.string().email().required(),
+          domains: joi.string().required()
+        })
+        .label('autogenerate'),
+      crt: joi.string().trim(),
+      key: joi.string().trim(),
+      port: joi.number()
+    })
+    .and('crt', 'key')
     .without('autogenerate', ['crt', 'key'])
     .or('crt', 'autogenerate')
     .label('ssl')
 });
 
-export default function (config) {
+export default function(config) {
   let details = [];
-  // console.log( joi.validate(config.meteor, schema, {convert: false}))
-  details = combineErrorDetails(details, joi.validate(config.meteor, schema, {convert: false}));
+  details = combineErrorDetails(
+    details,
+    joi.validate(config.meteor, schema, { convert: false })
+  );
   if (config.meteor.name.indexOf(' ') > -1) {
     details.push({
       message: '"name" has a space'
     });
   }
-  details = combineErrorDetails(details, serversExist(config.servers, config.meteor.servers));
+  details = combineErrorDetails(
+    details,
+    serversExist(config.servers, config.meteor.servers)
+  );
 
   return addLocation(details, 'meteor');
 }