From 0f246bea988b8bf368a347b4314bf0ad4d4fca33 Mon Sep 17 00:00:00 2001 From: Nathan219 Date: Mon, 27 Feb 2017 16:15:17 -0800 Subject: [PATCH 1/7] Make env.dev actually useful don't use csrf if running locally --- configs/.env.development | 28 ++++++++++++++++++++++------ lib/express-app.js | 7 +++++-- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/configs/.env.development b/configs/.env.development index ed70fbf61..e11d83fac 100644 --- a/configs/.env.development +++ b/configs/.env.development @@ -1,27 +1,43 @@ ASSERT_HTTPS=false -AWS_ACCESS_KEY_ID=AKIAJXF6CNCWBWNX7JZQ -AWS_SECRET_ACCESS_KEY=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 +AWS_ACCESS_KEY_ID=AKIAIDC4WVMTCGV7KRVQ +AWS_SECRET_ACCESS_KEY=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 CONTAINER_STOP_LIMIT=10 DOCKER_IMAGE_BUILDER_CACHE=/git-cache -DOMAIN=localhost:3001 +DOMAIN=localhost:3000 FULL_API_DOMAIN=http://localhost:3030 GITHUB_CALLBACK_URL=http://localhost:3030/auth/github/callback GITHUB_CLIENT_ID=043ad89560d61420ea9e GITHUB_CLIENT_SECRET=2f093b482a760730d639d11fac20fe963a412bcb -GITHUB_DEPLOY_KEYS_BUCKET=runnable.deploykeys.development +GITHUB_DEPLOY_KEYS_BUCKET=runnable.deploykeys.production-beta GITHUB_DEPLOY_KEYS_POOL_SIZE=10 GITHUB_DEPLOY_KEY_TITLE=Runnable-development GITHUB_HOOK_SECRET=3V3RYTHINGisAW3S0ME! KRAIN_PORT=3100 LOG_SRC=true -MONGO=mongodb://127.0.0.1:27017/runnable2 +MONGO=mongodb://api:3f5210b8-8fe3-11e5-8e62-07b6eff19ecb@127.0.0.1:27020/gamma OPTIMUS_HOST=optimus-staging-CodeNow.runnableapp.com OPTIMUS_PORT=80 PORT=3030 RABBITMQ_HOSTNAME=localhost +RABBITMQ_PORT=5672 RABBITMQ_PASSWORD=guest RABBITMQ_USERNAME=guest REDIS_IPADDRESS=127.0.0.1 REDIS_PORT=6379 -S3_CONTEXT_RESOURCE_BUCKET=runnable.context.resources.development +S3_CONTEXT_RESOURCE_BUCKET=runnable.context.resources.production-gamma +SENDGRID_KEY=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 ALLOW_ALL_CORS=true +BIG_POPPA_HOST=localhost:7788 +VALID_REDIR_TLDS=localhost +# used by new relic npm module +NEW_RELIC_TRACER_ENABLED=false +NUM_WORKERS=1 +USER_CONTENT_DOMAIN=runnablecloud.com +RABBITMQ_HOSTNAME=localhost +VALID_REDIR_TLDS=runnable-gamma.com,runnable.ninja +WEB_URL=https://app.runnable-gamma.com +SWARM_HOST=http://localhost:52375 +IS_QUEUE_WORKER=true +GITHUB_VARNISH_HOST=api.github.com +GITHUB_VARNISH_PORT=443 +GITHUB_PROTOCOL=https diff --git a/lib/express-app.js b/lib/express-app.js index 87a80477f..6f13a448d 100644 --- a/lib/express-app.js +++ b/lib/express-app.js @@ -38,8 +38,11 @@ app.use(passport.initialize({ userProperty: 'sessionUser' })) app.use(passport.session()) // Add CSRF protection! -app.use(csrf.csrfValidator) -app.use(csrf.csrfCookieInjector) + +if (!envIs('development')) { + app.use(csrf.csrfValidator) + app.use(csrf.csrfCookieInjector) +} /** * Attach session properties and request body (if present) to domain From f86ff30f84c364cbeb0c40779d87674db97491dd Mon Sep 17 00:00:00 2001 From: Nathan Meyers Date: Wed, 1 Mar 2017 16:12:54 -0800 Subject: [PATCH 2/7] Update .env.development --- configs/.env.development | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/.env.development b/configs/.env.development index e11d83fac..31a8d3b05 100644 --- a/configs/.env.development +++ b/configs/.env.development @@ -8,7 +8,7 @@ FULL_API_DOMAIN=http://localhost:3030 GITHUB_CALLBACK_URL=http://localhost:3030/auth/github/callback GITHUB_CLIENT_ID=043ad89560d61420ea9e GITHUB_CLIENT_SECRET=2f093b482a760730d639d11fac20fe963a412bcb -GITHUB_DEPLOY_KEYS_BUCKET=runnable.deploykeys.production-beta +GITHUB_DEPLOY_KEYS_BUCKET=runnable.deploykeys.production-gamma GITHUB_DEPLOY_KEYS_POOL_SIZE=10 GITHUB_DEPLOY_KEY_TITLE=Runnable-development GITHUB_HOOK_SECRET=3V3RYTHINGisAW3S0ME! From fdba7d94ea3f6ecadfed96b5e325c5027c122288 Mon Sep 17 00:00:00 2001 From: Nathan Meyers Date: Wed, 1 Mar 2017 16:26:55 -0800 Subject: [PATCH 3/7] Update .env.development This will suck for everyone, but maybe someone will be motivated to fix it --- configs/.env.development | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/.env.development b/configs/.env.development index 31a8d3b05..b03d0db23 100644 --- a/configs/.env.development +++ b/configs/.env.development @@ -14,7 +14,7 @@ GITHUB_DEPLOY_KEY_TITLE=Runnable-development GITHUB_HOOK_SECRET=3V3RYTHINGisAW3S0ME! KRAIN_PORT=3100 LOG_SRC=true -MONGO=mongodb://api:3f5210b8-8fe3-11e5-8e62-07b6eff19ecb@127.0.0.1:27020/gamma +MONGO=mongodb://api:[REPLACEME]@127.0.0.1:27020/gamma OPTIMUS_HOST=optimus-staging-CodeNow.runnableapp.com OPTIMUS_PORT=80 PORT=3030 From b57bf71b483a8fe198b1006a6eb415eb02294443 Mon Sep 17 00:00:00 2001 From: Nathan Meyers Date: Wed, 1 Mar 2017 16:27:41 -0800 Subject: [PATCH 4/7] Update .env.development --- configs/.env.development | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/.env.development b/configs/.env.development index b03d0db23..a8a693438 100644 --- a/configs/.env.development +++ b/configs/.env.development @@ -1,6 +1,6 @@ ASSERT_HTTPS=false -AWS_ACCESS_KEY_ID=AKIAIDC4WVMTCGV7KRVQ -AWS_SECRET_ACCESS_KEY=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 +AWS_ACCESS_KEY_ID=AKIAJXF6CNCWBWNX7JZQ +AWS_SECRET_ACCESS_KEY=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 CONTAINER_STOP_LIMIT=10 DOCKER_IMAGE_BUILDER_CACHE=/git-cache DOMAIN=localhost:3000 From 56fec08f5b513e4e108f5b74be4e6812132bc7a4 Mon Sep 17 00:00:00 2001 From: Nathan Meyers Date: Wed, 1 Mar 2017 16:38:19 -0800 Subject: [PATCH 5/7] Update .env.development --- configs/.env.development | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/.env.development b/configs/.env.development index a8a693438..a76994431 100644 --- a/configs/.env.development +++ b/configs/.env.development @@ -25,7 +25,7 @@ RABBITMQ_USERNAME=guest REDIS_IPADDRESS=127.0.0.1 REDIS_PORT=6379 S3_CONTEXT_RESOURCE_BUCKET=runnable.context.resources.production-gamma -SENDGRID_KEY=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 +SENDGRID_KEY=SG.TOTALLYaFAKEkey ALLOW_ALL_CORS=true BIG_POPPA_HOST=localhost:7788 VALID_REDIR_TLDS=localhost From a41c5c590815afcee499481d0ed659f158781ac0 Mon Sep 17 00:00:00 2001 From: Nathan Meyers Date: Tue, 14 Mar 2017 18:09:19 -0700 Subject: [PATCH 6/7] fix user-content-domain --- configs/.env.development | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/.env.development b/configs/.env.development index a76994431..de0a47324 100644 --- a/configs/.env.development +++ b/configs/.env.development @@ -32,7 +32,7 @@ VALID_REDIR_TLDS=localhost # used by new relic npm module NEW_RELIC_TRACER_ENABLED=false NUM_WORKERS=1 -USER_CONTENT_DOMAIN=runnablecloud.com +USER_CONTENT_DOMAIN=runnable.ninja RABBITMQ_HOSTNAME=localhost VALID_REDIR_TLDS=runnable-gamma.com,runnable.ninja WEB_URL=https://app.runnable-gamma.com From 6ce33b2bdfe91af03c707f6c2e17beda29b18055 Mon Sep 17 00:00:00 2001 From: Nathan Meyers Date: Thu, 18 May 2017 17:50:31 -0700 Subject: [PATCH 7/7] add webhook url --- configs/.env.development | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/.env.development b/configs/.env.development index b668915e1..0362d2600 100644 --- a/configs/.env.development +++ b/configs/.env.development @@ -42,3 +42,4 @@ GITHUB_VARNISH_HOST=api.github.com GITHUB_VARNISH_PORT=443 GITHUB_PROTOCOL=https AWS_ALIAS_HOST=us-west-2.compute.internal +GITHUB_WEBHOOK_URL=http://drake.runnable-gamma.com/github