libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

[KEYCLOAK-10384] Add equals and hashCode to KeycloakUndertowAccount, SamlPrincipal and SamlSession to avoid cache misses in the PicketBox JAAS auth manager

Browse source
This commit is contained in:
Stefan Guilhen 2019-07-08 00:32:21 -03:00 committed by Hynek Mlnařík
parent 74f6e362af
commit ceaae7a254
3 changed files with 73 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/KeycloakUndertowAccount.java
View file

@ -89,6 +89,26 @@ public class KeycloakUndertowAccount implements Account, Serializable, OidcKeycl
return true;
}
@Override
public boolean equals(Object other) {
if (this == other)
return true;
if (!(other instanceof KeycloakUndertowAccount))
return false;
KeycloakUndertowAccount otherAccount = (KeycloakUndertowAccount) other;
return (this.principal != null ? this.principal.equals(otherAccount.principal) : otherAccount.principal == null) &&
(this.accountRoles != null ? this.accountRoles.equals(otherAccount.accountRoles) : otherAccount.accountRoles == null);
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + (this.principal == null ? 0 : this.principal.hashCode());
result = prime * result + (this.accountRoles == null ? 0 : this.accountRoles.hashCode());
return result;
}
}

28
adapters/saml/core-public/src/main/java/org/keycloak/adapters/saml/SamlPrincipal.java
View file

@ -191,4 +191,32 @@ public class SamlPrincipal implements Serializable, Principal {
}
@Override
public boolean equals(Object other) {
if (this == other)
return true;
if (!(other instanceof SamlPrincipal))
return false;
SamlPrincipal otherPrincipal = (SamlPrincipal) other;
return (this.name != null ? this.name.equals(otherPrincipal.name) : otherPrincipal.name == null) &&
(this.samlSubject != null ? this.samlSubject.equals(otherPrincipal.samlSubject) : otherPrincipal.samlSubject == null) &&
(this.nameIDFormat != null ? this.nameIDFormat.equals(otherPrincipal.nameIDFormat) : otherPrincipal.nameIDFormat == null) &&
(this.attributes != null ? this.attributes.equals(otherPrincipal.attributes) : otherPrincipal.attributes == null) &&
(this.friendlyAttributes != null ? this.friendlyAttributes.equals(otherPrincipal.friendlyAttributes) : otherPrincipal.friendlyAttributes == null);
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + (this.name == null ? 0 : this.name.hashCode());
result = prime * result + (this.samlSubject == null ? 0 : this.samlSubject.hashCode());
result = prime * result + (this.nameIDFormat == null ? 0 : this.nameIDFormat.hashCode());
result = prime * result + (this.attributes == null ? 0 : this.attributes.hashCode());
result = prime * result + (this.friendlyAttributes == null ? 0 : this.friendlyAttributes.hashCode());
return result;
}
}

25
adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlSession.java
View file

@ -51,4 +51,29 @@ public class SamlSession implements Serializable, KeycloakAccount {
public String getSessionIndex() {
return sessionIndex;
}
@Override
public boolean equals(Object other) {
if (this == other)
return true;
if (!(other instanceof SamlSession))
return false;
SamlSession otherSession = (SamlSession) other;
return (this.principal != null ? this.principal.equals(otherSession.principal) : otherSession.principal == null) &&
(this.roles != null ? this.roles.equals(otherSession.roles) : otherSession.roles == null) &&
(this.sessionIndex != null ? this.sessionIndex.equals(otherSession.sessionIndex) : otherSession.sessionIndex == null);
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + (this.principal == null ? 0 : this.principal.hashCode());
result = prime * result + (this.roles == null ? 0 : this.roles.hashCode());
result = prime * result + (this.sessionIndex == null ? 0 : this.sessionIndex.hashCode());
return result;
}
}