libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

KEYCLOAK-9837 Not hide exception in email templating - Throws always an Exception

Browse source
This commit is contained in:
Domenico Briganti 2019-12-20 15:01:18 +01:00 committed by Stian Thorgersen
parent 476da4f276
commit f07e08ef28
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
services/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProvider.java
View file

@ -38,6 +38,7 @@ import org.keycloak.email.freemarker.beans.EventBean;
import org.keycloak.email.freemarker.beans.ProfileBean; import org.keycloak.email.freemarker.beans.ProfileBean;
import org.keycloak.events.Event; import org.keycloak.events.Event;
import org.keycloak.events.EventType; import org.keycloak.events.EventType;
import org.keycloak.forms.login.freemarker.model.UrlBean;
import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakUriInfo; import org.keycloak.models.KeycloakUriInfo;
import org.keycloak.models.RealmModel; import org.keycloak.models.RealmModel;
@ -46,7 +47,6 @@ import org.keycloak.sessions.AuthenticationSessionModel;
import org.keycloak.theme.FreeMarkerException; import org.keycloak.theme.FreeMarkerException;
import org.keycloak.theme.FreeMarkerUtil; import org.keycloak.theme.FreeMarkerUtil;
import org.keycloak.theme.Theme; import org.keycloak.theme.Theme;
import org.keycloak.forms.login.freemarker.model.UrlBean;
import org.keycloak.theme.beans.LinkExpirationFormatterMethod; import org.keycloak.theme.beans.LinkExpirationFormatterMethod;
import org.keycloak.theme.beans.MessageFormatterMethod; import org.keycloak.theme.beans.MessageFormatterMethod;
@ -219,7 +219,7 @@ public class FreeMarkerEmailTemplateProvider implements EmailTemplateProvider {
textBody = freeMarker.processTemplate(attributes, textTemplate, theme); textBody = freeMarker.processTemplate(attributes, textTemplate, theme);
} catch (final FreeMarkerException e) { } catch (final FreeMarkerException e) {
textBody = null; textBody = null;
logger.warn("Failed to template plain text email.", e); throw new EmailException("Failed to template plain text email.", e);
} }
String htmlTemplate = String.format("html/%s", template); String htmlTemplate = String.format("html/%s", template);
String htmlBody; String htmlBody;
@ -227,11 +227,7 @@ public class FreeMarkerEmailTemplateProvider implements EmailTemplateProvider {
htmlBody = freeMarker.processTemplate(attributes, htmlTemplate, theme); htmlBody = freeMarker.processTemplate(attributes, htmlTemplate, theme);
} catch (final FreeMarkerException e) { } catch (final FreeMarkerException e) {
htmlBody = null; htmlBody = null;
logger.warn("Failed to template html email.", e); throw new EmailException("Failed to template html email.", e);
}
if (textBody == null && htmlBody == null) {
throw new EmailException("Both plain text and html are empty!");
} }
return new EmailTemplate(subject, textBody, htmlBody); return new EmailTemplate(subject, textBody, htmlBody);