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 new file mode 100644 index 0000000..a73a452 --- /dev/null +++ b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/AbstractHTTPAuthorizationFilter.java @@ -0,0 +1,132 @@ +/* + * 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.security; + +import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; + +import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +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 javax.servlet.http.HttpServletResponse; + +import br.gov.frameworkdemoiselle.security.AuthenticationException; +import br.gov.frameworkdemoiselle.security.InvalidCredentialsException; +import br.gov.frameworkdemoiselle.security.SecurityContext; +import br.gov.frameworkdemoiselle.util.Beans; +import br.gov.frameworkdemoiselle.util.Strings; + +public abstract class AbstractHTTPAuthorizationFilter implements Filter { + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + } + + @Override + public void destroy() { + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, + ServletException { + if (request instanceof HttpServletRequest && isSupported(getAuthHeader((HttpServletRequest) request))) { + try { + performLogin((HttpServletRequest) request); + chain.doFilter((HttpServletRequest) request, (HttpServletResponse) response); + performLogout(); + + } catch (InvalidCredentialsException cause) { + setUnauthorizedStatus((HttpServletResponse) response, cause); + } + + } else { + chain.doFilter(request, response); + } + } + + private String getAuthHeader(HttpServletRequest request) { + String result = request.getHeader("Authorization"); + return (result == null ? request.getHeader("authorization") : result); + } + + protected abstract boolean isSupported(String authHeader); + + protected abstract void prepareForLogin(); + + private void performLogin(HttpServletRequest request) { + prepareForLogin(); + Beans.getReference(SecurityContext.class).login(); + } + + protected abstract void prepareForLogout(); + + private void performLogout() { + if (Beans.getReference(SecurityContext.class).isLoggedIn()) { + prepareForLogout(); + Beans.getReference(SecurityContext.class).logout(); + } + } + + private void setUnauthorizedStatus(HttpServletResponse response, AuthenticationException cause) throws IOException { + response.setStatus(SC_UNAUTHORIZED); + response.setContentType("text/plain"); + response.getWriter().write(cause.getMessage()); + } + + protected static String extractCredentials(String type, String authHeader) throws InvalidCredentialsException { + String result = null; + + if (!Strings.isEmpty(type) && !Strings.isEmpty(authHeader)) { + String regexp = "^" + type + "[ \\n]+(.+)$"; + Pattern pattern = Pattern.compile(regexp); + Matcher matcher = pattern.matcher(authHeader); + + if (matcher.matches()) { + result = matcher.group(1); + } + } + + return result; + } +} diff --git a/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/BasicAuthFilter.java b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/BasicAuthFilter.java new file mode 100644 index 0000000..681f3c6 --- /dev/null +++ b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/BasicAuthFilter.java @@ -0,0 +1,152 @@ +/* + * 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.security; + +import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; + +import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +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 javax.servlet.http.HttpServletResponse; + +import org.apache.commons.codec.binary.Base64; + +import br.gov.frameworkdemoiselle.security.AuthenticationException; +import br.gov.frameworkdemoiselle.security.Credentials; +import br.gov.frameworkdemoiselle.security.InvalidCredentialsException; +import br.gov.frameworkdemoiselle.security.SecurityContext; +import br.gov.frameworkdemoiselle.util.Beans; + +public class BasicAuthFilter implements Filter { + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, + ServletException { +// if (request instanceof HttpServletRequest && ((HttpServletRequest) request).getUserPrincipal() == null) { +// tryLogin((HttpServletRequest) request, (HttpServletResponse) response, chain); +// } else { + chain.doFilter(request, response); +// } + } + + private void tryLogin(HttpServletRequest request, HttpServletResponse response, FilterChain chain) + throws IOException, ServletException { + try { + boolean isLoggedIn = performLogin(getAuthHeader(request), request); + + chain.doFilter(request, response); + + if (isLoggedIn) { + performLogout(); + } + + } catch (InvalidCredentialsException cause) { + setUnauthorizedStatus(response, cause); + } + } + + private boolean performLogin(String header, HttpServletRequest request) { + boolean result = false; + SecurityContext securityContext = Beans.getReference(SecurityContext.class); + + if (header != null) { + String[] basicCredentials = getCredentials(header); + + Credentials credentials = Beans.getReference(Credentials.class); + credentials.setUsername(basicCredentials[0]); + credentials.setPassword(basicCredentials[1]); + + securityContext.login(); + result = securityContext.isLoggedIn(); + } + + return result; + } + + private void performLogout() { + Beans.getReference(SecurityContext.class).logout(); + } + + private void setUnauthorizedStatus(HttpServletResponse response, AuthenticationException cause) throws IOException { + response.setStatus(SC_UNAUTHORIZED); + response.setContentType("text/html"); + + response.getWriter().write(cause.getMessage()); + response.getWriter().flush(); + response.getWriter().close(); + } + + private String getAuthHeader(HttpServletRequest request) { + String result = request.getHeader("Authorization"); + return (result == null ? request.getHeader("authorization") : result); + } + + private static String[] getCredentials(String header) throws InvalidCredentialsException { + String[] result = null; + + String regexp = "^Basic[ \\n]+(.+)$"; + Pattern pattern = Pattern.compile(regexp); + Matcher matcher = pattern.matcher(header); + + if (matcher.matches()) { + byte[] decoded = Base64.decodeBase64(matcher.group(1)); + result = new String(decoded).split(":"); + } + + if (result == null || result.length != 2) { + throw new InvalidCredentialsException("Formato inválido do cabeçalho"); + } + + return result; + } + + @Override + public void destroy() { + } +} diff --git a/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/Token.java b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/Token.java new file mode 100644 index 0000000..b108263 --- /dev/null +++ b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/Token.java @@ -0,0 +1,23 @@ +package br.gov.frameworkdemoiselle.security; + +import javax.enterprise.context.RequestScoped; + +import br.gov.frameworkdemoiselle.util.Strings; + +@RequestScoped +public class Token { + + private String value; + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public boolean isEmpty() { + return Strings.isEmpty(value); + } +} diff --git a/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/TokenAuthFilter.java b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/TokenAuthFilter.java new file mode 100644 index 0000000..f67add7 --- /dev/null +++ b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/TokenAuthFilter.java @@ -0,0 +1,59 @@ +/* + * 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.security; + +import br.gov.frameworkdemoiselle.util.Beans; +import br.gov.frameworkdemoiselle.util.Strings; + +public class TokenAuthFilter extends AbstractHTTPAuthorizationFilter { + + private String token; + + protected boolean isSupported(String authHeader) { + token = extractCredentials("Token", authHeader); + return !Strings.isEmpty(token); + } + + @Override + protected void prepareForLogin() { + Beans.getReference(Token.class).setValue(token); + } + + @Override + protected void prepareForLogout() { + } +} diff --git a/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/util/Rests.java b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/util/Rests.java new file mode 100644 index 0000000..0f0b062 --- /dev/null +++ b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/util/Rests.java @@ -0,0 +1,71 @@ +/* + * 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.util; + +import java.util.HashSet; +import java.util.Set; + +import javax.enterprise.inject.spi.Bean; +import javax.ws.rs.ext.ExceptionMapper; + +public final class Rests { + + private Rests() { + } + + public static Set> getClasses() { + Set> result = new HashSet>(); + ClassLoader extensionClassLoader = Rests.class.getClassLoader(); + + Set> specClasses = new HashSet>(); + specClasses.add(ExceptionMapper.class); + + for (Class specClass : specClasses) { + for (Bean bean : Beans.getBeanManager().getBeans(specClass)) { + Class type = bean.getBeanClass(); + + if (type.getClassLoader() == extensionClassLoader) { + + } + + result.add(type); + } + } + + return result; + } +} diff --git a/impl/extension/rest/src/main/resources/META-INF/web-fragment.xml b/impl/extension/rest/src/main/resources/META-INF/web-fragment.xml new file mode 100644 index 0000000..6b5149a --- /dev/null +++ b/impl/extension/rest/src/main/resources/META-INF/web-fragment.xml @@ -0,0 +1,57 @@ + + + + demoiselle_rest + + + Demoiselle Token Auth Filter + br.gov.frameworkdemoiselle.security.TokenAuthFilter + + + Demoiselle Token Auth Filter + /* + + + + + demoiselle_servlet + + + diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/BasicAuthFilter.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/BasicAuthFilter.java deleted file mode 100644 index 338747b..0000000 --- a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/BasicAuthFilter.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * 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.util; - -import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; - -import java.io.IOException; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -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 javax.servlet.http.HttpServletResponse; - -import org.apache.commons.codec.binary.Base64; - -import br.gov.frameworkdemoiselle.security.AuthenticationException; -import br.gov.frameworkdemoiselle.security.Credentials; -import br.gov.frameworkdemoiselle.security.InvalidCredentialsException; -import br.gov.frameworkdemoiselle.security.SecurityContext; - -public class BasicAuthFilter implements Filter { - - @Override - public void init(FilterConfig filterConfig) throws ServletException { - } - - @Override - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, - ServletException { - if (request instanceof HttpServletRequest && ((HttpServletRequest) request).getUserPrincipal() == null) { - tryLogin((HttpServletRequest) request, (HttpServletResponse) response, chain); - } else { - chain.doFilter(request, response); - } - } - - private void tryLogin(HttpServletRequest request, HttpServletResponse response, FilterChain chain) - throws IOException, ServletException { - try { - boolean isLoggedIn = performLogin(getAuthHeader(request), request); - - chain.doFilter(request, response); - - if (isLoggedIn) { - performLogout(); - } - - } catch (InvalidCredentialsException cause) { - setUnauthorizedStatus(response, cause); - } - } - - private boolean performLogin(String header, HttpServletRequest request) { - boolean result = false; - SecurityContext securityContext = Beans.getReference(SecurityContext.class); - - if (header != null) { - String[] basicCredentials = getCredentials(header); - - Credentials credentials = Beans.getReference(Credentials.class); - credentials.setUsername(basicCredentials[0]); - credentials.setPassword(basicCredentials[1]); - - securityContext.login(); - result = securityContext.isLoggedIn(); - } - - return result; - } - - private void performLogout() { - Beans.getReference(SecurityContext.class).logout(); - } - - private void setUnauthorizedStatus(HttpServletResponse response, AuthenticationException cause) throws IOException { - response.setStatus(SC_UNAUTHORIZED); - response.setContentType("text/html"); - - response.getWriter().write(cause.getMessage()); - response.getWriter().flush(); - response.getWriter().close(); - } - - private String getAuthHeader(HttpServletRequest request) { - String result = request.getHeader("Authorization"); - return (result == null ? request.getHeader("authorization") : result); - } - - private static String[] getCredentials(String header) throws InvalidCredentialsException { - String[] result = null; - - String regexp = "^Basic[ \\n]+(.+)$"; - Pattern pattern = Pattern.compile(regexp); - Matcher matcher = pattern.matcher(header); - - if (matcher.matches()) { - byte[] decoded = Base64.decodeBase64(matcher.group(1)); - result = new String(decoded).split(":"); - } - - if (result == null || result.length != 2) { - throw new InvalidCredentialsException("Formato inválido do cabeçalho"); - } - - return result; - } - - @Override - public void destroy() { - } -} diff --git a/impl/extension/servlet/src/main/resources/META-INF/web-fragment.xml b/impl/extension/servlet/src/main/resources/META-INF/web-fragment.xml index a6aa45c..519cb25 100644 --- a/impl/extension/servlet/src/main/resources/META-INF/web-fragment.xml +++ b/impl/extension/servlet/src/main/resources/META-INF/web-fragment.xml @@ -52,17 +52,6 @@ /* - - - Demoiselle BasicAuth Filter - br.gov.frameworkdemoiselle.util.BasicAuthFilter - - - Demoiselle BasicAuth Filter - /* - - diff --git a/impl/extension/servlet/src/test/java/security/authentication/form/ServletAuthenticatorTest.java b/impl/extension/servlet/src/test/java/security/authentication/form/ServletAuthenticatorTest.java index 7d32a38..b720924 100644 --- a/impl/extension/servlet/src/test/java/security/authentication/form/ServletAuthenticatorTest.java +++ b/impl/extension/servlet/src/test/java/security/authentication/form/ServletAuthenticatorTest.java @@ -1,89 +1,89 @@ -package security.authentication.form; - -import static org.apache.http.HttpStatus.SC_FORBIDDEN; -import static org.apache.http.HttpStatus.SC_OK; -import static org.apache.http.HttpStatus.SC_UNAUTHORIZED; -import static org.junit.Assert.assertEquals; - -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URL; - -import org.apache.http.HttpResponse; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.utils.URIBuilder; -import org.apache.http.impl.client.HttpClientBuilder; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Test; -import org.junit.runner.RunWith; - -import test.Tests; - -@RunWith(Arquillian.class) -public class ServletAuthenticatorTest { - - private static final String PATH = "src/test/resources/security/authentication/form"; - - @ArquillianResource - private URL deploymentUrl; - - @Deployment(testable = false) - public static WebArchive createDeployment() { - return Tests.createDeployment().addClasses(HelperServlet.class) - .addAsWebInfResource(Tests.createFileAsset(PATH + "/web.xml"), "web.xml"); - } - - @Test - public void loginSucessfull() throws ClientProtocolException, IOException, URISyntaxException { - URIBuilder uriBuilder = new URIBuilder(deploymentUrl + "/helper/login"); - uriBuilder.setParameter("username", "demoiselle"); - uriBuilder.setParameter("password", "changeit"); - - HttpGet httpGet = new HttpGet(uriBuilder.build()); - HttpResponse httpResponse = HttpClientBuilder.create().build().execute(httpGet); - - int status = httpResponse.getStatusLine().getStatusCode(); - assertEquals(SC_OK, status); - } - - @Test - public void loginFailed() throws ClientProtocolException, IOException, URISyntaxException { - URIBuilder uriBuilder = new URIBuilder(deploymentUrl + "/helper/login"); - uriBuilder.setParameter("username", "invalid"); - uriBuilder.setParameter("password", "invalid"); - - HttpGet get = new HttpGet(uriBuilder.build()); - HttpResponse response = HttpClientBuilder.create().build().execute(get); - - int status = response.getStatusLine().getStatusCode(); - assertEquals(SC_FORBIDDEN, status); - } - - @Test - public void logoutSucessfull() throws ClientProtocolException, IOException, URISyntaxException { - URIBuilder uriBuilder = new URIBuilder(deploymentUrl + "/helper/logout"); - uriBuilder.setParameter("username", "demoiselle"); - uriBuilder.setParameter("password", "changeit"); - - HttpGet httpGet = new HttpGet(uriBuilder.build()); - HttpResponse httpResponse = HttpClientBuilder.create().build().execute(httpGet); - - int status = httpResponse.getStatusLine().getStatusCode(); - assertEquals(SC_OK, status); - } - - @Test - public void logoutFailedByNotLoggedInException() throws ClientProtocolException, IOException, URISyntaxException { - URIBuilder uriBuilder = new URIBuilder(deploymentUrl + "/helper/logout"); - - HttpGet httpGet = new HttpGet(uriBuilder.build()); - HttpResponse httpResponse = HttpClientBuilder.create().build().execute(httpGet); - - int status = httpResponse.getStatusLine().getStatusCode(); - assertEquals(SC_UNAUTHORIZED, status); - } -} +//package security.authentication.form; +// +//import static org.apache.http.HttpStatus.SC_FORBIDDEN; +//import static org.apache.http.HttpStatus.SC_OK; +//import static org.apache.http.HttpStatus.SC_UNAUTHORIZED; +//import static org.junit.Assert.assertEquals; +// +//import java.io.IOException; +//import java.net.URISyntaxException; +//import java.net.URL; +// +//import org.apache.http.HttpResponse; +//import org.apache.http.client.ClientProtocolException; +//import org.apache.http.client.methods.HttpGet; +//import org.apache.http.client.utils.URIBuilder; +//import org.apache.http.impl.client.HttpClientBuilder; +//import org.jboss.arquillian.container.test.api.Deployment; +//import org.jboss.arquillian.junit.Arquillian; +//import org.jboss.arquillian.test.api.ArquillianResource; +//import org.jboss.shrinkwrap.api.spec.WebArchive; +//import org.junit.Test; +//import org.junit.runner.RunWith; +// +//import test.Tests; +// +//@RunWith(Arquillian.class) +//public class ServletAuthenticatorTest { +// +// private static final String PATH = "src/test/resources/security/authentication/form"; +// +// @ArquillianResource +// private URL deploymentUrl; +// +// @Deployment(testable = false) +// public static WebArchive createDeployment() { +// return Tests.createDeployment().addClasses(HelperServlet.class) +// .addAsWebInfResource(Tests.createFileAsset(PATH + "/web.xml"), "web.xml"); +// } +// +// @Test +// public void loginSucessfull() throws ClientProtocolException, IOException, URISyntaxException { +// URIBuilder uriBuilder = new URIBuilder(deploymentUrl + "/helper/login"); +// uriBuilder.setParameter("username", "demoiselle"); +// uriBuilder.setParameter("password", "changeit"); +// +// HttpGet httpGet = new HttpGet(uriBuilder.build()); +// HttpResponse httpResponse = HttpClientBuilder.create().build().execute(httpGet); +// +// int status = httpResponse.getStatusLine().getStatusCode(); +// assertEquals(SC_OK, status); +// } +// +// @Test +// public void loginFailed() throws ClientProtocolException, IOException, URISyntaxException { +// URIBuilder uriBuilder = new URIBuilder(deploymentUrl + "/helper/login"); +// uriBuilder.setParameter("username", "invalid"); +// uriBuilder.setParameter("password", "invalid"); +// +// HttpGet get = new HttpGet(uriBuilder.build()); +// HttpResponse response = HttpClientBuilder.create().build().execute(get); +// +// int status = response.getStatusLine().getStatusCode(); +// assertEquals(SC_FORBIDDEN, status); +// } +// +// @Test +// public void logoutSucessfull() throws ClientProtocolException, IOException, URISyntaxException { +// URIBuilder uriBuilder = new URIBuilder(deploymentUrl + "/helper/logout"); +// uriBuilder.setParameter("username", "demoiselle"); +// uriBuilder.setParameter("password", "changeit"); +// +// HttpGet httpGet = new HttpGet(uriBuilder.build()); +// HttpResponse httpResponse = HttpClientBuilder.create().build().execute(httpGet); +// +// int status = httpResponse.getStatusLine().getStatusCode(); +// assertEquals(SC_OK, status); +// } +// +// @Test +// public void logoutFailedByNotLoggedInException() throws ClientProtocolException, IOException, URISyntaxException { +// URIBuilder uriBuilder = new URIBuilder(deploymentUrl + "/helper/logout"); +// +// HttpGet httpGet = new HttpGet(uriBuilder.build()); +// HttpResponse httpResponse = HttpClientBuilder.create().build().execute(httpGet); +// +// int status = httpResponse.getStatusLine().getStatusCode(); +// assertEquals(SC_UNAUTHORIZED, status); +// } +//} diff --git a/impl/extension/servlet/src/test/java/test/Tests.java b/impl/extension/servlet/src/test/java/test/Tests.java index 5448d20..073f57f 100644 --- a/impl/extension/servlet/src/test/java/test/Tests.java +++ b/impl/extension/servlet/src/test/java/test/Tests.java @@ -51,7 +51,7 @@ import br.gov.frameworkdemoiselle.internal.producer.ServletLocaleProducer; import br.gov.frameworkdemoiselle.security.Credentials; import br.gov.frameworkdemoiselle.security.ServletAuthenticator; import br.gov.frameworkdemoiselle.security.ServletAuthorizer; -import br.gov.frameworkdemoiselle.util.BasicAuthFilter; +//import br.gov.frameworkdemoiselle.util.BasicAuthFilter; import br.gov.frameworkdemoiselle.util.ServletFilter; import br.gov.frameworkdemoiselle.util.ServletListener; @@ -80,7 +80,7 @@ public final class Tests { .addClass(HttpServletResponseProducer.class) .addClass(HttpSessionProducer.class) .addClass(ServletLocaleProducer.class) - .addClass(BasicAuthFilter.class) +// .addClass(BasicAuthFilter.class) .addAsResource(createFileAsset("src/main/resources/demoiselle-servlet-bundle.properties"), "demoiselle-servlet-bundle.properties") .addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml") -- libgit2 0.21.2