From 320652dbf18dfbbdceedd831cc661caa5cf3a6a2 Mon Sep 17 00:00:00 2001 From: milanmajchrak Date: Thu, 25 Apr 2024 12:09:50 +0200 Subject: [PATCH] Revert "Added email validation and input/output encodings are loaded from the cfg." This reverts commit 9d40f009b261d6bea5f69b1458a1652889e0ad64. --- .../clarin/ClarinShibAuthentication.java | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dspace-api/src/main/java/org/dspace/authenticate/clarin/ClarinShibAuthentication.java b/dspace-api/src/main/java/org/dspace/authenticate/clarin/ClarinShibAuthentication.java index f32440755f95..28fd67a71599 100644 --- a/dspace-api/src/main/java/org/dspace/authenticate/clarin/ClarinShibAuthentication.java +++ b/dspace-api/src/main/java/org/dspace/authenticate/clarin/ClarinShibAuthentication.java @@ -578,7 +578,7 @@ protected EPerson findEPerson(Context context, HttpServletRequest request) throw // 2) Second, look for an email header. if (eperson == null && emailHeader != null) { - String email = getEmailAcceptedOrNull(findSingleAttribute(request, emailHeader)); + String email = findSingleAttribute(request, emailHeader); if (StringUtils.isEmpty(email) && Objects.nonNull(clarinVerificationToken)) { email = clarinVerificationToken.getEmail(); } @@ -694,7 +694,7 @@ protected EPerson registerNewEPerson(Context context, HttpServletRequest request // Header values String netid = Util.formatNetId(findSingleAttribute(request, netidHeader), org); - String email = getEmailAcceptedOrNull(findSingleAttribute(request, emailHeader)); + String email = findSingleAttribute(request, emailHeader); String fname = Headers.updateValueByCharset(findSingleAttribute(request, fnameHeader)); String lname = Headers.updateValueByCharset(findSingleAttribute(request, lnameHeader)); @@ -816,7 +816,7 @@ protected void updateEPerson(Context context, HttpServletRequest request, EPerso String lnameHeader = configurationService.getProperty("authentication-shibboleth.lastname-header"); String netid = Util.formatNetId(findSingleAttribute(request, netidHeader), shibheaders.get_idp()); - String email = getEmailAcceptedOrNull(findSingleAttribute(request, emailHeader)); + String email = findSingleAttribute(request, emailHeader); String fname = Headers.updateValueByCharset(findSingleAttribute(request, fnameHeader)); String lname = Headers.updateValueByCharset(findSingleAttribute(request, lnameHeader)); @@ -1171,12 +1171,7 @@ protected String findAttribute(HttpServletRequest request, String name) { if (!StringUtils.isEmpty(value) && reconvertAttributes) { try { - String inputEncoding = configurationService.getProperty("shibboleth.name.conversion.inputEncoding", - "ISO-8859-1"); - String outputEncoding = configurationService.getProperty("shibboleth.name.conversion.outputEncoding", - "UTF-8"); - - value = new String(value.getBytes(inputEncoding), outputEncoding); + value = new String(value.getBytes("ISO-8859-1"), "UTF-8"); } catch (UnsupportedEncodingException ex) { log.warn("Failed to reconvert shibboleth attribute (" + name + ").", ex); @@ -1329,12 +1324,5 @@ public boolean canChangePassword(Context context, EPerson ePerson, String curren public boolean areSpecialGroupsApplicable(Context context, HttpServletRequest request) { return true; } - - public String getEmailAcceptedOrNull(String email) { - if (email == null || email.isEmpty() || email.matches(".*\\s+.*")){ // no whitespaces in mail - return null; - } - return email; - } }