diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/transaction/TransactionalInterceptor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/transaction/TransactionalInterceptor.java index a8fadec..8438865 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/transaction/TransactionalInterceptor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/transaction/TransactionalInterceptor.java @@ -187,7 +187,7 @@ public class TransactionalInterceptor implements Serializable { return logger; } - private static class VoidTransactionInfo extends TransactionInfo { + static class VoidTransactionInfo extends TransactionInfo { private static final long serialVersionUID = 1L; diff --git a/impl/extension/servlet/pom.xml b/impl/extension/servlet/pom.xml index 0c35150..6f0355d 100755 --- a/impl/extension/servlet/pom.xml +++ b/impl/extension/servlet/pom.xml @@ -34,7 +34,8 @@ ou escreva para a Fundação do Software Livre (FSF) Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. --> - + 4.0.0 @@ -72,6 +73,12 @@ javax.servlet-api + commons-codec + commons-codec + 1.4 + + + javax.el el-api test diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/BasicAuthenticationFilter.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/BasicAuthenticationFilter.java new file mode 100644 index 0000000..b2fb786 --- /dev/null +++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/BasicAuthenticationFilter.java @@ -0,0 +1,113 @@ +/* + * Demoiselle Framework + * Copyright (C) 2010 SERPRO + * ---------------------------------------------------------------------------- + * This file is part of Demoiselle Framework. + * + * Demoiselle Framework is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License version 3 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License version 3 + * along with this program; if not, see + * or write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301, USA. + * ---------------------------------------------------------------------------- + * Este arquivo é parte do Framework Demoiselle. + * + * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou + * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação + * do Software Livre (FSF). + * + * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA + * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou + * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português + * para maiores detalhes. + * + * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título + * "LICENCA.txt", junto com esse programa. Se não, acesse + * ou escreva para a Fundação do Software Livre (FSF) Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. + */ +package br.gov.frameworkdemoiselle.internal.implementation; + +import java.io.IOException; +import java.util.Arrays; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.codec.binary.Base64; + +import br.gov.frameworkdemoiselle.security.AuthenticationException; +import br.gov.frameworkdemoiselle.security.Credentials; +import br.gov.frameworkdemoiselle.security.SecurityContext; +import br.gov.frameworkdemoiselle.util.Beans; + +public class BasicAuthenticationFilter implements Filter { + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, + ServletException { + + String[] basicCredentials = getCredentials((HttpServletRequest) request); + + if (basicCredentials != null) { + Credentials credentials = Beans.getReference(Credentials.class); + credentials.setUsername(basicCredentials[0]); + credentials.setPassword(basicCredentials[1]); + + try { + Beans.getReference(SecurityContext.class).login(); + + } catch (AuthenticationException cause) { + // TODO Informar via logger que a autenticação não foi bem sucedida. + } + } + + chain.doFilter(request, response); + } + + private String getAuthHeader(HttpServletRequest request) { + String result = request.getHeader("Authorization"); + result = (result == null ? request.getHeader("authorization") : result); + + return result; + } + + private String[] getCredentials(HttpServletRequest request) { + String[] result = null; + String header = getAuthHeader(request); + + if (header != null) { + byte[] decoded = Base64.decodeBase64(header.substring(6)); + result = new String(decoded).split(":"); + } + + if (result != null && Arrays.asList(result).size() != 2) { + result = null; + + // TODO Informar via logger que o header Authorization não contém as informações de username e password + } + + return result; + } + + @Override + public void destroy() { + } +} diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/HttpServletRequestProducerFilter.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/HttpServletRequestProducerFilter.java new file mode 100644 index 0000000..1766063 --- /dev/null +++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/HttpServletRequestProducerFilter.java @@ -0,0 +1,32 @@ +package br.gov.frameworkdemoiselle.internal.implementation; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; + +import br.gov.frameworkdemoiselle.internal.producer.HttpServletRequestProducer; +import br.gov.frameworkdemoiselle.util.Beans; + +public class HttpServletRequestProducerFilter implements Filter { + + @Override + public void init(FilterConfig config) throws ServletException { + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, + ServletException { + Beans.getReference(HttpServletRequestProducer.class).setDelegate((HttpServletRequest) request); + chain.doFilter(request, response); + } + + @Override + public void destroy() { + } +} diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/HttpServletResponseProducerFilter.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/HttpServletResponseProducerFilter.java new file mode 100644 index 0000000..6500fa5 --- /dev/null +++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/HttpServletResponseProducerFilter.java @@ -0,0 +1,32 @@ +package br.gov.frameworkdemoiselle.internal.implementation; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletResponse; + +import br.gov.frameworkdemoiselle.internal.producer.HttpServletResponseProducer; +import br.gov.frameworkdemoiselle.util.Beans; + +public class HttpServletResponseProducerFilter implements Filter { + + @Override + public void init(FilterConfig config) throws ServletException { + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, + ServletException { + Beans.getReference(HttpServletResponseProducer.class).setDelegate((HttpServletResponse) response); + chain.doFilter(request, response); + } + + @Override + public void destroy() { + } +} diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/InternalProcessorFilterImpl.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/InternalProcessorFilterImpl.java new file mode 100644 index 0000000..542bb60 --- /dev/null +++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/InternalProcessorFilterImpl.java @@ -0,0 +1,62 @@ +package br.gov.frameworkdemoiselle.internal.implementation; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +import br.gov.frameworkdemoiselle.annotation.StaticScoped; +import br.gov.frameworkdemoiselle.util.ServletFilter.InternalProcessorFilter; + +@StaticScoped +public class InternalProcessorFilterImpl implements InternalProcessorFilter { + + private List filters; + + public InternalProcessorFilterImpl() { + filters = new ArrayList(); + + filters.add(new HttpServletRequestProducerFilter()); + filters.add(new HttpServletResponseProducerFilter()); + filters.add(new BasicAuthenticationFilter()); + } + + @Override + public void init(FilterConfig config) throws ServletException { + for (Filter filter : filters) { + filter.init(config); + } + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, + ServletException { + FilterChain emptyChain = createEmptyChain(); + + for (Filter filter : filters) { + filter.doFilter(request, response, emptyChain); + } + } + + @Override + public void destroy() { + for (Filter filter : filters) { + filter.destroy(); + } + } + + private FilterChain createEmptyChain() { + return new FilterChain() { + + @Override + public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { + } + }; + } +} diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/ServletFilter.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/ServletFilter.java index 31b7f1d..1e20497 100644 --- a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/ServletFilter.java +++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/ServletFilter.java @@ -44,36 +44,27 @@ import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import br.gov.frameworkdemoiselle.internal.producer.HttpServletRequestProducer; -import br.gov.frameworkdemoiselle.internal.producer.HttpServletResponseProducer; public class ServletFilter implements Filter { @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig config) throws ServletException { + Beans.getReference(InternalProcessorFilter.class).init(config); } @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { - - Beans.getReference(HttpServletRequestProducer.class).setDelegate((HttpServletRequest) request); - Beans.getReference(HttpServletResponseProducer.class).setDelegate((HttpServletResponse) response); - - // X509Certificate[] certificates = (X509Certificate[]) ((HttpServletRequest) request) - // .getAttribute("javax.servlet.request.X509Certificate"); - // - // for (X509Certificate certificate : certificates) { - // System.out.println(certificate.toString()); - // } + Beans.getReference(InternalProcessorFilter.class).doFilter(request, response, chain); chain.doFilter(request, response); } @Override public void destroy() { + Beans.getReference(InternalProcessorFilter.class).destroy(); + } + + public interface InternalProcessorFilter extends Filter { } } -- libgit2 0.21.2