From 59be7edfc61229d83b274bdd45fe321d70e2d34e Mon Sep 17 00:00:00 2001 From: Myztiq Date: Mon, 23 Jan 2017 17:44:16 -0800 Subject: [PATCH 1/5] Updated to use GH varnish host + port. --- lib/routes/github/index.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/routes/github/index.js b/lib/routes/github/index.js index cf96d63d7..027d9027a 100644 --- a/lib/routes/github/index.js +++ b/lib/routes/github/index.js @@ -41,10 +41,9 @@ var cacheOmitHeaders = [ ].concat(corsHeaders) var proxy = httpProxy.createProxy({ - target: 'https://api.github.com', + target: process.env.GITHUB_VARNISH_HOST + ':' + process.env.GITHUB_VARNISH_PORT, // github wants these headers headers: { - host: 'api.github.com', accept: 'application/vnd.github.v3+json' } }) From b46e10ab7c6efd9f5563df2d26b9877bee10c908 Mon Sep 17 00:00:00 2001 From: Myztiq Date: Mon, 23 Jan 2017 17:55:00 -0800 Subject: [PATCH 2/5] Added github URL. --- configs/.env | 1 + lib/routes/actions/redirect.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/.env b/configs/.env index 006c523df..34d797561 100644 --- a/configs/.env +++ b/configs/.env @@ -26,6 +26,7 @@ GITHUB_HOOK_NAME=web GITHUB_HOOK_SECRET=3V3RYTHINGisAW3S0ME! GITHUB_PROXY_EXPIRATION=3600 GITHUB_SCOPE=user:email,read:org,repo,repo_deployment,read:repo_hook,repo:status +GITHUB_URL=https://github.com HASHIDS_LENGTH=6 HASHIDS_SALT=VvCCYj8x3xaHs44QiDp9 HELLO_RUNNABLE_GITHUB_ID=10224339 diff --git a/lib/routes/actions/redirect.js b/lib/routes/actions/redirect.js index e366bb2ca..e04557517 100644 --- a/lib/routes/actions/redirect.js +++ b/lib/routes/actions/redirect.js @@ -18,7 +18,7 @@ app.get('/actions/redirect', return res.status(404).end() } var url = decodeURIComponent(req.query.url) - if (url.indexOf('https://github.com/') !== 0) { + if (url.indexOf(process.env.GITHUB_URL) !== 0) { return res.status(404).end() } res.redirect(302, url) From 150e83661ae2409c05a390515eaf7b96c15032fb Mon Sep 17 00:00:00 2001 From: Myztiq Date: Mon, 23 Jan 2017 17:58:00 -0800 Subject: [PATCH 3/5] Added GITHUB_HOST env var --- configs/.env | 1 + lib/models/apis/docker.js | 2 +- lib/routes/contexts/versions/app-code-versions.js | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/.env b/configs/.env index 34d797561..7e79e5f30 100644 --- a/configs/.env +++ b/configs/.env @@ -24,6 +24,7 @@ GITHUB_DEPLOY_KEY_BITS=2048 GITHUB_DEPLOY_KEYS_POOL_SIZE=10 GITHUB_HOOK_NAME=web GITHUB_HOOK_SECRET=3V3RYTHINGisAW3S0ME! +GITHUB_HOST=github.com GITHUB_PROXY_EXPIRATION=3600 GITHUB_SCOPE=user:email,read:org,repo,repo_deployment,read:repo_hook,repo:status GITHUB_URL=https://github.com diff --git a/lib/models/apis/docker.js b/lib/models/apis/docker.js index 24c14424b..cb1c1032d 100644 --- a/lib/models/apis/docker.js +++ b/lib/models/apis/docker.js @@ -393,7 +393,7 @@ Docker.prototype._createImageBuilderEnv = function (opts) { const commitishs = [] const deployKeys = [] contextVersion.appCodeVersions.forEach(function (acv) { - repoUrls.push('git@github.com:' + acv.repo) + repoUrls.push(`'git@${process.env.GITHUB_HOST}:${acv.repo}`) // use either a commit, branch, or default to master commitishs.push(acv.commit || acv.branch || 'master') if (acv.privateKey) { diff --git a/lib/routes/contexts/versions/app-code-versions.js b/lib/routes/contexts/versions/app-code-versions.js index f57747931..699310520 100644 --- a/lib/routes/contexts/versions/app-code-versions.js +++ b/lib/routes/contexts/versions/app-code-versions.js @@ -181,7 +181,7 @@ app.post('/contexts/:contextId/versions/:versionId/appCodeVersions/:appCodeVersi optimus.transform( { // optimus does not assume that it is coming from github should it? - repo: 'git@github.com:' + appCodeVersion.repo, + repo: `git@${process.env.GITHUB_HOST}:${appCodeVersion.repo}`, commitish: appCodeVersion.commit, rules: rules, deployKey: appCodeVersion.privateKey @@ -268,7 +268,7 @@ app.post('/contexts/:contextId/versions/:versionId/appCodeVersions/:appCodeVersi // Ask optimus for the results... optimus.transform( { - repo: 'git@github.com:' + appCodeVersion.repo, + repo: `git@${process.env.GITHUB_HOST}:${appCodeVersion.repo}`, commitish: appCodeVersion.commit, rules: rules, deployKey: appCodeVersion.privateKey From fcd02c906635c0dfc60ec12e430fc6949db9dd8f Mon Sep 17 00:00:00 2001 From: Myztiq Date: Mon, 23 Jan 2017 18:11:05 -0800 Subject: [PATCH 4/5] Fixed quote --- lib/models/apis/docker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/models/apis/docker.js b/lib/models/apis/docker.js index cb1c1032d..eaf054ce4 100644 --- a/lib/models/apis/docker.js +++ b/lib/models/apis/docker.js @@ -393,7 +393,7 @@ Docker.prototype._createImageBuilderEnv = function (opts) { const commitishs = [] const deployKeys = [] contextVersion.appCodeVersions.forEach(function (acv) { - repoUrls.push(`'git@${process.env.GITHUB_HOST}:${acv.repo}`) + repoUrls.push(`git@${process.env.GITHUB_HOST}:${acv.repo}`) // use either a commit, branch, or default to master commitishs.push(acv.commit || acv.branch || 'master') if (acv.privateKey) { From 042b8706bf94e8f4369c753c4d5115ab9aae29fb Mon Sep 17 00:00:00 2001 From: Myztiq Date: Tue, 24 Jan 2017 11:19:03 -0800 Subject: [PATCH 5/5] prepend http --- lib/routes/github/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/routes/github/index.js b/lib/routes/github/index.js index 027d9027a..3e3efb17f 100644 --- a/lib/routes/github/index.js +++ b/lib/routes/github/index.js @@ -41,7 +41,7 @@ var cacheOmitHeaders = [ ].concat(corsHeaders) var proxy = httpProxy.createProxy({ - target: process.env.GITHUB_VARNISH_HOST + ':' + process.env.GITHUB_VARNISH_PORT, + target: 'http://' + process.env.GITHUB_VARNISH_HOST + ':' + process.env.GITHUB_VARNISH_PORT, // github wants these headers headers: { accept: 'application/vnd.github.v3+json'