From 4b1b2f4af28b21b5e7992e6f02f20d2c1542c60d Mon Sep 17 00:00:00 2001 From: Yegor Kozlov Date: Thu, 2 Feb 2012 10:37:49 +0000 Subject: [PATCH] validate hyperlink address as discussed on poi-user git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1239529 13f79535-47bb-0310-9956-ffa450edef68 --- src/documentation/content/xdocs/status.xml | 1 + .../poi/xssf/usermodel/XSSFHyperlink.java | 24 +++++++++++++-- .../poi/xssf/usermodel/TestXSSFHyperlink.java | 29 +++++++++++++++++++ 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml index 794df2f135..c2a3693f6d 100644 --- a/src/documentation/content/xdocs/status.xml +++ b/src/documentation/content/xdocs/status.xml @@ -34,6 +34,7 @@ + Validate address of hyperlinks in XSSF 52540 - Relax the M4.1 constraint on reading OOXML files, as some Office produced ones do have 2 Core Properties, despite the specification explicitly forbidding this 52462 - Added implementation for SUMIFS() POIXMLPropertiesTextExtractor support for extracting custom OOXML properties as text diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java index 21fd54b844..2fd47d9d42 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java @@ -17,6 +17,7 @@ package org.apache.poi.xssf.usermodel; import java.net.URI; +import java.net.URISyntaxException; import org.apache.poi.openxml4j.opc.PackagePart; import org.apache.poi.openxml4j.opc.PackageRelationship; @@ -181,18 +182,37 @@ public class XSSFHyperlink implements Hyperlink { } /** - * Hypelink address. Depending on the hyperlink type it can be URL, e-mail, path to a file + * Hyperlink address. Depending on the hyperlink type it can be URL, e-mail, path to a file * * @param address - the address of this hyperlink */ public void setAddress(String address) { - _location = address; + validate(address); + + _location = address; //we must set location for internal hyperlinks if (_type == Hyperlink.LINK_DOCUMENT) { setLocation(address); } } + private void validate(String address) { + switch (_type){ + // email, path to file and url must be valid URIs + case Hyperlink.LINK_EMAIL: + case Hyperlink.LINK_FILE: + case Hyperlink.LINK_URL: + try { + new URI(address); + } catch (URISyntaxException x) { + IllegalArgumentException y = new IllegalArgumentException("Address of hyperlink must be a valid URI"); + y.initCause(x); + throw y; + } + break; + } + } + /** * Assigns this hyperlink to the given cell reference */ diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java index 6e226e331b..49f79365f3 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java @@ -50,6 +50,35 @@ public final class TestXSSFHyperlink extends BaseTestHyperlink { doTestHyperlinkContents(sheet); } + public void testCreate() { + XSSFWorkbook workbook = new XSSFWorkbook(); + XSSFCreationHelper createHelper = workbook.getCreationHelper(); + + String[] validURLs = { + "http://apache.org", + "www.apache.org", + "/temp", + "c:/temp", + "http://apache.org/default.php?s=isTramsformed&submit=Search&la=*&li=*"}; + for(String s : validURLs){ + createHelper.createHyperlink(Hyperlink.LINK_URL).setAddress(s); + } + + String[] invalidURLs = { + "http:\\apache.org", + "www.apache .org", + "c:\\temp", + "\\poi"}; + for(String s : invalidURLs){ + try { + createHelper.createHyperlink(Hyperlink.LINK_URL).setAddress(s); + fail("expected IllegalArgumentException: " + s); + } catch (IllegalArgumentException e){ + + } + } + } + public void testLoadSave() { XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("WithMoreVariousData.xlsx"); CreationHelper createHelper = workbook.getCreationHelper(); -- 2.39.5