change get ipaddress code

IQSS · Oct 9, 2024 · be2c143 · be2c143
1 parent 6090fb5
commit be2c143
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2ServiceDocumentServlet.java b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SWORDv2ServiceDocumentServlet.java
@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 
-import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddress;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import jakarta.inject.Inject;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
@@ -31,13 +31,7 @@ public void init() throws ServletException {
 
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        String ipAddress = req.getHeader("X-FORWARDED-FOR");
-        if (ipAddress == null) {
-            ipAddress = req.getRemoteAddr();
-        }
-        if (ipAddress != null) {
-            serviceDocumentManagerImpl.setIpAddress(IpAddress.valueOf(ipAddress));
-        }
+        serviceDocumentManagerImpl.setIpAddress((new DataverseRequest(null, req)).getSourceAddress());
         this.api.get(req, resp);
     }