[Minor] Code cleanup
This commit is contained in:
parent
56c948a361
commit
3bf912c94b
|
@ -15,8 +15,12 @@
|
||||||
*/
|
*/
|
||||||
package li.strolch.runtime.privilege;
|
package li.strolch.runtime.privilege;
|
||||||
|
|
||||||
|
import static java.lang.Boolean.parseBoolean;
|
||||||
|
import static java.util.concurrent.TimeUnit.NANOSECONDS;
|
||||||
import static li.strolch.privilege.handler.PrivilegeHandler.PARAM_PERSIST_SESSIONS;
|
import static li.strolch.privilege.handler.PrivilegeHandler.PARAM_PERSIST_SESSIONS;
|
||||||
import static li.strolch.privilege.handler.PrivilegeHandler.PARAM_PERSIST_SESSIONS_PATH;
|
import static li.strolch.privilege.handler.PrivilegeHandler.PARAM_PERSIST_SESSIONS_PATH;
|
||||||
|
import static li.strolch.privilege.helper.XmlConstants.XML_PARAM_BASE_PATH;
|
||||||
|
import static li.strolch.runtime.StrolchConstants.StrolchPrivilegeConstants.*;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
|
@ -33,7 +37,6 @@ import li.strolch.persistence.api.StrolchTransaction;
|
||||||
import li.strolch.privilege.base.PrivilegeException;
|
import li.strolch.privilege.base.PrivilegeException;
|
||||||
import li.strolch.privilege.handler.*;
|
import li.strolch.privilege.handler.*;
|
||||||
import li.strolch.privilege.helper.PrivilegeInitializationHelper;
|
import li.strolch.privilege.helper.PrivilegeInitializationHelper;
|
||||||
import li.strolch.privilege.helper.XmlConstants;
|
|
||||||
import li.strolch.privilege.model.Certificate;
|
import li.strolch.privilege.model.Certificate;
|
||||||
import li.strolch.privilege.model.PrivilegeContext;
|
import li.strolch.privilege.model.PrivilegeContext;
|
||||||
import li.strolch.privilege.model.internal.PrivilegeContainerModel;
|
import li.strolch.privilege.model.internal.PrivilegeContainerModel;
|
||||||
|
@ -112,7 +115,7 @@ public class DefaultStrolchPrivilegeHandler extends StrolchComponent implements
|
||||||
RuntimeConfiguration runtimeConfig = configuration.getRuntimeConfiguration();
|
RuntimeConfiguration runtimeConfig = configuration.getRuntimeConfiguration();
|
||||||
|
|
||||||
// set sessions data path
|
// set sessions data path
|
||||||
if (Boolean.valueOf(parameterMap.get(PARAM_PERSIST_SESSIONS))) {
|
if (parseBoolean(parameterMap.get(PARAM_PERSIST_SESSIONS))) {
|
||||||
File dataPath = runtimeConfig.getTempPath();
|
File dataPath = runtimeConfig.getTempPath();
|
||||||
String sessionsPath = new File(dataPath, "sessions.dat").getAbsolutePath();
|
String sessionsPath = new File(dataPath, "sessions.dat").getAbsolutePath();
|
||||||
parameterMap.put(PARAM_PERSIST_SESSIONS_PATH, sessionsPath);
|
parameterMap.put(PARAM_PERSIST_SESSIONS_PATH, sessionsPath);
|
||||||
|
@ -122,7 +125,7 @@ public class DefaultStrolchPrivilegeHandler extends StrolchComponent implements
|
||||||
if (containerModel.getPersistenceHandlerClassName().equals(XmlPersistenceHandler.class.getName())) {
|
if (containerModel.getPersistenceHandlerClassName().equals(XmlPersistenceHandler.class.getName())) {
|
||||||
Map<String, String> xmlParams = containerModel.getPersistenceHandlerParameterMap();
|
Map<String, String> xmlParams = containerModel.getPersistenceHandlerParameterMap();
|
||||||
File configPath = runtimeConfig.getConfigPath();
|
File configPath = runtimeConfig.getConfigPath();
|
||||||
xmlParams.put(XmlConstants.XML_PARAM_BASE_PATH, configPath.getPath());
|
xmlParams.put(XML_PARAM_BASE_PATH, configPath.getPath());
|
||||||
}
|
}
|
||||||
|
|
||||||
return PrivilegeInitializationHelper.initializeFromXml(containerModel);
|
return PrivilegeInitializationHelper.initializeFromXml(containerModel);
|
||||||
|
@ -138,7 +141,7 @@ public class DefaultStrolchPrivilegeHandler extends StrolchComponent implements
|
||||||
public Certificate authenticate(String username, char[] password) {
|
public Certificate authenticate(String username, char[] password) {
|
||||||
assertContainerStarted();
|
assertContainerStarted();
|
||||||
Certificate certificate = this.privilegeHandler.authenticate(username, password);
|
Certificate certificate = this.privilegeHandler.authenticate(username, password);
|
||||||
writeAudit(certificate, StrolchPrivilegeConstants.LOGIN, AccessType.CREATE, username);
|
writeAudit(certificate, LOGIN, AccessType.CREATE, username);
|
||||||
return certificate;
|
return certificate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -146,7 +149,7 @@ public class DefaultStrolchPrivilegeHandler extends StrolchComponent implements
|
||||||
public Certificate authenticate(String username, char[] password, String source) {
|
public Certificate authenticate(String username, char[] password, String source) {
|
||||||
assertContainerStarted();
|
assertContainerStarted();
|
||||||
Certificate certificate = this.privilegeHandler.authenticate(username, password, source);
|
Certificate certificate = this.privilegeHandler.authenticate(username, password, source);
|
||||||
writeAudit(certificate, StrolchPrivilegeConstants.LOGIN, AccessType.CREATE, username);
|
writeAudit(certificate, LOGIN, AccessType.CREATE, username);
|
||||||
return certificate;
|
return certificate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -154,7 +157,7 @@ public class DefaultStrolchPrivilegeHandler extends StrolchComponent implements
|
||||||
public Certificate authenticateSingleSignOn(Object data) {
|
public Certificate authenticateSingleSignOn(Object data) {
|
||||||
assertContainerStarted();
|
assertContainerStarted();
|
||||||
Certificate certificate = this.privilegeHandler.authenticateSingleSignOn(data);
|
Certificate certificate = this.privilegeHandler.authenticateSingleSignOn(data);
|
||||||
writeAudit(certificate, StrolchPrivilegeConstants.LOGIN, AccessType.CREATE, certificate.getUsername());
|
writeAudit(certificate, LOGIN, AccessType.CREATE, certificate.getUsername());
|
||||||
return certificate;
|
return certificate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -162,18 +165,15 @@ public class DefaultStrolchPrivilegeHandler extends StrolchComponent implements
|
||||||
public Certificate authenticateSingleSignOn(Object data, String source) {
|
public Certificate authenticateSingleSignOn(Object data, String source) {
|
||||||
assertContainerStarted();
|
assertContainerStarted();
|
||||||
Certificate certificate = this.privilegeHandler.authenticateSingleSignOn(data, source);
|
Certificate certificate = this.privilegeHandler.authenticateSingleSignOn(data, source);
|
||||||
writeAudit(certificate, StrolchPrivilegeConstants.LOGIN, AccessType.CREATE, certificate.getUsername());
|
writeAudit(certificate, LOGIN, AccessType.CREATE, certificate.getUsername());
|
||||||
return certificate;
|
return certificate;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void writeAudit(Certificate certificate, String login, AccessType accessType, String username) {
|
private void writeAudit(Certificate certificate, String login, AccessType accessType, String username) {
|
||||||
StrolchRealm realm = getContainer().getRealm(certificate);
|
StrolchRealm realm = getContainer().getRealm(certificate);
|
||||||
try (StrolchTransaction tx = realm.openTx(certificate, login, false)) {
|
try (StrolchTransaction tx = realm.openTx(certificate, login, false).silentThreshold(1, NANOSECONDS)) {
|
||||||
tx.setSuppressDoNothingLogging(true);
|
|
||||||
tx.setSuppressAudits(true);
|
tx.setSuppressAudits(true);
|
||||||
Audit audit = tx
|
Audit audit = tx.auditFrom(accessType, PRIVILEGE, CERTIFICATE, username);
|
||||||
.auditFrom(accessType, StrolchPrivilegeConstants.PRIVILEGE, StrolchPrivilegeConstants.CERTIFICATE,
|
|
||||||
username);
|
|
||||||
tx.getAuditTrail().add(tx, audit);
|
tx.getAuditTrail().add(tx, audit);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue