Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: jansCodeChallengeHash should be defiend as Integer #7744

Merged
merged 4 commits into from
Feb 16, 2024
Merged

fix: jansCodeChallengeHash should be defiend as Integer #7744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ba2ada
fix: jansCodeChallengeHash should be defiend as Integer
yurem Feb 15, 2024
fac0488
Merge branch 'main' into issue_7701
yuremm Feb 16, 2024
719ef1c
Merge branch 'main' into issue_7701
yuriyz Feb 16, 2024
060c56a
Merge branch 'main' into issue_7701
moabu Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../server/src/main/java/io/jans/fido2/service/persist/AuthenticationPersistenceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public Fido2AuthenticationEntry buildFido2AuthenticationEntry(Fido2Authenticatio
Fido2AuthenticationEntry authenticationEntity = new Fido2AuthenticationEntry(dn, authenticationData.getId(), now, userInum, authenticationData);
authenticationEntity.setAuthenticationStatus(authenticationData.getStatus());
if (StringUtils.isNotEmpty(challenge)) {
authenticationEntity.setChallengeHash(String.valueOf(challengeGenerator.getChallengeHashCode(challenge)));
authenticationEntity.setChallengeHash(challengeGenerator.getChallengeHashCode(challenge));
}
authenticationEntity.setRpId(authenticationData.getApplicationId());

Expand Down Expand Up @@ -149,7 +149,7 @@ public List<Fido2AuthenticationEntry> findByChallenge(String challenge, boolean
String baseDn = oneStep ? getDnForAuthenticationEntry(null, null) : getBaseDnForFido2AuthenticationEntries(null);

Filter codeChallengFilter = Filter.createEqualityFilter("jansCodeChallenge", challenge);
Filter codeChallengHashCodeFilter = Filter.createEqualityFilter("jansCodeChallengeHash", String.valueOf(challengeGenerator.getChallengeHashCode(challenge)));
Filter codeChallengHashCodeFilter = Filter.createEqualityFilter("jansCodeChallengeHash", challengeGenerator.getChallengeHashCode(challenge));
Filter filter = Filter.createANDFilter(codeChallengFilter, codeChallengHashCodeFilter);

List<Fido2AuthenticationEntry> fido2AuthenticationEntries = persistenceEntryManager.findEntries(baseDn, Fido2AuthenticationEntry.class, filter);
Expand Down
4 changes: 2 additions & 2 deletions ...o2/server/src/main/java/io/jans/fido2/service/persist/RegistrationPersistenceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public Fido2RegistrationEntry buildFido2RegistrationEntry(Fido2RegistrationData
Fido2RegistrationEntry registrationEntry = new Fido2RegistrationEntry(dn, id, now, userInum, registrationData, challenge);
registrationEntry.setRegistrationStatus(registrationData.getStatus());
if (StringUtils.isNotEmpty(challenge)) {
registrationEntry.setChallengeHash(String.valueOf(getChallengeHashCode(challenge)));
registrationEntry.setChallengeHash(getChallengeHashCode(challenge));
}
registrationEntry.setRpId(registrationData.getApplicationId());

Expand Down Expand Up @@ -177,7 +177,7 @@ public List<Fido2RegistrationEntry> findByChallenge(String challenge, boolean on
String baseDn = oneStep ? getDnForRegistrationEntry(null, null) : getBaseDnForFido2RegistrationEntries(null);

Filter codeChallengFilter = Filter.createEqualityFilter("jansCodeChallenge", challenge);
Filter codeChallengHashCodeFilter = Filter.createEqualityFilter("jansCodeChallengeHash", String.valueOf(getChallengeHashCode(challenge)));
Filter codeChallengHashCodeFilter = Filter.createEqualityFilter("jansCodeChallengeHash", getChallengeHashCode(challenge));
Filter filter = Filter.createANDFilter(codeChallengFilter, codeChallengHashCodeFilter);

List<Fido2RegistrationEntry> fido2RegistrationnEntries = persistenceEntryManager.findEntries(baseDn, Fido2RegistrationEntry.class, filter);
Expand Down
6 changes: 3 additions & 3 deletions jans-link/model/src/main/java/io/jans/link/model/Fido2Entry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class Fido2Entry extends BaseEntry implements Serializable {
private String challenge;

@AttributeName(ignoreDuringUpdate = true, name = "jansCodeChallengeHash")
private String challengeHash;
private Integer challengeHash;

@AttributeName(ignoreDuringUpdate = true, name = "creationDate")
private Date creationDate;
Expand Down Expand Up @@ -83,11 +83,11 @@ public void setChallenge(String challenge) {
this.challenge = challenge;
}

public String getChallengeHash() {
public Integer getChallengeHash() {
return challengeHash;
}

public void setChallengeHash(String challengeHash) {
public void setChallengeHash(Integer challengeHash) {
this.challengeHash = challengeHash;
}

Expand Down
6 changes: 3 additions & 3 deletions jans-orm/model/src/main/java/io/jans/orm/model/fido2/Fido2Entry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class Fido2Entry extends BaseEntry {
private String challange;

@AttributeName(name = "jansCodeChallengeHash")
private String challengeHash;
private Integer challengeHash;

@AttributeName(name = "creationDate")
private Date creationDate;
Expand Down Expand Up @@ -122,11 +122,11 @@ public void setSessionStateId(String sessionStateId) {
this.sessionStateId = sessionStateId;
}

public String getChallengeHash() {
public Integer getChallengeHash() {
return challengeHash;
}

public void setChallengeHash(String challengeHash) {
public void setChallengeHash(Integer challengeHash) {
this.challengeHash = challengeHash;
}

Expand Down
6 changes: 3 additions & 3 deletions jans-scim/service/src/main/java/io/jans/scim/model/fido2/Fido2Entry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class Fido2Entry extends BaseEntry implements Serializable {
private String challenge;

@AttributeName(ignoreDuringUpdate = true, name = "jansCodeChallengeHash")
private String challengeHash;
private Integer challengeHash;

@AttributeName(ignoreDuringUpdate = true, name = "creationDate")
private Date creationDate;
Expand Down Expand Up @@ -76,11 +76,11 @@ public void setChallenge(String challenge) {
this.challenge = challenge;
}

public String getChallengeHash() {
public Integer getChallengeHash() {
return challengeHash;
}

public void setChallengeHash(String challengeHash) {
public void setChallengeHash(Integer challengeHash) {
this.challengeHash = challengeHash;
}

Expand Down