From 3c0a99d24856ebb58a360b243ecbe3a675672e50 Mon Sep 17 00:00:00 2001 From: Alex Bogdanovski Date: Fri, 24 May 2024 12:41:41 +0300 Subject: [PATCH] minor fix - approved domains should not be case sensitive --- src/main/java/com/erudika/scoold/utils/ScooldUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/erudika/scoold/utils/ScooldUtils.java b/src/main/java/com/erudika/scoold/utils/ScooldUtils.java index 8f2a281a..36205d40 100755 --- a/src/main/java/com/erudika/scoold/utils/ScooldUtils.java +++ b/src/main/java/com/erudika/scoold/utils/ScooldUtils.java @@ -215,7 +215,7 @@ public static ScooldConfig getConfig() { // multiple domains/admins are allowed only in Scoold PRO String approvedDomain = StringUtils.substringBefore(CONF.approvedDomainsForSignups(), ","); if (!StringUtils.isBlank(approvedDomain)) { - APPROVED_DOMAINS.add(approvedDomain); + APPROVED_DOMAINS.add(approvedDomain.toLowerCase()); } // multiple admins are allowed only in Scoold PRO String admin = StringUtils.substringBefore(CONF.admins(), ","); @@ -524,7 +524,7 @@ public boolean isEmailDomainApproved(String email) { if (StringUtils.isBlank(email)) { return false; } - if (!APPROVED_DOMAINS.isEmpty() && !APPROVED_DOMAINS.contains(StringUtils.substringAfter(email, "@"))) { + if (!APPROVED_DOMAINS.isEmpty() && !APPROVED_DOMAINS.contains(StringUtils.substringAfter(email, "@").toLowerCase())) { logger.warn("Attempted signin from an unknown domain - email {} is part of an unapproved domain.", email); return false; }