support globs + a little security
security: prevent fooexemple.org from passing (just by prepending an @ to the pattern)
This commit is contained in:
parent
2341a208f1
commit
41bee73d5c
@ -55,6 +55,38 @@ public class RegistrationProfileWithMailDomainCheck extends RegistrationProfile
|
||||
CONFIG_PROPERTIES.add(property);
|
||||
}
|
||||
|
||||
private static final boolean globmatches(String text, String glob) {
|
||||
if (text.length() > 200) {
|
||||
return false;
|
||||
}
|
||||
String rest = null;
|
||||
int pos = glob.indexOf('*');
|
||||
if (pos != -1) {
|
||||
rest = glob.substring(pos + 1);
|
||||
glob = glob.substring(0, pos);
|
||||
}
|
||||
|
||||
if (glob.length() > text.length())
|
||||
return false;
|
||||
|
||||
// handle the part up to the first *
|
||||
for (int i = 0; i < glob.length(); i++)
|
||||
if (glob.charAt(i) != '?'
|
||||
&& !glob.substring(i, i + 1).equalsIgnoreCase(text.substring(i, i + 1)))
|
||||
return false;
|
||||
|
||||
// recurse for the part after the first *, if any
|
||||
if (rest == null) {
|
||||
return glob.length() == text.length();
|
||||
} else {
|
||||
for (int i = glob.length(); i <= text.length(); i++) {
|
||||
if (globmatches(text.substring(i), rest))
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ProviderConfigProperty> getConfigProperties() {
|
||||
return CONFIG_PROPERTIES;
|
||||
@ -81,7 +113,10 @@ public class RegistrationProfileWithMailDomainCheck extends RegistrationProfile
|
||||
|
||||
String[] domains = mailDomainConfig.getConfig().getOrDefault("validDomains","exemple.org").split("##");
|
||||
for (String domain : domains) {
|
||||
if (email.endsWith(domain)) {
|
||||
if (email.endsWith("@" + domain)) {
|
||||
emailDomainValid = true;
|
||||
break;
|
||||
} else if (globmatches(email, "*@" + domain)) {
|
||||
emailDomainValid = true;
|
||||
break;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user