exception handling for rest services

java/org/owasp/webgoat/service/BaseService.java

@@ -3,10 +3,14 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-
 package org.owasp.webgoat.service;
 
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
 /**
  *
@@ -14,5 +18,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
  */
 @RequestMapping("/service")
 public abstract class BaseService {
-    
+
+    @ExceptionHandler(Exception.class)
+    @ResponseStatus(value = HttpStatus.I_AM_A_TEAPOT)
+    public @ResponseBody
+    ExceptionInfo handleException(HttpServletRequest request, Exception ex) {
+
+        ExceptionInfo response = new ExceptionInfo();
+        response.setUrl(request.getRequestURL().toString());
+        response.setMessage(ex.getMessage());
+
+        return response;
+    }
+
 }