Merge pull request #236 from AndiHeusser/of889

Prevent sessions in admin console from showing UnknownHostException
igniterealtime · Jun 15, 2015 · 3776401 · 3776401
2 parents 34286d2 + 7037e77
commit 3776401
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 16 deletions.
diff --git a/src/web/component-session-details.jsp b/src/web/component-session-details.jsp
@@ -151,9 +151,13 @@
             <fmt:message key="session.details.hostname" />
         </td>
         <td>
-            <%= StringUtils.escapeHTMLTags(componentSession.getHostAddress()) %>
-            /
-            <%= StringUtils.escapeHTMLTags(componentSession.getHostName()) %>
+            <% try { %>
+                <%= StringUtils.escapeHTMLTags(componentSession.getHostAddress()) %>
+                /
+                <%= StringUtils.escapeHTMLTags(componentSession.getHostName()) %>
+            <% } catch (java.net.UnknownHostException e) { %>
+                Invalid session/connection
+            <% } %>
         </td>
     </tr>
 </tbody>

diff --git a/src/web/server-session-details.jsp b/src/web/server-session-details.jsp
@@ -22,7 +22,7 @@
                  org.jivesoftware.openfire.session.OutgoingServerSession,
                  org.jivesoftware.util.JiveGlobals,
                  org.jivesoftware.util.ParamUtils,
-                java.text.NumberFormat"
+                 java.text.NumberFormat"
     errorPage="error.jsp"
 %>
 <%@ page import="java.util.Calendar" %>
@@ -99,14 +99,18 @@
             <fmt:message key="server.session.details.hostname" />
         </td>
         <td>
-        <% if (!inSessions.isEmpty()) { %>
-            <%= inSessions.get(0).getHostAddress() %>
-            /
-            <%= inSessions.get(0).getHostName() %>
-        <% } else if (outSession != null) { %>
-            <%= outSession.getHostAddress() %>
-            /
-            <%= outSession.getHostName() %>
+        <% try {
+            if (!inSessions.isEmpty()) { %>
+                <%= inSessions.get(0).getHostAddress() %>
+                /
+                <%= inSessions.get(0).getHostName() %>
+	        <% } else if (outSession != null) { %>
+	            <%= outSession.getHostAddress() %>
+	            /
+	            <%= outSession.getHostName() %>
+	        <% }
+	       } catch (java.net.UnknownHostException e) { %>
+                Invalid session/connection
         <% } %>
         </td>
     </tr>

diff --git a/src/web/session-details.jsp b/src/web/session-details.jsp
@@ -281,9 +281,13 @@
             <fmt:message key="session.details.hostname" />
         </td>
         <td>
-            <%= currentSess.getHostAddress() %>
-            /
-            <%= currentSess.getHostName() %>
+            <% try { %>
+                <%= currentSess.getHostAddress() %>
+                /
+                <%= currentSess.getHostName() %>
+            <% } catch (java.net.UnknownHostException e) { %>
+                Invalid session/connection
+            <% } %>
         </td>
     </tr>
 </tbody>

diff --git a/src/web/session-row.jspf b/src/web/session-row.jspf
@@ -168,7 +168,11 @@
     </td>
 
     <td width="1%" nowrap>
-        <%= sess.getHostAddress() %>
+        <% try { %>
+            <%= sess.getHostAddress() %>
+        <% } catch (java.net.UnknownHostException e) { %>
+            Invalid session/connection
+        <% } %>
     </td>
 
     <td width="1%" nowrap align="center" style="border-right:1px #ccc solid;">