Skip to content

Allow support for multiple cross domains #3302

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow support for multiple cross domains #3302

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 28 additions & 12 deletions apps/dashboard/src/main/java/com/akto/action/InviteUserAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,31 @@ public class InviteUserAction extends UserAction{
public static final String NOT_ALLOWED_TO_INVITE = "you're not authorised to invite for this role";
public static final String AKTO_DOMAIN = "akto.io";

public static Map<String, String> commonOrganisationsMap = new HashMap<>();
// Map domain to set of all related domains in the organization
public static Map<String, Set<String>> commonOrganisationsMap = new HashMap<>();
private static final ExecutorService executor = Executors.newFixedThreadPool(1);

private static final Pattern EMAIL_PATTERN = Pattern.compile("^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}$");

static {
commonOrganisationsMap.put("blinkhealth.com", "blinkhealth.com");
commonOrganisationsMap.put("blinkrx.com", "blinkhealth.com");
commonOrganisationsMap.put("hollywoodbets.net ", "betsoftware.com ");
commonOrganisationsMap.put("betsoftware.com ", "hollywoodbets.net ");
// Blink Health organization
Set<String> blinkHealthDomains = new HashSet<>(Arrays.asList(
"blinkhealth.com",
"blinkrx.com"
));
for (String domain : blinkHealthDomains) {
commonOrganisationsMap.put(domain, blinkHealthDomains);
}

// Hollywood Bets organization
Set<String> hollywoodBetsDomains = new HashSet<>(Arrays.asList(
"hollywoodbets.net",
"betsoftware.com",
"betsolutions.net"
));
for (String domain : hollywoodBetsDomains) {
commonOrganisationsMap.put(domain, hollywoodBetsDomains);
}
}

public static String validateEmail(String email, String adminLogin) {
Expand Down Expand Up @@ -93,16 +108,17 @@ private static boolean isSameDomain(String inviteeDomain, String adminDomain) {

if (("consulting-for."+adminDomain).equals(inviteeDomain)) return true;

String inviteeOrg = commonOrganisationsMap.get(inviteeDomain);
String adminOrg = commonOrganisationsMap.get(adminDomain);
Set<String> inviteeOrgDomains = commonOrganisationsMap.get(inviteeDomain);
Set<String> adminOrgDomains = commonOrganisationsMap.get(adminDomain);

loggerMaker.debugAndAddToDb("inviteeOrg: " + inviteeOrg);
loggerMaker.debugAndAddToDb("adminOrg: " + adminOrg);
if (inviteeOrg == null || adminOrg == null) return false;
loggerMaker.debugAndAddToDb("inviteeOrgDomains: " + inviteeOrgDomains);
loggerMaker.debugAndAddToDb("adminOrgDomains: " + adminOrgDomains);
if (inviteeOrgDomains == null || adminOrgDomains == null) return false;

if (inviteeOrg.equalsIgnoreCase(adminOrg)) return true;
// Check if both domains belong to the same organization by verifying mutual membership
if (adminOrgDomains.contains(inviteeDomain)) return true;

loggerMaker.debugAndAddToDb("inviteeOrg and adminOrg different");
loggerMaker.debugAndAddToDb("inviteeOrgDomains and adminOrgDomains different");
return false;
}

Expand Down
Loading