Merge pull request #470 from syjer/469-accept-generic-uri

Fixes #469 - better handling of href uri
danfickle · Apr 30, 2020 · 705cfd2 · 705cfd2
2 parents c5d5452 + 4eab947
commit 705cfd2
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/openhtmltopdf-pdfbox/src/main/java/com/openhtmltopdf/pdfboxout/PdfBoxFastLinkManager.java b/openhtmltopdf-pdfbox/src/main/java/com/openhtmltopdf/pdfboxout/PdfBoxFastLinkManager.java
@@ -29,6 +29,7 @@
 import java.awt.*;
 import java.awt.geom.*;
 import java.io.IOException;
+import java.net.URI;
 import java.util.*;
 import java.util.List;
 import java.util.Map.Entry;
@@ -232,7 +233,7 @@ private void addUriAsLink(RenderingContext c, Box box, PDPage page, float pageHe
 			} else {
 			    XRLog.general(Level.WARNING, "Could not find valid target for link. Link href = " + uri);
 			}
-		} else if (uri.contains("://")) {
+		} else if (isURI(uri)) {
 			PDActionURI uriAct = new PDActionURI();
 			uriAct.setURI(uri);
 
@@ -249,6 +250,15 @@ private void addUriAsLink(RenderingContext c, Box box, PDPage page, float pageHe
 		}
 	}
 
+	private static boolean isURI(String uri) {
+		try {
+			return URI.create(uri) != null;
+		} catch (IllegalArgumentException e) {
+			XRLog.general(Level.INFO, "'"+uri+"' in href is not a valid URI, will be skipped");
+			return false;
+		}
+	}
+
 	@SuppressWarnings("BooleanMethodIsAlwaysInverted")
 	private boolean placeAnnotation(AffineTransform transform, Shape linkShape, Rectangle2D targetArea,
 			PDAnnotationLink annot) {