From 4c35ac9dd6a9232ccc03617029a2a3d41f31097d Mon Sep 17 00:00:00 2001
From: Tucker Siegel <tgsiegel@terpmail.umd.edu>
Date: Wed, 12 Apr 2023 17:23:02 -0400
Subject: [PATCH] update
---
.../umd/dawn/common/interceptor/RequestInterceptor.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/edu/umd/dawn/common/interceptor/RequestInterceptor.java b/src/main/java/edu/umd/dawn/common/interceptor/RequestInterceptor.java
index 620fa0e..a0df50f 100644
--- a/src/main/java/edu/umd/dawn/common/interceptor/RequestInterceptor.java
+++ b/src/main/java/edu/umd/dawn/common/interceptor/RequestInterceptor.java
@@ -112,7 +112,12 @@ public class RequestInterceptor implements HandlerInterceptor {
userId = claims.getUserId();
}
- List<String> ips = List.of(Optional.of(request.getHeader("X-FORWARDED-FOR")).orElse(request.getRemoteAddr()).split(",")).stream().map(x -> x.trim()).collect(Collectors.toList());
+ String ipString = request.getHeader("X-FORWARDED-FOR") != null ? request.getHeader("X-FORWARDED-FOR") : request.getRemoteAddr();
+
+ List<String> ips = List.of();
+ if (ipString != null) {
+ ips = List.of(ipString.split(",")).stream().map(x -> x.trim()).collect(Collectors.toList());
+ }
RequestLog requestLog = RequestLog.builder()
.path(path)
--
GitLab