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

feat(jans-auth-server): stat RDN must have date to be unique under RDBMS #8825 #8826

Merged
merged 2 commits into from
Jul 1, 2024
Merged

feat(jans-auth-server): stat RDN must have date to be unique under RDBMS #8825 #8826

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1910e55
feat(jans-auth-server): stat RDN must have date to be unique under RD…
yuriyz Jul 1, 2024
e8a0c5e
Merge branch 'main' into jans-auth-server-8825
yuriyz Jul 1, 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
65 changes: 33 additions & 32 deletions jans-auth-server/server/src/main/java/io/jans/as/server/service/stat/StatService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,17 @@
import io.jans.orm.PersistenceEntryManager;
import io.jans.orm.exception.EntryPersistenceException;
import io.jans.orm.model.base.SimpleBranch;
import net.agkn.hll.HLL;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;

import jakarta.annotation.PostConstruct;
import jakarta.ejb.DependsOn;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import net.agkn.hll.HLL;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;

import java.text.SimpleDateFormat;
import java.util.Base64;
import java.util.Date;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;

Expand Down Expand Up @@ -79,7 +75,9 @@ public boolean init() {
return false;
}
log.info("Initializing Stat Service");
initNodeId();

final Date now = new Date();
initNodeId(now);
if (StringUtils.isBlank(nodeId)) {
log.error("Failed to initialize stat service. statNodeId is not set in configuration.");
return false;
Expand All @@ -89,7 +87,6 @@ public boolean init() {
return false;
}

final Date now = new Date();
prepareMonthlyBranch(now);

log.trace("Monthly branch created: {}", monthlyDn);
Expand Down Expand Up @@ -133,7 +130,9 @@ private void setupCurrentEntry() {
}

private void setupCurrentEntry(Date now) {
final String month = periodDateFormat.format(now);
final String month = monthString(now);
initNodeId(now);

String dn = String.format("jansId=%s,%s", nodeId, monthlyDn); // jansId=<id>,ou=yyyyMM,ou=stat,o=gluu

if (currentEntry != null && month.equals(currentEntry.getStat().getMonth())) {
Expand All @@ -148,7 +147,7 @@ private void setupCurrentEntry(Date now) {
currentEntry = entryFromPersistence;
log.trace("Stat entry loaded.");

if (currentEntry != null && StringUtils.isBlank(currentEntry.getMonth()) && currentEntry.getStat() != null) {
if (StringUtils.isBlank(currentEntry.getMonth()) && currentEntry.getStat() != null) {
currentEntry.setMonth(currentEntry.getStat().getMonth());
}
return;
Expand All @@ -157,43 +156,41 @@ private void setupCurrentEntry(Date now) {
log.trace("Stat entry is not found in persistence.");
}

if (currentEntry == null) {
log.trace("Creating stat entry ...");
hll = newHll();
tokenCounters = new ConcurrentHashMap<>();
final String monthString = periodDateFormat.format(new Date());
log.trace("Creating stat entry ...");
hll = newHll();
tokenCounters = new ConcurrentHashMap<>();
final String monthString = periodDateFormat.format(new Date());

currentEntry = new StatEntry();
currentEntry.setId(nodeId);
currentEntry.setDn(dn);
currentEntry.setUserHllData(Base64.getEncoder().encodeToString(hll.toBytes()));
currentEntry = new StatEntry();
currentEntry.setId(nodeId);
currentEntry.setDn(dn);
currentEntry.setUserHllData(Base64.getEncoder().encodeToString(hll.toBytes()));

currentEntry.getStat().setMonth(monthString);
currentEntry.setMonth(monthString);
entryManager.persist(currentEntry);
log.trace("Created stat entry.");
}
currentEntry.getStat().setMonth(monthString);
currentEntry.setMonth(monthString);
entryManager.persist(currentEntry);
log.trace("Created stat entry.");
}

public HLL newHll() {
return new HLL(LOG_2_M, REGWIDTH);
}

private void initNodeId() {
private void initNodeId(Date now) {
if (StringUtils.isNotBlank(nodeId)) {
return;
}

try {
nodeId = InetAddressUtility.getMACAddressOrNull();
nodeId = InetAddressUtility.getMACAddressOrNull() + "_" + monthString(now);
if (StringUtils.isNotBlank(nodeId)) {
return;
}

nodeId = UUID.randomUUID().toString();
nodeId = UUID.randomUUID().toString() + "_" + monthString(now);
} catch (Exception e) {
log.error("Failed to identify nodeId.", e);
nodeId = UUID.randomUUID().toString();
nodeId = UUID.randomUUID().toString() + "_" + monthString(now);
}
}

Expand All @@ -205,9 +202,13 @@ public String getBaseDn() {
return staticConfiguration.getBaseDn().getStat();
}

public String monthString(Date now) {
return periodDateFormat.format(now); // yyyyMM
}

private void prepareMonthlyBranch(Date now) {
final String baseDn = getBaseDn();
final String month = periodDateFormat.format(now); // yyyyMM
final String month = monthString(now); // yyyyMM
monthlyDn = String.format("ou=%s,%s", month, baseDn); // ou=yyyyMM,ou=stat,o=gluu

if (!entryManager.hasBranchesSupport(baseDn)) {
Expand Down