CodeQL recommendations (#1218)

* url parsing based on codeql results

* Update src/drivers/github.js

* debug

* lazy debugging

* bad ternary?

* lazy debugging

* Revert things

This reverts commit df90c98.

This reverts commit f11c8ae.

This reverts commit 39d0a45.

* Cleanup

Author: dacbd

bin/cml/asset/publish.js

@@ -15,8 +15,8 @@ exports.handler = async (opts) => {
     opts.native = true;
   }
 
-  const { file, repo, native, asset: path } = opts;
-  const cml = new CML({ ...opts, repo: native ? repo : 'cml' });
+  const { file, asset: path } = opts;
+  const cml = new CML({ ...opts });
   const output = await cml.publish({ ...opts, path });
 
   if (!file) console.log(output);

src/cml.js

@@ -69,9 +69,10 @@ const inferToken = () => {
 const inferDriver = (opts = {}) => {
   const { repo } = opts;
   if (repo) {
-    if (repo.includes('github.com')) return GITHUB;
-    if (repo.includes('gitlab.com')) return GITLAB;
-    if (/bitbucket\.(com|org)/.test(repo)) return BB;
+    const url = new URL(repo);
+    if (url.hostname === 'github.com') return GITHUB;
+    if (url.hostname === 'gitlab.com') return GITLAB;
+    if (/bitbucket\.(com|org)/.test(url.hostname)) return BB;
   }
 
   if (GITHUB_REPOSITORY) return GITHUB;

src/drivers/github.js

@@ -66,11 +66,10 @@ const octokit = (token, repo) => {
       onAbuseLimit: throttleHandler
     }
   };
-
-  if (!repo.includes('github.com')) {
+  const { host, hostname } = new url.URL(repo);
+  if (hostname !== 'github.com') {
     // GitHub Enterprise, use the: repo URL host + '/api/v3' - as baseURL
     // as per: https://developer.github.com/enterprise/v3/enterprise-admin/#endpoint-urls
-    const { host } = new url.URL(repo);
     octokitOptions.baseUrl = `https://${host}/api/v3`;
   }