Merge branch 'master' into pr-log-hints-negative-feedback

services/web/app/coffee/Features/Blog/BlogController.coffee

@@ -27,6 +27,8 @@ module.exports = BlogController =
 			data = data.trim()
 			try
 				data = JSON.parse(data)
+				if settings.cdn?.web?.host?
+					data?.content = data?.content?.replace(/src="([^"]+)"/g, "src='#{settings.cdn?.web?.host}$1'");
 			catch err
 				logger.err err:err, data:data, "error parsing data from data"
 			res.render "blog/blog_holder", data

services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee

@@ -512,6 +512,11 @@ module.exports = ProjectEntityHandler =
 			return callback(e)
 		type = sanitizeTypeOfElement type
 
+		if path.resolve("/", element.name) isnt "/#{element.name}" or element.name.match("/")
+			e = new Error("invalid element name")
+			logger.err project_id:project._id, folder_id:folder_id, element:element, type:type, "failed trying to insert element as name was invalid"
+			return callback(e)
+
 		if !folder_id?
 			folder_id = project.rootFolder[0]._id
 		ProjectEntityHandler._countElements project, (err, count)->

services/web/app/coffee/Features/References/ReferencesController.coffee

@@ -32,8 +32,8 @@ module.exports = ReferencesController =
 
 	_handleIndexResponse: (req, res, projectId, shouldBroadcast, data) ->
 		if !data? or !data.keys?
-			return res.send()
-		else if shouldBroadcast
+			return res.json({projectId, keys: []})
+		if shouldBroadcast
 			logger.log {projectId}, "emitting new references keys to connected clients"
 			EditorRealTimeController.emitToRoom projectId, 'references:keys:updated', data.keys
 		return res.json data

services/web/app/coffee/infrastructure/Server.coffee

@@ -101,19 +101,19 @@ if app.get('env') == 'production'
 	logger.info "Production Enviroment"
 	app.enable('view cache')
 
-
-
 app.use (req, res, next)->
 	metrics.inc "http-request"
 	crawlerLogger.log(req)
 	next()
 
-app.use (req, res, next) ->
-	if !Settings.editorIsOpen
+webRouter.use (req, res, next) ->
+	if Settings.editorIsOpen
+		next()
+	else if req.url.indexOf("/admin") == 0
+		next()
+	else
 		res.status(503)
 		res.render("general/closed", {title:"maintenance"})
-	else
-		next()
 
 apiRouter.get "/status", (req, res)->
 	res.send("web sharelatex is alive")

services/web/test/UnitTests/coffee/References/ReferencesControllerTests.coffee

@@ -134,9 +134,10 @@ describe "ReferencesController", ->
 					@res.sendStatus.calledWith(400).should.equal false
 					done()
 
-			it 'should close the response', (done) ->
+			it 'should send a response with an empty keys list', (done) ->
 				@call () =>
-					@res.send.called.should.equal true
+					@res.json.called.should.equal true
+					@res.json.calledWith({projectId: @projectId, keys: []}).should.equal true
 					done()
 
 	describe 'index', ->