From 38aba6bffe1a1465c3e4c9bad2030c5828c1ba31 Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Sun, 11 Jan 2015 10:48:18 -0300 Subject: [PATCH] Ajuste no tratamento de Invalid Credencials --- impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/AbstractHTTPAuthorizationFilter.java | 22 ++++++++++------------ impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/util/ValidatePayloadInterceptor.java | 8 +++++++- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/AbstractHTTPAuthorizationFilter.java b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/AbstractHTTPAuthorizationFilter.java index 29096f3..77e0d84 100644 --- a/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/AbstractHTTPAuthorizationFilter.java +++ b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/AbstractHTTPAuthorizationFilter.java @@ -57,12 +57,11 @@ import javax.servlet.http.HttpServletResponse; import br.gov.frameworkdemoiselle.util.Beans; import br.gov.frameworkdemoiselle.util.NameQualifier; -import br.gov.frameworkdemoiselle.util.ResourceBundle; import br.gov.frameworkdemoiselle.util.Strings; public abstract class AbstractHTTPAuthorizationFilter implements Filter { - private transient ResourceBundle bundle; + // private transient ResourceBundle bundle; private transient Logger logger; @@ -94,9 +93,8 @@ public abstract class AbstractHTTPAuthorizationFilter implements Filter { performLogout(request, response); } catch (InvalidCredentialsException cause) { - String message = getBundle().getString("authentication-failed"); - getLogger().log(FINE, message, cause); - + // String message = getBundle().getString(cause.getMessage()); + getLogger().log(FINE, cause.getMessage(), cause); setUnauthorizedStatus(response, cause); } @@ -163,13 +161,13 @@ public abstract class AbstractHTTPAuthorizationFilter implements Filter { response.getWriter().write(cause.getMessage()); } - private ResourceBundle getBundle() { - if (bundle == null) { - bundle = Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-rest-bundle")); - } - - return bundle; - } + // private ResourceBundle getBundle() { + // if (bundle == null) { + // bundle = Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-rest-bundle")); + // } + // + // return bundle; + // } private Logger getLogger() { if (logger == null) { diff --git a/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/util/ValidatePayloadInterceptor.java b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/util/ValidatePayloadInterceptor.java index 7652c0a..59e6cc7 100644 --- a/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/util/ValidatePayloadInterceptor.java +++ b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/util/ValidatePayloadInterceptor.java @@ -45,6 +45,7 @@ import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; +import javax.validation.UnexpectedTypeException; import javax.validation.Validation; import javax.validation.Validator; import javax.validation.ValidatorFactory; @@ -68,7 +69,12 @@ public class ValidatePayloadInterceptor implements Serializable { if (params != null) { ValidatorFactory dfv = Validation.buildDefaultValidatorFactory(); Validator validator = dfv.getValidator(); - violations.addAll(validator.validate(params)); + + try { + violations.addAll(validator.validate(params)); + } catch (UnexpectedTypeException cause) { + // TODO Colocar a mensagem no log + } } } -- libgit2 0.21.2