Skip to content

Commit

Permalink
add logs to rbac
Browse files Browse the repository at this point in the history
  • Loading branch information
notshivansh committed Dec 20, 2024
1 parent 206b831 commit 821d2fe
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
9 changes: 9 additions & 0 deletions libs/dao/src/main/java/com/akto/dao/RBACDao.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import com.akto.util.Pair;
import com.mongodb.client.model.Projections;
import org.bson.conversions.Bson;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.akto.dao.context.Context;
import com.akto.dto.RBAC;
Expand All @@ -21,6 +23,8 @@
public class RBACDao extends CommonContextDao<RBAC> {
public static final RBACDao instance = new RBACDao();

private static final Logger logger = LoggerFactory.getLogger(RBACDao.class);

//Caching for RBACDAO
private static final ConcurrentHashMap<Pair<Integer, Integer>, Pair<Role, Integer>> userRolesMap = new ConcurrentHashMap<>();
private static final int EXPIRY_TIME = 15 * 60; // 15 minute
Expand Down Expand Up @@ -96,17 +100,22 @@ public List<Integer> getUserCollectionsById(int userId, int accountId) {
Projections.include(RBAC.API_COLLECTIONS_ID, RBAC.ROLE));

if (rbac == null) {
logger.info(String.format("Rbac not found userId: %d accountId: %d", userId, accountId));
return new ArrayList<>();
}

if (RBAC.Role.ADMIN.equals(rbac.getRole())) {
logger.info(String.format("Rbac is admin userId: %d accountId: %d", userId, accountId));
return null;
}

if (rbac.getApiCollectionsId() == null) {
logger.info(String.format("Rbac collections not found userId: %d accountId: %d", userId, accountId));
return new ArrayList<>();
}

logger.info(String.format("Rbac found userId: %d accountId: %d", userId, accountId));

return rbac.getApiCollectionsId();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,15 @@
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class UsersCollectionsList {
private static final ConcurrentHashMap<Pair<Integer, Integer>, Pair<List<Integer>, Integer>> usersCollectionMap = new ConcurrentHashMap<>();
private static final int EXPIRY_TIME = 15 * 60;

private static final Logger logger = LoggerFactory.getLogger(UsersCollectionsList.class);

public static void deleteCollectionIdsFromCache(int userId, int accountId) {
Pair<Integer, Integer> key = new Pair<>(userId, accountId);
usersCollectionMap.remove(key);
Expand Down Expand Up @@ -44,13 +49,15 @@ public static List<Integer> getCollectionsIdForUser(int userId, int accountId) {
if (organization == null ||
organization.getFeatureWiseAllowed() == null ||
organization.getFeatureWiseAllowed().isEmpty()) {
logger.info("UsersCollectionsList org details not available");
collectionList = null;
// feature accessible
} else if (organization != null &&
organization.getFeatureWiseAllowed() != null &&
!organization.getFeatureWiseAllowed().isEmpty() &&
organization.getFeatureWiseAllowed().containsKey(RBAC_FEATURE) &&
organization.getFeatureWiseAllowed().get(RBAC_FEATURE).getIsGranted()) {
logger.info("UsersCollectionsList rbac feature found");
collectionList = RBACDao.instance.getUserCollectionsById(userId, accountId);
// feature not accessible
} else {
Expand Down

0 comments on commit 821d2fe

Please sign in to comment.