Merge branch '3.0.0-SNAPSHOT' of git@github.com:demoiselle/framework.git

into 3.0.0-SNAPSHOT Conflicts: demoiselle-parent/pom.xml pom.xml

Merge branch '3.0.0-SNAPSHOT' of git@github.com:demoiselle/framework.git
into 3.0.0-SNAPSHOT Conflicts: demoiselle-parent/pom.xml pom.xml
Vanderson Silva
2 parents ce903dd6 ab288611
Showing 7 changed files with 53 additions and 62 deletions Show diff stats
demoiselle-core/pom.xml
demoiselle-rest/src/main/java/org/demoiselle/jee/ws/jaxrs/filter/JaxRsFilter.java
demoiselle-security-jwt/src/main/java/org/demoiselle/jee/security/jwt/impl/TokensManagerImpl.java
demoiselle-security/src/main/java/org/demoiselle/jee/security/impl/DemoisellePrincipalImpl.java
demoiselle-security/src/main/java/org/demoiselle/jee/security/impl/SecurityContextImpl.java
demoiselle-security/src/main/java/org/demoiselle/jee/security/interceptor/RequiredPermissionInterceptor.java
pom.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
-	<artifactId>demoiselle-core</artifactId>
-	<packaging>jar</packaging>
+    <artifactId>demoiselle-core</artifactId>
+    <packaging>jar</packaging>
-	<name>Demoiselle Core</name>
-	<description>
-		Contém funcionalidades comuns a todos os módulos framework.
-	</description>
+    <name>Demoiselle Core</name>
+    <description>
+        Contém funcionalidades comuns a todos os módulos framework.
+    </description>
-	<parent>
-		<groupId>org.demoiselle.jee</groupId>
-		<artifactId>demoiselle-parent</artifactId>		
-		<version>3.0.0-BETA1-SNAPSHOT</version>
-		<relativePath>../demoiselle-parent</relativePath>
-	</parent>	
+    <parent>
+        <groupId>org.demoiselle.jee</groupId>
+        <artifactId>demoiselle-parent</artifactId>		
+        <version>3.0.0-BETA1-SNAPSHOT</version>
+        <relativePath>../demoiselle-parent</relativePath>
+    </parent>	
-	<dependencies>
-		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-web-api</artifactId>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-web-api</artifactId>
+        </dependency>
-		<dependency>
-			<groupId>javax.enterprise</groupId>
-			<artifactId>cdi-api</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>javax.enterprise</groupId>
+            <artifactId>cdi-api</artifactId>
+        </dependency>
-		<!-- Configuration/Messages -->
-		<dependency>
-			<groupId>org.apache.deltaspike.core</groupId>
-			<artifactId>deltaspike-core-api</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.deltaspike.core</groupId>
-			<artifactId>deltaspike-core-impl</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-	</dependencies>
+        <!-- Configuration/Messages -->
+        <dependency>
+            <groupId>org.apache.deltaspike.core</groupId>
+            <artifactId>deltaspike-core-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.deltaspike.core</groupId>
+            <artifactId>deltaspike-core-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
 </project>
@@ -43,6 +43,9 @@ public class JaxRsFilter implements ContainerRequestFilter, ContainerResponseFil
     public void filter(ContainerRequestContext requestContext, ContainerResponseContext response) {
         response.getHeaders().putSingle("Demoiselle", "3.0.0");
+        response.getHeaders().putSingle("Access-Control-Allow-Origin", "*");
+        response.getHeaders().putSingle("Access-Control-Allow-Methods", "OPTIONS, GET, POST, PUT, DELETE");
+        response.getHeaders().putSingle("Access-Control-Allow-Headers", "Content-Type");
         if (requestContext.getMethod().equals("GET")) {
             Cache max = info.getResourceMethod().getAnnotation(Cache.class);
@@ -51,16 +54,15 @@ public class JaxRsFilter implements ContainerRequestFilter, ContainerResponseFil
             }
         }
-        CorsAllowMethods corsAllowMethods = info.getResourceMethod().getAnnotation(CorsAllowMethods.class);
-        if (corsAllowMethods != null) {
-            response.getHeaders().putSingle("Access-Control-Allow-Methods", requestContext.getMethod());
-        }
-
-        CorsAllowOrigin corsAllowOrigin = info.getResourceMethod().getAnnotation(CorsAllowOrigin.class);
-        if (corsAllowOrigin != null) {
-            response.getHeaders().putSingle("Access-Control-Allow-Origin", corsAllowOrigin.value());
-        }
-        
+//        CorsAllowMethods corsAllowMethods = info.getResourceMethod().getAnnotation(CorsAllowMethods.class);
+//        if (corsAllowMethods != null) {
+//            response.getHeaders().putSingle("Access-Control-Allow-Methods", requestContext.getMethod());
+//        }
+//
+//        CorsAllowOrigin corsAllowOrigin = info.getResourceMethod().getAnnotation(CorsAllowOrigin.class);
+//        if (corsAllowOrigin != null) {
+//            response.getHeaders().putSingle("Access-Control-Allow-Origin", corsAllowOrigin.value());
+//        }        
     }
     @PostConstruct
@@ -8,19 +8,15 @@ package org.demoiselle.jee.security.jwt.impl;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import javax.enterprise.context.Dependent;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import org.demoiselle.jee.core.interfaces.security.DemoisellePrincipal;
 import org.demoiselle.jee.core.interfaces.security.Token;
 import org.demoiselle.jee.core.interfaces.security.TokensManager;
-import static org.jose4j.jwk.PublicJsonWebKey.Factory.newPublicJwk;
 import org.jose4j.jwk.RsaJsonWebKey;
 import org.jose4j.jwk.RsaJwkGenerator;
-import static org.jose4j.jwk.RsaJwkGenerator.generateJwk;
 import org.jose4j.jws.AlgorithmIdentifiers;
-import static org.jose4j.jws.AlgorithmIdentifiers.HMAC_SHA512;
 import org.jose4j.jws.JsonWebSignature;
 import org.jose4j.jwt.JwtClaims;
 import org.jose4j.jwt.consumer.InvalidJwtException;
@@ -51,7 +47,7 @@ public class TokensManagerImpl implements TokensManager {
     public TokensManagerImpl() throws JoseException {
         if (rsaJsonWebKey == null) {
-            rsaJsonWebKey = (RsaJsonWebKey) newPublicJwk(generateJwk(2048).getKey());
+            rsaJsonWebKey = (RsaJsonWebKey) RsaJsonWebKey.Factory.newPublicJwk(RsaJwkGenerator.generateJwk(2048).getKey());
             rsaJsonWebKey.setKeyId("demoiselle-security-jwt");
         }
     }
@@ -108,7 +104,7 @@ public class TokensManagerImpl implements TokensManager {
             jws.setPayload(claims.toJson());
             jws.setKey(rsaJsonWebKey.getKey());
             jws.setKeyIdHeaderValue(rsaJsonWebKey.getKeyId());
-            jws.setAlgorithmHeaderValue(HMAC_SHA512);
+            jws.setAlgorithmHeaderValue(AlgorithmIdentifiers.HMAC_SHA512);
             token.setKey(jws.getCompactSerialization());
             token.setType("JWT");
         } catch (JoseException ex) {
@@ -120,7 +116,7 @@ public class TokensManagerImpl implements TokensManager {
     @Override
     public boolean validate() {
-        return getUser() != null && getUser().getId() != null;
+        return getUser() != null;
     }
 }
@@ -11,8 +11,6 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
 import javax.enterprise.context.RequestScoped;
 import org.demoiselle.jee.core.interfaces.security.DemoisellePrincipal;
@@ -6,8 +6,6 @@
  */
 package org.demoiselle.jee.security.impl;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import org.demoiselle.jee.core.interfaces.security.DemoisellePrincipal;
@@ -14,12 +14,9 @@ import java.io.Serializable;
 import java.util.logging.Logger;
 import javax.inject.Inject;
 import static javax.interceptor.Interceptor.Priority.APPLICATION;
-import javax.ws.rs.core.Response;
 import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
 import org.demoiselle.jee.core.annotation.Name;
 import org.demoiselle.jee.core.interfaces.security.DemoisellePrincipal;
-import org.demoiselle.jee.core.util.ResourceBundle;
-import org.demoiselle.jee.core.util.Strings;
 import org.demoiselle.jee.security.annotation.RequiredPermission;
 import org.demoiselle.jee.core.interfaces.security.SecurityContext;
 import static org.demoiselle.jee.core.util.Strings.isEmpty;
@@ -63,6 +63,7 @@
 	</developers>
+
 	<modules>
 		<module>demoiselle-parent-bom</module>
 		<module>demoiselle-parent</module>
@@ -75,7 +76,6 @@
 		<module>demoiselle-security-token</module>
 		<module>demoiselle-security-basic</module>
 		<module>demoiselle-security-jwt</module>
-		<!--<module>demoiselle-security-jwt</module> -->
 	</modules>
 	<properties>
@@ -148,7 +148,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						 <version>2.8.2</version>
+						<version>2.8.2</version>
 						<configuration>
 							<skip>true</skip>
 						</configuration>
@@ -234,5 +234,5 @@
 			</releases>
 		</repository>
 	</repositories>
-
 </project>
+