OO-2916: Better exception handling of unavailable cover images, more...

OO-2916: Better exception handling of unavailable cover images, more validations of page from/to, utf-8 of infodoc response

src/main/java/org/olat/course/nodes/edubase/EdubaseBookSectionListController.java

@@ -37,6 +37,7 @@ import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.Event;
 import org.olat.core.gui.control.WindowControl;
 import org.olat.core.gui.control.generic.closablewrapper.CloseableModalController;
+import org.olat.core.logging.AssertException;
 import org.olat.core.util.StringHelper;
 import org.olat.course.nodes.EdubaseCourseNode;
 import org.olat.modules.ModuleConfiguration;
@@ -138,21 +139,23 @@ public class EdubaseBookSectionListController extends FormBasicController {
 					allOk = false;
 				}
 			}
-			allOk &= validateInt(bookSectionWrapper.getPageFromEl());
-			allOk &= validateInt(bookSectionWrapper.getPageToEl());
+			allOk &= validatePositiveInt(bookSectionWrapper.getPageFromEl());
+			allOk &= validatePositiveInt(bookSectionWrapper.getPageToEl());
+			allOk &= validateToHigherFrom(bookSectionWrapper.getPageFromEl(), bookSectionWrapper.getPageToEl());
 		}
 
 		return allOk & super.validateFormLogic(ureq);
 	}
 
-	private boolean validateInt(TextElement el) {
+	private boolean validatePositiveInt(TextElement el) {
 		boolean allOk = true;
 
 		if(el.isVisible()) {
 			String value = el.getValue();
 			if(StringHelper.containsNonWhitespace(value)) {
 				try {
-					Integer.parseInt(value);
+					Integer intValue = Integer.parseInt(value);
+					if (intValue <= 0) throw new AssertException("negativ number");
 				} catch(Exception e) {
 					el.setErrorKey("form.error.wrong.int", null);
 					allOk = false;
@@ -162,6 +165,23 @@ public class EdubaseBookSectionListController extends FormBasicController {
 
 		return allOk;
 	}
+	
+	private boolean validateToHigherFrom(TextElement fromEl, TextElement toEl) {
+		boolean allOk = true;
+		
+		try {
+			Integer from = Integer.parseInt(fromEl.getValue());
+			Integer to = Integer.parseInt(toEl.getValue());
+			if (from > 0 && to > 0 && from > to) {
+				toEl.setErrorKey("form.error.page.to.higher.from", null);
+				allOk = false;
+			}
+		} catch (Exception e) {
+			// validate only if integers
+		}
+		
+		return allOk;
+	}
 
 	@Override
 	protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) {
@@ -443,14 +463,14 @@ public class EdubaseBookSectionListController extends FormBasicController {
 
 		public BookSection getBookSection() {
 			bookSection.setBookId(bookIdEl.getValue());
-			if (StringHelper.containsNonWhitespace(pageFromEl.getValue())) {
+			try {
 				bookSection.setPageFrom(Integer.valueOf(pageFromEl.getValue()));
-			} else {
+			} catch (Exception e) {
 				bookSection.setPageFrom(null);
 			}
-			if (StringHelper.containsNonWhitespace(pageToEl.getValue())) {
+			try {
 				bookSection.setPageTo(Integer.valueOf(pageToEl.getValue()));
-			} else {
+			} catch (Exception e) {
 				bookSection.setPageTo(null);
 			}
 			if (StringHelper.containsNonWhitespace(titleEl.getValue())) {

src/main/java/org/olat/course/nodes/edubase/_content/bookSectionList.html

@@ -20,10 +20,8 @@
 						<div>$r.render(${bookSection.getDownLinkEl().getComponent().getComponentName()})</div>
 					#end
 				</td>
-				<td class="o_edubase_bs_cover" calss="cover${bookSection.getBookIdEl().getValue()}">
-					<object data="$!{bookSection.getCoverUrl()}">
-  						<img src="$r.staticLink('images/edubase/empty_cover.png')" alt="COVER">
-					</object>
+				<td class="o_edubase_bs_cover">
+					<img src="$!{bookSection.getBookSection().getCoverUrl()}" onerror="if (this.src != '$r.staticLink('images/edubase/empty_cover.png')') this.src = '$r.staticLink('images/edubase/empty_cover.png')';" />
 				</td>
 			</tbody>
 		</table>

src/main/java/org/olat/course/nodes/edubase/_content/overview_description_disabled.html

@@ -2,9 +2,7 @@
 #foreach($bookSection in $bookSections)
 	<div class="o_edubase_booksection">
 		#set( $runindex = $run + $foreach.index)
-		<object data="$!{bookSection.getCoverUrl()}">
-  			<img src="$r.staticLink('images/edubase/empty_cover.png')" alt="COVER" onClick="$r.javaScriptCommand($runindex);">
-		</object>
+		<img src="$!{bookSection.getCoverUrl()}" onerror="if (this.src != '$r.staticLink('images/edubase/empty_cover.png')') this.src = '$r.staticLink('images/edubase/empty_cover.png')';">
 		<div>
 			$r.escapeHtml($bookSection.getTitle())
 		</div>

src/main/java/org/olat/course/nodes/edubase/_content/overview_description_enabled.html

@@ -2,9 +2,7 @@
 #foreach($bookSection in $bookSections)
 <div class="row">
 	<div class="col-sm-2 o_edubase_cover o_block_top">
-		<object data="$!{bookSection.getCoverUrl()}">
-  			<img src="$r.staticLink('images/edubase/empty_cover.png')" alt="COVER">
-		</object>
+		<img src="$!{bookSection.getCoverUrl()}" onerror="if (this.src != '$r.staticLink('images/edubase/empty_cover.png')') this.src = '$r.staticLink('images/edubase/empty_cover.png')';"/>
 	</div>
 	<div class="col-sm-10 o_edubase_booksection">
 		<div class="row">

src/main/java/org/olat/course/nodes/edubase/_content/peekview.html

@@ -2,9 +2,7 @@
 	#foreach($bookSection in $bookSections)
 		<div class="o_edubase_pv_fig">
 			<figure>
-				<object data="$!{bookSection.getCoverUrl()}">
-  					<img src="$r.staticLink('images/edubase/empty_cover.png')" alt="COVER">
-				</object>
+				<img src="$!{bookSection.getCoverUrl()}" onerror="if (this.src != '$r.staticLink('images/edubase/empty_cover.png')') this.src = '$r.staticLink('images/edubase/empty_cover.png')';" />
 				<figcaption>$r.escapeHtml($bookSection.getTitle())</figcaption>
 			</figure>
 		</div>

src/main/java/org/olat/course/nodes/edubase/_i18n/LocalStrings_de.properties

@@ -18,6 +18,7 @@ edubase.book.section.page.from.to=Seite {0} bis {1}
 edubase.book.section.page.to=Seite bis
 edubase.book.section.title=Buchtitel
 edubase.with.description.enabled=Leseauftrag
+form.error.page.to.higher.from=Seite bis muss gr\u00F6sser sein als Seite von
 form.error.wrong.int=Falsches Zahlenformat. Beispiele\: 2, 10, 144
 form.error.wrong.section.id=Ung\u00FCltiger Wert
 link.text=Edubase

src/main/java/org/olat/course/nodes/edubase/_i18n/LocalStrings_en.properties

@@ -18,6 +18,7 @@ edubase.book.section.page.from.to=Page {0} to {1}
 edubase.book.section.page.to=Page to
 edubase.book.section.title=Book title
 edubase.with.description.enabled=Reading order
+form.error.page.to.higher.from=Page to has to be higher than page from
 form.error.wrong.int=Wrong numeral format. Examples\: 2, 10, 144
 form.error.wrong.section.id=Invalid value
 link.text=Edubase

src/main/java/org/olat/modules/edubase/manager/EdubaseManagerImpl.java

@@ -22,25 +22,17 @@ package org.olat.modules.edubase.manager;
 
 import java.io.EOFException;
 import java.net.SocketTimeoutException;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
 import java.util.Optional;
 
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
-import org.apache.http.conn.ssl.SSLContextBuilder;
-import org.apache.http.conn.ssl.TrustStrategy;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.codehaus.jackson.JsonParseException;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.olat.basesecurity.AuthHelper;
-import org.olat.core.helpers.Settings;
 import org.olat.core.id.IdentityEnvironment;
 import org.olat.core.logging.OLog;
 import org.olat.core.logging.Tracing;
@@ -158,9 +150,9 @@ public class EdubaseManagerImpl implements EdubaseManager {
 		String url = String.format(edubaseModule.getInfoverUrl(), bookId);
 		HttpGet request = new HttpGet(url);
 		request.setConfig(requestConfig);
-		try (CloseableHttpClient httpClient = createAllwaysTrustingHttpClient();
+		try (CloseableHttpClient httpClient = HttpClients.createDefault();
 				CloseableHttpResponse httpResponse = httpClient.execute(request);) {
-			String json = EntityUtils.toString(httpResponse.getEntity());
+			String json = EntityUtils.toString(httpResponse.getEntity(), "UTF-8");
 			ObjectMapper objectMapper = new ObjectMapper();
 			infoReponse = objectMapper.readValue(json, BookDetailsImpl.class);
 		} catch (SocketTimeoutException socketTimeoutException) {
@@ -171,27 +163,8 @@ public class EdubaseManagerImpl implements EdubaseManager {
 		} catch(Exception e) {
 			log.error("", e);
 		}
-
+		
 		return infoReponse;
 	}
 
-	private CloseableHttpClient createAllwaysTrustingHttpClient()
-			throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException {
-		CloseableHttpClient httpClient;
-		if (Settings.isDebuging()) {
-			httpClient = HttpClients.custom()
-					.setHostnameVerifier(new AllowAllHostnameVerifier())
-					.setSslcontext(new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() {
-						@Override
-						public boolean isTrusted(java.security.cert.X509Certificate[] chain, String authType)
-								throws CertificateException {
-							return true;
-						}
-					}).build()).build();
-		} else {
-			httpClient = HttpClients.createDefault();
-		}
-		return httpClient;
-	}
-
 }