entaxy/entaxy-public
14
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ENTAXY-374 release 1.8.2

Browse Source
This commit is contained in:
Сергей Крючков
2022-08-23 13:40:11 +03:00
parent b68642f81c
commit 1061b96c7e
616 changed files with 60896 additions and 3202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/auth/basic-auth/basic-auth-api/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.auth.basic</groupId>
<artifactId>basic-auth</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<groupId>ru.entaxy.esb.system.auth.basic.api</groupId>

2
system/auth/basic-auth/basic-auth-impl/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.auth.basic</groupId>
<artifactId>basic-auth</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<groupId>ru.entaxy.esb.system.auth.basic.impl</groupId>

12
system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/impl/BasicAuthServiceImpl.java
View File

@ -44,7 +44,7 @@ public class BasicAuthServiceImpl implements BasicAuthService {
private static final Logger LOG = LoggerFactory.getLogger(BasicAuthServiceImpl.class);
private SessionFactory sessionFactory;
private String еncryptionAlgorithm;
private String encryptionAlgorithm;
private String encryptionSalt;
private PermissionService permissionService;
@ -56,8 +56,8 @@ public class BasicAuthServiceImpl implements BasicAuthService {
return sessionFactory.openSession();
}
public void setЕncryptionAlgorithm(String еncryptionAlgorithm) {
this.еncryptionAlgorithm = еncryptionAlgorithm;
public void setEncryptionAlgorithm(String encryptionAlgorithm) {
this.encryptionAlgorithm = encryptionAlgorithm;
}
public void setEncryptionSalt(String encryptionSalt) {
@ -208,11 +208,11 @@ public class BasicAuthServiceImpl implements BasicAuthService {
public BasicAuthAccount saveCommon(String login, String passwordHash, String systemUUID, String createdBy, String editedBy)
throws NoSuchAlgorithmException, BadPasswordException {
if (null != passwordHash && !passwordHash.isEmpty()) {
passwordHash = EncryptionHelper.encrypt(passwordHash, this.еncryptionAlgorithm, this.encryptionSalt);
passwordHash = EncryptionHelper.encrypt(passwordHash, this.encryptionAlgorithm, this.encryptionSalt);
} else {
throw new BadPasswordException("Password not passed or empty!");
}
return saveFull(login, passwordHash, this.еncryptionAlgorithm, systemUUID, "", "", createdBy, editedBy);
return saveFull(login, passwordHash, this.encryptionAlgorithm, systemUUID, "", "", createdBy, editedBy);
}
@Override
@ -253,7 +253,7 @@ public class BasicAuthServiceImpl implements BasicAuthService {
return true;
}
} catch (NoSuchAlgorithmException e) {
LOG.error("Encription algorithm error", e);
LOG.error("Encryption algorithm error", e);
}
}
}

10
system/auth/basic-auth/basic-auth-impl/src/main/resources/OSGI-INF/blueprint/camel-context.xml
View File

@ -26,8 +26,8 @@
<cm:property-placeholder persistent-id="ru.entaxy.esb.system.basic_auth" update-strategy="reload">
<cm:default-properties>
<cm:property name="еncryption.algorithm" value="SHA-1"/>
<cm:property name="еncryption.salt" value="kDfq0qZJ"/>
<cm:property name="encryption.algorithm" value="SHA-1"/>
<cm:property name="encryption.salt" value="kDfq0qZJ"/>
<cm:property name="internal.authentication.enabled" value="false"/>
</cm:default-properties>
</cm:property-placeholder>
@ -44,8 +44,8 @@
<service ref="basicAuthService" interface="ru.entaxy.esb.system.auth.basic.jpa.api.BasicAuthService"/>
<bean id="basicAuthService" class="ru.entaxy.esb.system.auth.basic.jpa.impl.BasicAuthServiceImpl">
<property name="sessionFactory" ref="sessionFactory"/>
<property name="еncryptionAlgorithm" value="${еncryption.algorithm}"/>
<property name="encryptionSalt" value="${еncryption.salt}"/>
<property name="encryptionAlgorithm" value="${encryption.algorithm}"/>
<property name="encryptionSalt" value="${encryption.salt}"/>
<property name="permissionService" ref="permissionService"/>
</bean>
@ -59,7 +59,7 @@
<bean id="basicAuthPostEventListener"
class="ru.entaxy.esb.system.auth.basic.jpa.listener.BasicAuthPostEventListener">
<property name="basicAuthService" ref="basicAuthService"/>
<property name="encryptionSalt" value="${еncryption.salt}"/>
<property name="encryptionSalt" value="${encryption.salt}"/>
<property name="htpasswdGenerator" ref="htpasswdGenerator"/>
</bean>
<bean id="baseAuthPostDeleteEventListener"

2
system/auth/basic-auth/basic-auth-soap/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>basic-auth</artifactId>
<groupId>ru.entaxy.esb.system.auth.basic</groupId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
system/auth/basic-auth/htpasswd/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.auth.basic</groupId>
<artifactId>basic-auth</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<groupId>ru.entaxy.esb.system.auth.basic.htpasswd</groupId>

2
system/auth/basic-auth/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>ru.entaxy.esb.system.auth</groupId>
<artifactId>system-auth</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<groupId>ru.entaxy.esb.system.auth.basic</groupId>

2
system/auth/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>ru.entaxy.esb.system</groupId>
<artifactId>system-parent</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<groupId>ru.entaxy.esb.system.auth</groupId>