From 8d5386be38db25a2a41c3bf6c876adee21ca26cc Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Fri, 19 Sep 2014 08:26:02 +0000
Subject: [PATCH] #396 fix - Fixed more SonarQube issues
---
securis/src/main/java/net/curisit/securis/AuthFilter.java | 103 +++++++++++++++++++++++++--------------------------
1 files changed, 50 insertions(+), 53 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/AuthFilter.java b/securis/src/main/java/net/curisit/securis/AuthFilter.java
index d9659e3..ac5dc93 100644
--- a/securis/src/main/java/net/curisit/securis/AuthFilter.java
+++ b/securis/src/main/java/net/curisit/securis/AuthFilter.java
@@ -18,72 +18,69 @@
import org.apache.logging.log4j.LogManager;
-
@Singleton
@WebFilter(urlPatterns = "/*")
public class AuthFilter implements Filter {
- private static final Logger LOG = LogManager.getLogger(AuthFilter.class);
+ private static final Logger LOG = LogManager.getLogger(AuthFilter.class);
- @Override
- public void init(FilterConfig fc) throws ServletException {
- }
+ @Override
+ public void init(FilterConfig fc) throws ServletException {}
- @Override
- public void doFilter(ServletRequest sr, ServletResponse sr1, FilterChain fc) throws IOException, ServletException {
- HttpServletRequest req = (HttpServletRequest) sr;
+ @Override
+ public void doFilter(ServletRequest sr, ServletResponse sr1, FilterChain fc) throws IOException, ServletException {
+ HttpServletRequest req = (HttpServletRequest) sr;
- // System.out.println("filter: " + req.getRequestURI() + " user: " + sr.getParameter("user"));
- if (sr.getParameter("user") != null || req.getSession().getAttribute("user") != null) {
- String username = sr.getParameter("user");
- if (username == null)
- username = (String) req.getSession().getAttribute("user");
- String role = username.equals("advance") ? "advance" : "normal";
- // ResteasyProviderFactory.pushContext(User.class, new User(sr.getParameter("user")));
- LOG.info("Role for user: {} = {}", username, role);
- fc.doFilter(new UserRoleRequestWrapper(role, sr.getParameter("user"), req), sr1);
- } else {
- fc.doFilter(req, sr1);
- }
+ if (sr.getParameter("user") != null || req.getSession().getAttribute("user") != null) {
+ String username = sr.getParameter("user");
+ if (username == null) {
+ username = (String) req.getSession().getAttribute("user");
+ }
+ // TODO: role management is temporal
+ String role = "advance".equals(username) ? "advance" : "normal";
+ LOG.info("Role for user: {} = {}", username, role);
+ fc.doFilter(new UserRoleRequestWrapper(role, sr.getParameter("user"), req), sr1);
+ } else {
+ fc.doFilter(req, sr1);
+ }
- }
+ }
- @Override
- public void destroy() {
- }
+ @Override
+ public void destroy() {}
- private class UserRoleRequestWrapper extends HttpServletRequestWrapper {
+ private class UserRoleRequestWrapper extends HttpServletRequestWrapper {
- private String role;
- private String user;
+ private String role;
+ private String user;
- public UserRoleRequestWrapper(String role, String user, HttpServletRequest request) {
- super(request);
- this.role = role;
- this.user = user;
- }
+ public UserRoleRequestWrapper(String role, String user, HttpServletRequest request) {
+ super(request);
+ this.role = role;
+ this.user = user;
+ }
- @Override
- public boolean isUserInRole(String role) {
- LOG.info("isUserRole METHOD: {}, {}", role, this.role);
- if (this.role == null) {
- return super.isUserInRole(role);
- }
- return this.role.equals(role);
- }
+ @Override
+ public boolean isUserInRole(String role) {
+ LOG.info("isUserRole METHOD: {}, {}", role, this.role);
+ if (this.role == null) {
+ return super.isUserInRole(role);
+ }
+ return this.role.equals(role);
+ }
- @Override
- public Principal getUserPrincipal() {
- if (this.user == null) {
- return super.getUserPrincipal();
- }
+ @Override
+ public Principal getUserPrincipal() {
+ if (this.user == null) {
+ return super.getUserPrincipal();
+ }
- return new Principal() {
- @Override
- public String getName() {
- return user;
- }
- };
- }
- }
+ return new Principal() {
+ @Override
+ public String getName() {
+ return user;
+ }
+ };
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.3.2