You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by dg...@apache.org on 2017/11/30 16:32:14 UTC
incubator-unomi git commit: UNOMI-143 revert commit 046fc71 and add
logger debug
Repository: incubator-unomi
Updated Branches:
refs/heads/master 046fc71cb -> bd9b3e1be
UNOMI-143 revert commit 046fc71 and add logger debug
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/bd9b3e1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/bd9b3e1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/bd9b3e1b
Branch: refs/heads/master
Commit: bd9b3e1bee7c345b6595364b34603a50706333b6
Parents: 046fc71
Author: dgaillard <dg...@jahia.com>
Authored: Thu Nov 30 17:32:08 2017 +0100
Committer: dgaillard <dg...@jahia.com>
Committed: Thu Nov 30 17:32:08 2017 +0100
----------------------------------------------------------------------
.../unomi/services/services/EventServiceImpl.java | 1 +
.../java/org/apache/unomi/web/ContextServlet.java | 2 +-
.../apache/unomi/web/EventsCollectorServlet.java | 2 +-
.../main/java/org/apache/unomi/web/HttpUtils.java | 17 +----------------
4 files changed, 4 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/bd9b3e1b/services/src/main/java/org/apache/unomi/services/services/EventServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/EventServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/EventServiceImpl.java
index 6100506..54b85e4 100644
--- a/services/src/main/java/org/apache/unomi/services/services/EventServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/EventServiceImpl.java
@@ -133,6 +133,7 @@ public class EventServiceImpl implements EventService {
logger.error("Cannot resolve address",e);
}
}
+ logger.debug("Could not authenticate any third party servers");
}
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/bd9b3e1b/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
----------------------------------------------------------------------
diff --git a/wab/src/main/java/org/apache/unomi/web/ContextServlet.java b/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
index 006c819..9844375 100644
--- a/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
+++ b/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
@@ -300,7 +300,7 @@ public class ContextServlet extends HttpServlet {
throws IOException {
List<String> filteredEventTypes = privacyService.getFilteredEventTypes(profile.getItemId());
- String thirdPartyId = eventService.authenticateThirdPartyServer(((HttpServletRequest)request).getHeader("X-Unomi-Peer"), HttpUtils.getRemoteAddr((HttpServletRequest) request));
+ String thirdPartyId = eventService.authenticateThirdPartyServer(((HttpServletRequest)request).getHeader("X-Unomi-Peer"), request.getRemoteAddr());
int changes = EventService.NO_CHANGE;
// execute provided events if any
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/bd9b3e1b/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
----------------------------------------------------------------------
diff --git a/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java b/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
index 81c3ada..432a694 100644
--- a/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
+++ b/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
@@ -171,7 +171,7 @@ public class EventsCollectorServlet extends HttpServlet {
}
}
- String thirdPartyId = eventService.authenticateThirdPartyServer(((HttpServletRequest)request).getHeader("X-Unomi-Peer"), HttpUtils.getRemoteAddr(request));
+ String thirdPartyId = eventService.authenticateThirdPartyServer(((HttpServletRequest)request).getHeader("X-Unomi-Peer"), request.getRemoteAddr());
int changes = 0;
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/bd9b3e1b/wab/src/main/java/org/apache/unomi/web/HttpUtils.java
----------------------------------------------------------------------
diff --git a/wab/src/main/java/org/apache/unomi/web/HttpUtils.java b/wab/src/main/java/org/apache/unomi/web/HttpUtils.java
index 05b012d..8965aad 100644
--- a/wab/src/main/java/org/apache/unomi/web/HttpUtils.java
+++ b/wab/src/main/java/org/apache/unomi/web/HttpUtils.java
@@ -66,7 +66,7 @@ public class HttpUtils {
if (httpServletRequest.getQueryString() != null) {
stringBuilder.append("?").append(httpServletRequest.getQueryString());
}
- stringBuilder.append(" serverName=").append(httpServletRequest.getServerName()).append(" serverPort=").append(httpServletRequest.getServerPort()).append(" remoteAddr=").append(getRemoteAddr(httpServletRequest)).append(" remotePort=").append(httpServletRequest.getRemotePort()).append("\n");
+ stringBuilder.append(" serverName=").append(httpServletRequest.getServerName()).append(" serverPort=").append(httpServletRequest.getServerPort()).append(" remoteAddr=").append(httpServletRequest.getRemoteAddr()).append(" remotePort=").append(httpServletRequest.getRemotePort()).append("\n");
return stringBuilder.toString();
}
@@ -152,19 +152,4 @@ public class HttpUtils {
}
return null;
}
-
- public static String getRemoteAddr(HttpServletRequest request) {
- String remoteAddr = request.getRemoteAddr();
- String remoteAddrParameter = request.getParameter("remoteAddr");
- String xff = request.getHeader("X-Forwarded-For");
- if (remoteAddrParameter != null && remoteAddrParameter.length() > 0) {
- remoteAddr = remoteAddrParameter;
- } else if (xff != null && !xff.equals("")) {
- if (xff.indexOf(',') > -1) {
- xff = xff.substring(0, xff.indexOf(','));
- }
- remoteAddr = xff;
- }
- return remoteAddr;
- }
}