issue smclab#31: decode escaped HTML in URL

mrk-vi · Mar 11, 2021 · 7242bdc · 7242bdc
1 parent 0c95457
commit 7242bdc
Showing 1 changed file with 26 additions and 3 deletions.
diff --git a/...aldav-sync/caldav-sync-web/src/main/java/it/smc/calendar/caldav/sync/util/CalDAVUtil.java b/...aldav-sync/caldav-sync-web/src/main/java/it/smc/calendar/caldav/sync/util/CalDAVUtil.java
@@ -46,6 +46,9 @@
 import it.smc.calendar.caldav.helper.api.UserAgentHelperUtil;
 import it.smc.calendar.caldav.util.CalendarUtil;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -179,15 +182,35 @@ public static String getCalendarURL(Calendar calendar) {
 	}
 
 	public static String getICSNameFromURL(String URL) {
-		if (!URL.endsWith(CalendarDataFormat.ICAL.getValue())) {
+		if (!URL.endsWith(
+			StringPool.PERIOD + CalendarDataFormat.ICAL.getValue())) {
+
 			return null;
 		}
 
 		String calendarBookingICSStr = StringUtil.extractLast(
 			URL, StringPool.SLASH);
 
-		return StringUtil.extractFirst(
-			calendarBookingICSStr, StringPool.PERIOD);
+		calendarBookingICSStr = calendarBookingICSStr.substring(
+			0 , calendarBookingICSStr.lastIndexOf(StringPool.PERIOD));
+
+		String decoded =  calendarBookingICSStr;
+
+		try {
+			decoded = URLDecoder.decode(calendarBookingICSStr,
+				StandardCharsets.UTF_8.displayName());
+
+			while (!decoded.equals(calendarBookingICSStr)) {
+				calendarBookingICSStr = decoded;
+				decoded = URLDecoder.decode(calendarBookingICSStr,
+					StandardCharsets.UTF_8.displayName());
+			}
+		}
+		catch (UnsupportedEncodingException uee) {
+			_log.warn("Can not decode the url: " + decoded);
+		}
+
+		return calendarBookingICSStr;
 	}
 
 	public static String getPrincipalURL(long userId) {