Skip to content

Commit

Permalink
Auto merge of #1827 - sgrif:sg-revert-1715, r=sgrif
Browse files Browse the repository at this point in the history
Revert "Auto merge of #1715 - kzys:enable-fastboot, r=jtgeibel"

This reverts commit 111b7eb, reversing
changes made to 27bd9a8.

This caused our memory usage to increase from 50MB to 350MB at boot, and
I was able to trivially cause the server to run out of memory by hitting
/policies repeatedly. This introduces a DOS vector that we can't afford.
  • Loading branch information
bors committed Sep 5, 2019
2 parents 496af95 + cef5879 commit eb57871
Show file tree
Hide file tree
Showing 16 changed files with 412 additions and 1,381 deletions.
1 change: 0 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ module.exports = {
'.eslintrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'fastboot.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
Expand Down
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
release: bin/diesel migration run
web: bin/start-nginx npm run nf -- --procfile foreman-procfile start --raw
web: bin/start-nginx ./target/release/server
background_worker: ./target/release/background-worker
4 changes: 1 addition & 3 deletions app/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ body {
@include align-items(center);
}

/* .ember-application is added by Ember after initial rendering */
.ember-application > div,
body > div {
.ember-application > div {
width: 960px;
@media only screen and (max-width: 960px) {
width: 100%;
Expand Down
3 changes: 0 additions & 3 deletions config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ module.exports = function(environment) {
// Here you can pass flags/options to your application instance
// when it is created
},
fastboot: {
hostWhitelist: ['crates.io', /^localhost:\d+$/, /\.herokuapp\.com$/],
},
};

if (environment === 'development') {
Expand Down
5 changes: 0 additions & 5 deletions config/nginx.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,6 @@ http {
proxy_pass http://app_server;
}

# Just in case, only forward "/policies" to Ember for a moment
location = /policies {
proxy_pass http://localhost:9000;
}

location ~ ^/api/v./crates/new$ {
proxy_pass http://app_server;

Expand Down
56 changes: 0 additions & 56 deletions fastboot.js

This file was deleted.

8 changes: 0 additions & 8 deletions fastboot/initializers/ajax.js

This file was deleted.

2 changes: 0 additions & 2 deletions foreman-procfile

This file was deleted.

Loading

0 comments on commit eb57871

Please sign in to comment.