From 3052d0787aecf2f9a576f2dd499fabe9fa2de803 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 1 Dec 2021 10:33:52 +0100
Subject: [PATCH] UrlEncode the `content_id`.

The HumanReadableId can contains special char (`&`/`=`/...)
As it is used as to create a url in the opds template,
we must url encode it.

- We don't need to encode the book id as it is a uuid, it never contains
special char.
- We don't need to encode the book url as it is read from the library and
the url must already be correctly encoded in the library.xml.
(tests modified accordingly)
---
 src/opds_dumper.cpp         | 2 +-
 test/data/library.xml       | 4 ++--
 test/data/zimfile&other.zim | 1 +
 test/meson.build            | 1 +
 test/server.cpp             | 4 ++--
 5 files changed, 7 insertions(+), 5 deletions(-)
 create mode 120000 test/data/zimfile&other.zim

diff --git a/src/opds_dumper.cpp b/src/opds_dumper.cpp
index 32d8010ec..b42b682f9 100644
--- a/src/opds_dumper.cpp
+++ b/src/opds_dumper.cpp
@@ -81,7 +81,7 @@ kainjow::mustache::object getSingleBookData(const Book& book)
       {"title", book.getTitle()},
       {"description", book.getDescription()},
       {"language", book.getLanguage()},
-      {"content_id",  book.getHumanReadableIdFromPath()},
+      {"content_id",  urlEncode(book.getHumanReadableIdFromPath(), true)},
       {"updated", book.getDate() + "T00:00:00Z"},
       {"category", book.getCategory()},
       {"flavour", book.getFlavour()},
diff --git a/test/data/library.xml b/test/data/library.xml
index 579fb3848..0b305bf0c 100644
--- a/test/data/library.xml
+++ b/test/data/library.xml
@@ -35,8 +35,8 @@
       ></book>
   <book
         id="charlesray"
-        path="./zimfile.zim"
-        url="https://github.com/kiwix/libkiwix/raw/master/test/data/zimfile.zim"
+        path="./zimfile&amp;other.zim"
+        url="https://github.com/kiwix/libkiwix/raw/master/test/data/zimfile%26other.zim"
         title="Charles, Ray"
         description="Wikipedia articles about Ray Charles"
         language="fra"
diff --git a/test/data/zimfile&other.zim b/test/data/zimfile&other.zim
new file mode 120000
index 000000000..1ac60e3b8
--- /dev/null
+++ b/test/data/zimfile&other.zim
@@ -0,0 +1 @@
+zimfile.zim
\ No newline at end of file
diff --git a/test/meson.build b/test/meson.build
index 30b19b8e6..939f99b7c 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -29,6 +29,7 @@ if gtest_dep.found() and not meson.is_cross_build()
     data_files = [
       'example.zim',
       'zimfile.zim',
+      'zimfile&other.zim',
       'corner_cases.zim',
       'library.xml'
     ]
diff --git a/test/server.cpp b/test/server.cpp
index 75d822cb4..47dfe629f 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -701,14 +701,14 @@ std::string maskVariableOPDSFeedData(std::string s)
     "    <tags>unittest;wikipedia;_category:jazz;_pictures:no;_videos:no;_details:no;_ftindex:yes</tags>\n" \
     "    <articleCount>284</articleCount>\n"                            \
     "    <mediaCount>2</mediaCount>\n"                                  \
-    "    <link type=\"text/html\" href=\"/ROOT/zimfile\" />\n"               \
+    "    <link type=\"text/html\" href=\"/ROOT/zimfile%26other\" />\n"               \
     "    <author>\n"                                                    \
     "      <name>Wikipedia</name>\n"                                    \
     "    </author>\n"                                                   \
     "    <publisher>\n"                                                 \
     "      <name>Kiwix</name>\n"                                        \
     "    </publisher>\n"                                                \
-    "    <link rel=\"http://opds-spec.org/acquisition/open-access\" type=\"application/x-zim\" href=\"https://github.com/kiwix/libkiwix/raw/master/test/data/zimfile.zim\" length=\"569344\" />\n" \
+    "    <link rel=\"http://opds-spec.org/acquisition/open-access\" type=\"application/x-zim\" href=\"https://github.com/kiwix/libkiwix/raw/master/test/data/zimfile%26other.zim\" length=\"569344\" />\n" \
     "  </entry>\n"
 
 #define RAY_CHARLES_CATALOG_ENTRY \