autonomic-cooperative/keycloak-group-by-domain
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid NPE

Browse Source
This commit is contained in:
Cédric Couralet 2020-11-06 10:00:23 +01:00
parent d06cc3bc62
commit 35fb0190c3
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -5,12 +5,12 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>net.micedre.keycloak</groupId> <groupId>net.micedre.keycloak</groupId>
<artifactId>keycloak-registration-mail-restrict</artifactId> <artifactId>keycloak-registration-mail-restrict</artifactId>
<version>1.1-SNAPSHOT</version> <version>1.2-SNAPSHOT</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<keycloak.version>4.5.0.Final</keycloak.version> <keycloak.version>9.0.3</keycloak.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>

9
src/main/java/net/micedre/keycloak/registration/RegistrationProfileWithMailDomainCheck.java
View File

@ -71,6 +71,14 @@ public class RegistrationProfileWithMailDomainCheck extends RegistrationProfile
AuthenticatorConfigModel mailDomainConfig = context.getAuthenticatorConfig(); AuthenticatorConfigModel mailDomainConfig = context.getAuthenticatorConfig();
String eventError = Errors.INVALID_REGISTRATION; String eventError = Errors.INVALID_REGISTRATION;
if(email == null){
context.getEvent().detail(Details.EMAIL, email);
errors.add(new FormMessage(RegistrationPage.FIELD_EMAIL, Messages.INVALID_EMAIL));
context.error(eventError);
context.validationError(formData, errors);
return;
}
String[] domains = mailDomainConfig.getConfig().getOrDefault("validDomains","exemple.org").split("##"); String[] domains = mailDomainConfig.getConfig().getOrDefault("validDomains","exemple.org").split("##");
for (String domain : domains) { for (String domain : domains) {
if (email.endsWith(domain)) { if (email.endsWith(domain)) {
@ -79,7 +87,6 @@ public class RegistrationProfileWithMailDomainCheck extends RegistrationProfile
} }
} }
if (!emailDomainValid) { if (!emailDomainValid) {
System.out.println("here");
context.getEvent().detail(Details.EMAIL, email); context.getEvent().detail(Details.EMAIL, email);
errors.add(new FormMessage(RegistrationPage.FIELD_EMAIL, Messages.INVALID_EMAIL)); errors.add(new FormMessage(RegistrationPage.FIELD_EMAIL, Messages.INVALID_EMAIL));
} }