diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-29 12:17:40 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-29 13:02:40 +0000 |
| commit | a346dfccd7e342d776dd59eb3ed128557e22a1bf (patch) | |
| tree | fd2b7dcb940e054bdc080afed3b52257c9e4ca84 /svl/qa | |
| parent | b051510796dcf289edcd03737087176e53bbe4b8 (diff) | |
tdf#70833: IDNA support when exporing hyperlinks to PDF
Any URLs using non-ASCII IDNA syntax need to be resolved to ASCII-only, as PDF
URI Action's URI needs to be "encoded in 7-bit ASCII."
Introduce URIHelper::resolveIdnaHost (svl/urihelper.hxx), which internally uses
icu::IDNA, which requires to bump the minimal --with-system-icu requirement from
4.2 to 4.6, which means ICU_RECLASSIFIED_CLOSE_PARENTHESIS is always true now.
Change-Id: I0e20d9a20ed2b869fba0cc7c969721411db590b3
Reviewed-on: https://gerrit.libreoffice.org/19669
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svl/qa')
| -rw-r--r-- | svl/qa/unit/test_URIHelper.cxx | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx index f27149b57a01..37d53e90ec6c 100644 --- a/svl/qa/unit/test_URIHelper.cxx +++ b/svl/qa/unit/test_URIHelper.cxx @@ -198,9 +198,12 @@ public: void testFindFirstURLInText(); + void testResolveIdnaHost(); + CPPUNIT_TEST_SUITE(Test); CPPUNIT_TEST(testNormalizedMakeRelative); CPPUNIT_TEST(testFindFirstURLInText); + CPPUNIT_TEST(testResolveIdnaHost); CPPUNIT_TEST(finish); CPPUNIT_TEST_SUITE_END(); @@ -423,6 +426,66 @@ void Test::testFindFirstURLInText() { } } +void Test::testResolveIdnaHost() { + OUString input; + + input.clear(); + CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input)); + + input = OUString::fromUtf8("Foo.M\xC3\xBCnchen.de"); + CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input)); + + input = OUString::fromUtf8("foo://Muenchen.de"); + CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input)); + + input = OUString::fromUtf8("foo://-M\xC3\xBCnchen.de"); + CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input)); + + input = OUString::fromUtf8("foo://M\xC3\xBCnchen-.de"); + CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input)); + + input = OUString::fromUtf8("foo://xn--M\xC3\xBCnchen.de"); + CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input)); + + input = OUString::fromUtf8("foo://xy--M\xC3\xBCnchen.de"); + CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input)); + + input = OUString::fromUtf8("foo://.M\xC3\xBCnchen.de"); + CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input)); + + input = OUString::fromUtf8("foo://-bar.M\xC3\xBCnchen.de"); + CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input)); + + input = OUString::fromUtf8("foo://bar-.M\xC3\xBCnchen.de"); + CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input)); + + input = OUString::fromUtf8("foo://xn--bar.M\xC3\xBCnchen.de"); + CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input)); + + input = OUString::fromUtf8("foo://xy--bar.M\xC3\xBCnchen.de"); + CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input)); + + CPPUNIT_ASSERT_EQUAL( + OUString::fromUtf8("foo://M\xC3\xBCnchen@xn--mnchen-3ya.de"), + URIHelper::resolveIdnaHost( + OUString::fromUtf8("foo://M\xC3\xBCnchen@M\xC3\xBCnchen.de"))); + + CPPUNIT_ASSERT_EQUAL( + OUString::fromUtf8("foo://xn--mnchen-3ya.de."), + URIHelper::resolveIdnaHost( + OUString::fromUtf8("foo://M\xC3\xBCnchen.de."))); + + CPPUNIT_ASSERT_EQUAL( + OUString::fromUtf8("Foo://bar@xn--mnchen-3ya.de:123/?bar#baz"), + URIHelper::resolveIdnaHost( + OUString::fromUtf8("Foo://bar@M\xC3\xBCnchen.de:123/?bar#baz"))); + + CPPUNIT_ASSERT_EQUAL( + OUString::fromUtf8("foo://xn--mnchen-3ya.de"), + URIHelper::resolveIdnaHost( + OUString::fromUtf8("foo://Mu\xCC\x88nchen.de"))); +} + css::uno::Reference< css::uno::XComponentContext > Test::m_context; CPPUNIT_TEST_SUITE_REGISTRATION(Test); |