Skip to content

Commit eb57871

Browse files
committed
Auto merge of #1827 - sgrif:sg-revert-1715, r=sgrif
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.
2 parents 496af95 + cef5879 commit eb57871

16 files changed

+412
-1381
lines changed

.eslintrc.js

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ module.exports = {
2929
'.eslintrc.js',
3030
'.template-lintrc.js',
3131
'ember-cli-build.js',
32-
'fastboot.js',
3332
'testem.js',
3433
'blueprints/*/index.js',
3534
'config/**/*.js',

Procfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
release: bin/diesel migration run
2-
web: bin/start-nginx npm run nf -- --procfile foreman-procfile start --raw
2+
web: bin/start-nginx ./target/release/server
33
background_worker: ./target/release/background-worker

app/styles/app.scss

+1-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ body {
3333
@include align-items(center);
3434
}
3535

36-
/* .ember-application is added by Ember after initial rendering */
37-
.ember-application > div,
38-
body > div {
36+
.ember-application > div {
3937
width: 960px;
4038
@media only screen and (max-width: 960px) {
4139
width: 100%;

config/environment.js

-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ module.exports = function(environment) {
2222
// Here you can pass flags/options to your application instance
2323
// when it is created
2424
},
25-
fastboot: {
26-
hostWhitelist: ['crates.io', /^localhost:\d+$/, /\.herokuapp\.com$/],
27-
},
2825
};
2926

3027
if (environment === 'development') {

config/nginx.conf.erb

-5
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,6 @@ http {
6464
proxy_pass http://app_server;
6565
}
6666

67-
# Just in case, only forward "/policies" to Ember for a moment
68-
location = /policies {
69-
proxy_pass http://localhost:9000;
70-
}
71-
7267
location ~ ^/api/v./crates/new$ {
7368
proxy_pass http://app_server;
7469

fastboot.js

-56
This file was deleted.

fastboot/initializers/ajax.js

-8
This file was deleted.

foreman-procfile

-2
This file was deleted.

0 commit comments

Comments
 (0)