Skip to content

Commit 6695cf4

Browse files
authored
Merge pull request DSpace#3156 from DSpace/backport-3152-to-main
[Port main] Forward client's user-agent instead of Node's
2 parents 77081e8 + c06cd98 commit 6695cf4

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

src/app/core/forward-client-ip/forward-client-ip.interceptor.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ export class ForwardClientIpInterceptor implements HttpInterceptor {
2727
*/
2828
intercept(httpRequest: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
2929
const clientIp = this.req.get('x-forwarded-for') || this.req.connection.remoteAddress;
30-
return next.handle(httpRequest.clone({ setHeaders: { 'X-Forwarded-For': clientIp } }));
30+
const headers = { 'X-Forwarded-For': clientIp };
31+
32+
// if the request has a user-agent retain it
33+
const userAgent = this.req.get('user-agent');
34+
if (userAgent) {
35+
headers['User-Agent'] = userAgent;
36+
}
37+
38+
return next.handle(httpRequest.clone({ setHeaders: headers }));
3139
}
3240
}

0 commit comments

Comments
 (0)