fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'fixes bug#AL-3200' (!103) from AL-3200 into master 

Reviewed-on: adm/ModelWeb#103
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master
Gleison da Cruz 2023-10-20 19:42:06 +00:00
parent 323be0c2cf 8e3d100e43
commit 2edbe5c8d7
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId>
<version>1.17.0</version>
<version>1.17.1</version>
<distributionManagement>
<repository>

28
src/com/rjconsultores/ventaboletos/service/impl/UsuarioServiceImpl.java
View File

@ -25,6 +25,7 @@ import com.rjconsultores.ventaboletos.entidad.Perfil;
import com.rjconsultores.ventaboletos.entidad.Usuario;
import com.rjconsultores.ventaboletos.entidad.UsuarioPerfil;
import com.rjconsultores.ventaboletos.exception.BusinessException;
import com.rjconsultores.ventaboletos.service.ConstanteService;
import com.rjconsultores.ventaboletos.service.LogAuditoriaService;
import com.rjconsultores.ventaboletos.service.UsuarioService;
import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties;
@ -32,6 +33,7 @@ import com.rjconsultores.ventaboletos.utilerias.CustomEnum;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
import com.rjconsultores.ventaboletos.utilerias.seguridad.ContrasenaUtileria;
import com.rjconsultores.ventaboletos.vo.embarcada.UsuarioEmbarcadaVO;
import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext;
/**
*
@ -98,8 +100,17 @@ public class UsuarioServiceImpl implements UsuarioService, UserDetailsService {
if (senha != null) {
// validaciOn complejidad contrasena
if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.CONTRASENA_VALIDA_COMPLEJIDAD.getDescricao())) {
ContrasenaUtileria contrasenaUtileria = new ContrasenaUtileria();
contrasenaUtileria.validarContrasenaCompleja(senha);
ConstanteService constanteService = (ConstanteService) AppContext.getApplicationContext().getBean("constanteService");
boolean CONSTANTE_CANT_MIN_CARACTER_OITO = constanteService.buscarPorNomeConstante("CONSTANTE_CANT_MIN_CARACTER_OITO").getValorconstante() != null ? Boolean.parseBoolean(constanteService.buscarPorNomeConstante("CONSTANTE_CANT_MIN_CARACTER_OITO").getValorconstante()) : false;
if(CONSTANTE_CANT_MIN_CARACTER_OITO) {
ContrasenaUtileria contrasenaUtileria = new ContrasenaUtileria(8);
contrasenaUtileria.validarContrasenaCompleja(senha);
} else {
ContrasenaUtileria contrasenaUtileria = new ContrasenaUtileria();
contrasenaUtileria.validarContrasenaCompleja(senha);
}
}
// encriptacion contrasena
@ -169,8 +180,17 @@ public class UsuarioServiceImpl implements UsuarioService, UserDetailsService {
if (senha != null) {
// validaciOn complejidad contrasena
if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.CONTRASENA_VALIDA_COMPLEJIDAD.getDescricao())) {
ContrasenaUtileria contrasenaUtileria = new ContrasenaUtileria();
contrasenaUtileria.validarContrasenaCompleja(senha);
ConstanteService constanteService = (ConstanteService) AppContext.getApplicationContext().getBean("constanteService");
boolean CONSTANTE_CANT_MIN_CARACTER_OITO = constanteService.buscarPorNomeConstante("CONSTANTE_CANT_MIN_CARACTER_OITO").getValorconstante() != null ? Boolean.parseBoolean(constanteService.buscarPorNomeConstante("CONSTANTE_CANT_MIN_CARACTER_OITO").getValorconstante()) : false;
if(CONSTANTE_CANT_MIN_CARACTER_OITO) {
ContrasenaUtileria contrasenaUtileria = new ContrasenaUtileria(8);
contrasenaUtileria.validarContrasenaCompleja(senha);
} else {
ContrasenaUtileria contrasenaUtileria = new ContrasenaUtileria();
contrasenaUtileria.validarContrasenaCompleja(senha);
}
}
// encriptacion contrasena

5
src/com/rjconsultores/ventaboletos/utilerias/seguridad/ContrasenaUtileria.java
View File

@ -20,6 +20,11 @@ public class ContrasenaUtileria {
this.cargarPattern();
}
public ContrasenaUtileria(int cantMinCaracteres){
CANT_MIN_CARACTER = cantMinCaracteres;
this.cargarPattern();
}
private void cargarPattern(){
patternHayNumero = Pattern.compile(String.format(".*[0-9]{%s,}+.*",CANT_MIN_NUMERO));
patternHayLetra = Pattern.compile(String.format(".*[a-zA-Z]{%s,}+.*",CANT_MIN_LETRA));