Segurança e ajustes nos pacotes

PauloGladson
1 parent b20dad3a
Showing 4 changed files with 8 additions and 13 deletions Show diff stats
demoiselle-security-jwt/src/main/java/org/demoiselle/jee/security/jwt/impl/TokensManagerImpl.java
demoiselle-security-token/src/main/java/org/demoiselle/jee/security/token/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
@@ -29,7 +29,7 @@ import org.jose4j.lang.JoseException;
  *
  * @author 70744416353
  */
-@Dependent
+@RequestScoped
 public class TokensManagerImpl implements TokensManager {
     @Inject
@@ -49,9 +49,6 @@ public class TokensManagerImpl implements TokensManager {
     public TokensManagerImpl() throws JoseException {
         if (rsaJsonWebKey == null) {
 //        RsaJsonWebKey chave = RsaJwkGenerator.generateJwk(2048);
-//        logger.info("Se você quiser usar sua app em cluster, coloque o parametro jwt.key no app.properties e reinicie a aplicacao");
-//        logger.log(Level.INFO, "jwt.key={0}", chave);
-//        logger.info("Se você não usar esse parametro, a cada reinicialização será gerada uma nova chave privada, isso inviabiliza o uso em cluster ");
             rsaJsonWebKey = (RsaJsonWebKey) RsaJsonWebKey.Factory.newPublicJwk(RsaJwkGenerator.generateJwk(2048).getKey());
             rsaJsonWebKey.setKeyId("demoiselle-security-jwt");
         }
@@ -78,13 +75,14 @@ public class TokensManagerImpl implements TokensManager {
                 if (!ip.equalsIgnoreCase((String) jwtClaims.getClaimValue("ip"))) {
                     return null;
                 }
+                return loggedUser;
             } catch (InvalidJwtException ex) {
                 loggedUser = null;
                 token.setKey(null);
                 logger.severe(ex.getMessage());
             }
         }
-        return loggedUser;
+        return null;
     }
     @Override
@@ -110,6 +108,7 @@ public class TokensManagerImpl implements TokensManager {
             jws.setKeyIdHeaderValue(rsaJsonWebKey.getKeyId());
             jws.setAlgorithmHeaderValue(AlgorithmIdentifiers.HMAC_SHA512);
             token.setKey(jws.getCompactSerialization());
+            token.setType("JWT");
         } catch (JoseException ex) {
             ex.printStackTrace();
             //  logger.severe(ex.getMessage());
@@ -5,13 +5,10 @@
  */
 package org.demoiselle.jee.security.token.impl;
-import java.util.Iterator;
-import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import javax.enterprise.context.Dependent;
-import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import org.demoiselle.jee.core.interfaces.security.DemoisellePrincipal;
 import org.demoiselle.jee.core.interfaces.security.Token;
@@ -9,6 +9,7 @@ package org.demoiselle.jee.security.impl;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import javax.enterprise.context.Dependent;
 import javax.enterprise.context.RequestScoped;
 import org.demoiselle.jee.core.interfaces.security.DemoisellePrincipal;
@@ -7,14 +7,12 @@
 package org.demoiselle.jee.security.impl;
 import javax.enterprise.context.Dependent;
+import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
-import javax.ws.rs.core.Response;
 import org.demoiselle.jee.core.interfaces.security.DemoisellePrincipal;
 import org.demoiselle.jee.core.interfaces.security.SecurityContext;
 import org.demoiselle.jee.core.interfaces.security.TokensManager;
-import org.demoiselle.jee.security.exception.DemoiselleSecurityException;
-import org.demoiselle.jee.security.message.DemoiselleSecurityMessages;
 /**
  * <p>
@@ -23,7 +21,7 @@ import org.demoiselle.jee.security.message.DemoiselleSecurityMessages;
  *
  * @author SERPRO
  */
-@Dependent
+@RequestScoped
 public class SecurityContextImpl implements SecurityContext {
     private static final long serialVersionUID = 1L;
@@ -63,7 +61,7 @@ public class SecurityContextImpl implements SecurityContext {
      */
     @Override
     public boolean isLoggedIn() {
-        return getUser() != null;
+        return getUser() != null && getUser().getId() != null;
     }
     @Override
	@@ -9,6 +9,7 @@ package org.demoiselle.jee.security.impl;		@@ -9,6 +9,7 @@ package org.demoiselle.jee.security.impl;
9	import java.util.List;	9	import java.util.List;
10	import java.util.Map;	10	import java.util.Map;
11	import java.util.Objects;	11	import java.util.Objects;
		12	+import javax.enterprise.context.Dependent;
12	import javax.enterprise.context.RequestScoped;	13	import javax.enterprise.context.RequestScoped;
13	import org.demoiselle.jee.core.interfaces.security.DemoisellePrincipal;	14	import org.demoiselle.jee.core.interfaces.security.DemoisellePrincipal;
14		15