- Improve email notification cases for unexpected exceptions.

wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java

@@ -165,7 +165,7 @@ final public class NotificationService {
             final String errorReporterEmail = mailer.getErrorReporterEmail();
             if (errorReporterEmail != null && !errorReporterEmail.isEmpty()) {
                 mailer.sendEmail(mailer.getServerSenderEmail(), errorReporterEmail, "[WiseMapping] Editor error from " + user.getEmail(), model,
-                        "editorErrorReport.vm");
+                        "errorNotification.vm");
             }
         } catch (Exception e) {
             handleException(e);
@@ -183,7 +183,24 @@ final public class NotificationService {
             final String errorReporterEmail = mailer.getErrorReporterEmail();
             if (errorReporterEmail != null && !errorReporterEmail.isEmpty()) {
                 mailer.sendEmail(mailer.getServerSenderEmail(), errorReporterEmail, "[WiseMapping] Export error from " + user.getEmail(), model,
-                        "editorErrorReport.vm");
+                        "errorNotification.vm");
+            }
+        } catch (Exception e) {
+            handleException(e);
+        }
+    }
+
+    public void reportUnexpectedError(@NotNull Throwable exception, @Nullable User user, @NotNull String userAgent) {
+        try {
+            final Map<String, Object> model = new HashMap<String, Object>();
+            model.put("user", user);
+            model.put("errorMsg", stackTraceToString(exception));
+            model.put("userAgent", userAgent);
+
+            final String errorReporterEmail = mailer.getErrorReporterEmail();
+            if (errorReporterEmail != null && !errorReporterEmail.isEmpty()) {
+                mailer.sendEmail(mailer.getServerSenderEmail(), errorReporterEmail, "[WiseMapping] Unexpected error from " + (user != null ? user.getEmail() : "anonymous"), model,
+                        "errorNotification.vm");
             }
         } catch (Exception e) {
             handleException(e);

wise-webapp/src/main/java/com/wisemapping/mail/NotifyingExceptionResolver.java

@@ -0,0 +1,43 @@
+package com.wisemapping.mail;
+
+import com.wisemapping.model.User;
+import com.wisemapping.security.Utils;
+import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashSet;
+import java.util.Set;
+
+public class NotifyingExceptionResolver extends SimpleMappingExceptionResolver {
+
+    final private Logger logger = Logger.getLogger("com.wisemapping");
+    private Set<String> exclude = new HashSet<String>();
+    private NotificationService notificationService;
+
+    @Override
+    protected ModelAndView doResolveException(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) {
+        if (!exclude.contains(ex.getClass().getName())) {
+            logger.error("An Exception has occurred in the application", ex);
+            sendNotification(ex, request);
+        }
+
+        return super.doResolveException(request, response, handler, ex);
+    }
+
+    private void sendNotification(@NotNull Exception ex, @NotNull HttpServletRequest request) {
+        final User user = Utils.getUser();
+        notificationService.reportUnexpectedError(ex, user, request.getHeader("User-Agent"));
+    }
+
+    public void setExclude(final Set<String> exclude) {
+        this.exclude = exclude;
+    }
+
+    public void setNotificationService(NotificationService notificationService) {
+        this.notificationService = notificationService;
+    }
+}

wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java

@@ -18,7 +18,10 @@
 
 package com.wisemapping.rest;
 
+import com.wisemapping.mail.NotificationService;
+import com.wisemapping.model.User;
 import com.wisemapping.rest.model.RestErrors;
+import com.wisemapping.security.Utils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -34,6 +37,9 @@ public class BaseController {
     @Autowired
     private ResourceBundleMessageSource messageSource;
 
+    @Autowired
+    private NotificationService notificationService;
+
     @ExceptionHandler(IllegalArgumentException.class)
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ResponseBody
@@ -46,7 +52,8 @@ public class BaseController {
     @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
     @ResponseBody
     public String handleServerErrors(@NotNull Exception ex) {
-        ex.printStackTrace();
+        final User user = Utils.getUser();
+        notificationService.reportUnexpectedError(ex, user, "unknown browser");
         return ex.getMessage();
     }
 

wise-webapp/src/main/resources/mail/errorNotification.vm

@@ -4,16 +4,23 @@
     <li>User Name: ${user.fullName}</li>
     <li>Email: ${user.email}</li>
     <li>User Agent: ${userAgent}</li>
+    #if($mapId)
         <li>Mindmap Id: ${mapId}</li>
+    #end
+    #if($mapTitle)
         <li>Mindmap Title: ${mapTitle}</li>
+    #end
 </ul>
+
 <pre style="border:1px dashed #a9a9a9">
     ${errorMsg}
 </pre>
 
+#if($mapXML)
 <pre style="border:1px dashed #a9a9a9">
     ${mapXML}
 </pre>
+#end
 
 </body>
 </html>

wise-webapp/src/main/webapp/WEB-INF/app.properties

@@ -58,7 +58,7 @@ mail.serverSendEmail=root@localhost
 mail.supportEmail=root@localhost
 
 # Optional: Unexpected errors will be reported to this address.
-mail.errorReporterEmail=
+mail.errorReporterEmail=support@wisemapping.com
 
 ##################################################################################
 # Users Registration  Configuration

wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml

@@ -50,11 +50,25 @@
     <definition name="unexpectedError" extends="errorTemplate">
         <put-attribute name="title" value="UNEXPECTED_ERROR"/>
         <put-attribute name="details" value="UNEXPECTED_ERROR_DETAILS"/>
+        <put-attribute name="logError" value="true"/>
     </definition>
 
     <definition name="securityError" extends="errorTemplate">
         <put-attribute name="title" value="NO_ENOUGH_PERMISSIONS"/>
         <put-attribute name="details" value="NO_ENOUGH_PERMISSIONS_DETAILS"/>
+        <put-attribute name="logError" value="false"/>
+    </definition>
+
+    <definition name="forgotPasswordError" extends="errorTemplate">
+        <put-attribute name="title" value="INVALID_EMAIL_ERROR"/>
+        <put-attribute name="body" value="/jsp/userForgotPasswordError.jsp"/>
+        <put-attribute name="logError" value="false"/>
+    </definition>
+
+    <definition name="forgotPasswordSuccess" extends="errorTemplate">
+        <put-attribute name="title" value="FORGOT_PASSWORD"/>
+        <put-attribute name="body" value="/jsp/userForgotPasswordSuccess.jsp"/>
+        <put-attribute name="logError" value="false"/>
     </definition>
 
     <!-- Main Pages -->
@@ -68,16 +82,6 @@
         <put-attribute name="body" value="/jsp/termsOfUse.jsp"/>
     </definition>
 
-    <definition name="forgotPasswordError" extends="errorTemplate">
-        <put-attribute name="title" value="INVALID_EMAIL_ERROR"/>
-        <put-attribute name="body" value="/jsp/userForgotPasswordError.jsp"/>
-    </definition>
-
-    <definition name="forgotPasswordSuccess" extends="errorTemplate">
-        <put-attribute name="title" value="FORGOT_PASSWORD"/>
-        <put-attribute name="body" value="/jsp/userForgotPasswordSuccess.jsp"/>
-    </definition>
-
     <definition name="forgotPassword" extends="pageTemplate">
         <put-attribute name="title" value="FORGOT_PASSWORD"/>
         <put-attribute name="body" value="/jsp/userForgotPassword.jsp"/>

wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml

@@ -54,7 +54,7 @@
 
 
     <bean id="exceptionHandlerResolver"
-          class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">
+          class="com.wisemapping.mail.NotifyingExceptionResolver">
         <property name="defaultStatusCode" value="500"/>
         <property name="defaultErrorView" value="unexpectedError"/>
         <property name="exceptionMappings">
@@ -65,6 +65,14 @@
                 <prop key="java.lang.reflect.UndeclaredThrowableException">securityError</prop>
             </props>
         </property>
+        <property name="exclude">
+            <set>
+                <value>java.lang.reflect.UndeclaredThrowableException</value>
+                <value>com.wisemapping.exceptions.GoogleChromeFrameRequiredException</value>
+                <value>com.wisemapping.exceptions.UnsupportedBrowserException</value>
+            </set>
+        </property>
+        <property name="notificationService" ref="notificationService"/>
     </bean>
 
     <bean id="viewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">

wise-webapp/src/main/webapp/jsp/errorTemplate.jsp

@@ -1,14 +1,8 @@
 <!DOCTYPE HTML>
 
-<%@ page import="org.apache.log4j.Logger" %>
-<%@ page import="com.wisemapping.security.Utils" %>
-<%@ page import="com.wisemapping.model.User" %>
 <%@ page autoFlush="true" buffer="none" %>
 <%@ include file="/jsp/init.jsp" %>
 
-<%!
-    final Logger logger = Logger.getLogger("com.wisemapping");
-%>
 <h2>
     <spring:message code="${requestScope.title}"/>
 </h2>
@@ -16,21 +10,4 @@
 <strong>
     <spring:message code="${requestScope.details}"/>
 </strong>
-<!--
-<%
-    final Throwable exception = (Throwable) request.getAttribute("exception");
-    if (exception != null) {
-        exception.printStackTrace(response.getWriter());
-        String usrMail = "anonymous";
-        final User user = Utils.getUser(false);
-        if (user != null) {
-            usrMail = user.getEmail();
-        }
-
-        logger.error("Unexpected error on user '" + usrMail + " ':", exception);
-
-    }
-%>
-
--->