github-mirror/project-nomad
1
0
Fork 0
mirror of https://github.com/Crosstalk-Solutions/project-nomad.git synced 2026-04-04 07:46:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(Maps): add x-forwarded-proto support to handle https termination (#600)

Browse Source
This commit is contained in:
David Gross 2026-04-01 16:28:11 -06:00 committed by Jake Turner
parent 7711b5f0e8
commit b65b6d6b35
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/app/controllers/maps_controller.ts
View File

@ -95,7 +95,13 @@ export default class MapsController {
}) })
} }
const styles = await this.mapService.generateStylesJSON(request.host(), request.protocol()) const forwardedProto = request.headers()['x-forwarded-proto'];
const protocol: string = forwardedProto
? (typeof forwardedProto === 'string' ? forwardedProto : request.protocol())
: request.protocol();
const styles = await this.mapService.generateStylesJSON(request.host(), protocol)
return response.json(styles) return response.json(styles)
} }

16
admin/app/services/map_service.ts
View File

@ -526,8 +526,20 @@ export class MapService implements IMapService {
} }
} }
const host = specifiedHost || getHost() function specifiedHostOrDefault() {
const withProtocol = host.startsWith('http') ? host : `${protocol}://${host}` if(specifiedHost === null) {
return getHost()
}
try {
const specifiedUrl = new URL(specifiedHost)
return specifiedUrl.host
} catch (error) {
return getHost()
}
}
const host = specifiedHostOrDefault();
const withProtocol = `${protocol}://${host}`
const baseUrlPath = const baseUrlPath =
process.env.NODE_ENV === 'production' ? childPath : urlJoin(this.mapStoragePath, childPath) process.env.NODE_ENV === 'production' ? childPath : urlJoin(this.mapStoragePath, childPath)