From 836ff145b863c28b55130cd12f9b449847e46faa Mon Sep 17 00:00:00 2001
From: Michael Mazour <michaelmazour@gmail.com>
Date: Fri, 6 Jul 2018 11:05:19 +0100
Subject: [PATCH] Populate S3 settings from environment variable

---
 .../filestore/config/settings.defaults.coffee |  4 +++-
 .../test/unit/coffee/SettingsTests.coffee     | 22 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 services/filestore/test/unit/coffee/SettingsTests.coffee

diff --git a/services/filestore/config/settings.defaults.coffee b/services/filestore/config/settings.defaults.coffee
index ef44bbb604..62d42cf9e3 100644
--- a/services/filestore/config/settings.defaults.coffee
+++ b/services/filestore/config/settings.defaults.coffee
@@ -23,7 +23,8 @@ module.exports =
 			user_files: Path.resolve(__dirname + "/../user_files")
 			public_files: Path.resolve(__dirname + "/../public_files")
 			template_files: Path.resolve(__dirname + "/../template_files")
-		# if you are using S3, then fill in your S3 details below
+		# if you are using S3, then fill in your S3 details below,
+		# or use env var with the same structure.
 		# s3:
 		# 	key: ""     # default
 		# 	secret: ""  # default
@@ -31,6 +32,7 @@ module.exports =
 		#     auth_key: ""
 		#     auth_secret: ""
 		#  bucketname2: # secrets for bucketname2...
+		s3: JSON.parse process.env['S3_CREDENTIALS'] if process.env['S3_CREDENTIALS']
 
 	path:
 		uploadFolder: Path.resolve(__dirname + "/../uploads")
diff --git a/services/filestore/test/unit/coffee/SettingsTests.coffee b/services/filestore/test/unit/coffee/SettingsTests.coffee
new file mode 100644
index 0000000000..95278622ca
--- /dev/null
+++ b/services/filestore/test/unit/coffee/SettingsTests.coffee
@@ -0,0 +1,22 @@
+assert = require("chai").assert
+sinon = require('sinon')
+chai = require('chai')
+should = chai.should()
+expect = chai.expect
+modulePath = "../../../app/js/BucketController.js"
+SandboxedModule = require('sandboxed-module')
+
+describe "Settings", ->
+	describe "s3", ->
+		it "should use JSONified env var if present", (done)->
+			s3_settings =
+				key: 'default_key'
+				secret: 'default_secret'
+				bucket1:
+					auth_key: 'bucket1_key'
+					auth_secret: 'bucket1_secret'
+			process.env['S3_CREDENTIALS'] = JSON.stringify s3_settings
+
+			settings =require('settings-sharelatex')
+			expect(settings.filestore.s3).to.deep.equal s3_settings
+			done()