From: Katja Luther <k.luther@bgbm.org>
Date: Tue, 30 Jun 2020 12:57:18 +0000 (+0200)
Subject: encode invalid character in URI
X-Git-Tag: 5.16.0^2~1
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/cc71e44ce98cc972d40dae44cb1a4dfb2786dd24

encode invalid character in URI
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/UriWithLabelElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/UriWithLabelElement.java
index 82dd7389c..4801c2234 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/UriWithLabelElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/UriWithLabelElement.java
@@ -11,6 +11,7 @@ package eu.etaxonomy.taxeditor.ui.element;
 
 import java.io.IOException;
 import java.net.URI;
+import java.net.URL;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -20,6 +21,7 @@ import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 
+import eu.etaxonomy.cdm.common.UrlUtf8Coder;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.ImageResources;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
@@ -109,7 +111,24 @@ public class UriWithLabelElement extends AbstractUriWithExceptionLabelElement<UR
     protected URI getParsedText() throws Exception {
         String uriText = super.getText();
         if(uriText!=null){
-            return new URI(super.getText());
+            try{
+                return new URI(super.getText());
+            }catch(Exception e){
+                URL url = new URL(uriText);
+                String[] pathElements =  url.getPath().split("/");
+
+                for (String element: pathElements){
+                    String replacement = UrlUtf8Coder.encode(element);
+                    uriText = uriText.replace(element, replacement);
+                }
+                if (url.getQuery() != null){
+                    uriText = uriText.replace(url.getQuery(), UrlUtf8Coder.encode(url.getQuery()));
+                }
+                url = new URL(uriText);
+                return url.toURI();
+
+            }
+
         }
         return null;
     }