[Minor] removed the use of the authPass in the certificate
This commit is contained in:
parent
bab1e4b119
commit
11f53cb272
|
@ -668,15 +668,14 @@ public class DefaultPrivilegeHandler implements PrivilegeHandler {
|
||||||
}
|
}
|
||||||
|
|
||||||
// get 2 auth tokens
|
// get 2 auth tokens
|
||||||
String authToken = this.encryptionHandler.nextToken();
|
String authToken = this.encryptionHandler.convertToHash(this.encryptionHandler.nextToken());
|
||||||
String authPassword = this.encryptionHandler.nextToken();
|
|
||||||
|
|
||||||
// get next session id
|
// get next session id
|
||||||
String sessionId = nextSessionId();
|
String sessionId = nextSessionId();
|
||||||
|
|
||||||
// create a new certificate, with details of the user
|
// create a new certificate, with details of the user
|
||||||
certificate = new Certificate(sessionId, System.currentTimeMillis(), username, authToken, authPassword,
|
certificate = new Certificate(sessionId, System.currentTimeMillis(), username, authToken, user.getLocale(),
|
||||||
user.getLocale(), new HashMap<String, String>(user.getProperties()));
|
new HashMap<String, String>(user.getProperties()));
|
||||||
|
|
||||||
PrivilegeContext privilegeContext = buildPrivilegeContext(certificate, user);
|
PrivilegeContext privilegeContext = buildPrivilegeContext(certificate, user);
|
||||||
this.privilegeContextMap.put(sessionId, privilegeContext);
|
this.privilegeContextMap.put(sessionId, privilegeContext);
|
||||||
|
@ -1051,14 +1050,13 @@ public class DefaultPrivilegeHandler implements PrivilegeHandler {
|
||||||
|
|
||||||
// get 2 auth tokens
|
// get 2 auth tokens
|
||||||
String authToken = this.encryptionHandler.nextToken();
|
String authToken = this.encryptionHandler.nextToken();
|
||||||
String authPassword = this.encryptionHandler.nextToken();
|
|
||||||
|
|
||||||
// get next session id
|
// get next session id
|
||||||
String sessionId = nextSessionId();
|
String sessionId = nextSessionId();
|
||||||
|
|
||||||
// create a new certificate, with details of the user
|
// create a new certificate, with details of the user
|
||||||
Certificate systemUserCertificate = new Certificate(sessionId, System.currentTimeMillis(), systemUsername,
|
Certificate systemUserCertificate = new Certificate(sessionId, System.currentTimeMillis(), systemUsername,
|
||||||
authToken, authPassword, user.getLocale(), new HashMap<String, String>(user.getProperties()));
|
authToken, user.getLocale(), new HashMap<String, String>(user.getProperties()));
|
||||||
|
|
||||||
// create and save a new privilege context
|
// create and save a new privilege context
|
||||||
PrivilegeContext privilegeContext = buildPrivilegeContext(systemUserCertificate, user);
|
PrivilegeContext privilegeContext = buildPrivilegeContext(systemUserCertificate, user);
|
||||||
|
|
|
@ -38,7 +38,6 @@ public final class Certificate implements Serializable {
|
||||||
private final long loginTime;
|
private final long loginTime;
|
||||||
private final String username;
|
private final String username;
|
||||||
private final String authToken;
|
private final String authToken;
|
||||||
private final String authPassword;
|
|
||||||
|
|
||||||
private Locale locale;
|
private Locale locale;
|
||||||
|
|
||||||
|
@ -58,17 +57,14 @@ public final class Certificate implements Serializable {
|
||||||
* the users login name
|
* the users login name
|
||||||
* @param authToken
|
* @param authToken
|
||||||
* the authentication token defining the users unique session and is a private field of this certificate.
|
* the authentication token defining the users unique session and is a private field of this certificate.
|
||||||
* @param authPassword
|
|
||||||
* the password to access the authentication token, this is not known to the client but set by the
|
|
||||||
* {@link PrivilegeHandler} on authentication.
|
|
||||||
* @param locale
|
* @param locale
|
||||||
* the users {@link Locale}
|
* the users {@link Locale}
|
||||||
* @param propertyMap
|
* @param propertyMap
|
||||||
* a {@link Map} containing string value pairs of properties for the logged in user. These properties can
|
* a {@link Map} containing string value pairs of properties for the logged in user. These properties can
|
||||||
* be edited and can be used for the user to change settings of this session
|
* be edited and can be used for the user to change settings of this session
|
||||||
*/
|
*/
|
||||||
public Certificate(String sessionId, long loginTime, String username, String authToken, String authPassword,
|
public Certificate(String sessionId, long loginTime, String username, String authToken, Locale locale,
|
||||||
Locale locale, Map<String, String> propertyMap) {
|
Map<String, String> propertyMap) {
|
||||||
|
|
||||||
// validate arguments are not null
|
// validate arguments are not null
|
||||||
if (StringHelper.isEmpty(sessionId)) {
|
if (StringHelper.isEmpty(sessionId)) {
|
||||||
|
@ -80,15 +76,11 @@ public final class Certificate implements Serializable {
|
||||||
if (StringHelper.isEmpty(authToken)) {
|
if (StringHelper.isEmpty(authToken)) {
|
||||||
throw new PrivilegeException("authToken is null!"); //$NON-NLS-1$
|
throw new PrivilegeException("authToken is null!"); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
if (StringHelper.isEmpty(authPassword)) {
|
|
||||||
throw new PrivilegeException("authPassword is null!"); //$NON-NLS-1$
|
|
||||||
}
|
|
||||||
|
|
||||||
this.sessionId = sessionId;
|
this.sessionId = sessionId;
|
||||||
this.loginTime = loginTime;
|
this.loginTime = loginTime;
|
||||||
this.username = username;
|
this.username = username;
|
||||||
this.authToken = authToken;
|
this.authToken = authToken;
|
||||||
this.authPassword = authPassword;
|
|
||||||
|
|
||||||
// if no locale is given, set default
|
// if no locale is given, set default
|
||||||
if (locale == null)
|
if (locale == null)
|
||||||
|
@ -145,16 +137,10 @@ public final class Certificate implements Serializable {
|
||||||
/**
|
/**
|
||||||
* Returns the authToken if the given authPassword is correct, null otherwise
|
* Returns the authToken if the given authPassword is correct, null otherwise
|
||||||
*
|
*
|
||||||
* @param authPassword
|
|
||||||
* the authentication password with which this certificate was created
|
|
||||||
*
|
|
||||||
* @return the authToken if the given authPassword is correct, null otherwise
|
* @return the authToken if the given authPassword is correct, null otherwise
|
||||||
*/
|
*/
|
||||||
public String getAuthToken(String authPassword) {
|
public String getAuthToken() {
|
||||||
if (this.authPassword.equals(authPassword))
|
return this.authToken;
|
||||||
return this.authToken;
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -180,7 +166,6 @@ public final class Certificate implements Serializable {
|
||||||
public int hashCode() {
|
public int hashCode() {
|
||||||
final int prime = 31;
|
final int prime = 31;
|
||||||
int result = 1;
|
int result = 1;
|
||||||
result = prime * result + ((this.authPassword == null) ? 0 : this.authPassword.hashCode());
|
|
||||||
result = prime * result + ((this.authToken == null) ? 0 : this.authToken.hashCode());
|
result = prime * result + ((this.authToken == null) ? 0 : this.authToken.hashCode());
|
||||||
result = prime * result + ((this.locale == null) ? 0 : this.locale.hashCode());
|
result = prime * result + ((this.locale == null) ? 0 : this.locale.hashCode());
|
||||||
result = prime * result + ((this.sessionId == null) ? 0 : this.sessionId.hashCode());
|
result = prime * result + ((this.sessionId == null) ? 0 : this.sessionId.hashCode());
|
||||||
|
@ -197,11 +182,6 @@ public final class Certificate implements Serializable {
|
||||||
if (!(obj instanceof Certificate))
|
if (!(obj instanceof Certificate))
|
||||||
return false;
|
return false;
|
||||||
Certificate other = (Certificate) obj;
|
Certificate other = (Certificate) obj;
|
||||||
if (this.authPassword == null) {
|
|
||||||
if (other.authPassword != null)
|
|
||||||
return false;
|
|
||||||
} else if (!this.authPassword.equals(other.authPassword))
|
|
||||||
return false;
|
|
||||||
if (this.authToken == null) {
|
if (this.authToken == null) {
|
||||||
if (other.authToken != null)
|
if (other.authToken != null)
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in New Issue