Merge pull request #651 from solid/fix/baseuri-behind-proxy

RubenVerborgh · web-flow · commit 03428a6518d4 · 2018-04-22T12:51:10.000+02:00
Prefer protocol configured in server URI
diff --git a/lib/utils.js b/lib/utils.js
@@ -99,7 +99,13 @@ function filenameToBaseUri (filename, uri, base) {
 }
 
 function getBaseUri (req) {
-  return req.protocol + '://' + req.get('host')
+  // Obtain the protocol from the configured server URI
+  // (in case the server is running behind a reverse proxy)
+  const locals = req.app.locals
+  const serverUri = locals.host.serverUri
+  const protocol = serverUri.replace(/:.*/, '')
+
+  return `${protocol || req.protocol}://${req.get('host')}`
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,13 @@ function filenameToBaseUri (filename, uri, base) {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`function getBaseUri (req) {`
`102`		`- return req.protocol + '://' + req.get('host')`
	`102`	`+ // Obtain the protocol from the configured server URI`
	`103`	`+ // (in case the server is running behind a reverse proxy)`
	`104`	`+ const locals = req.app.locals`
	`105`	`+ const serverUri = locals.host.serverUri`
	`106`	`+ const protocol = serverUri.replace(/:.*/, '')`
	`107`	`+`
	`108`	+ return `${protocol \|\| req.protocol}://${req.get('host')}`
`103`	`109`	`}`
`104`	`110`
`105`	`111`	`/**`