mirror of https://github.com/kiwix/libkiwix.git
New logic for generating HTTP-redirects
Before this fix the root URL for a book was assumed to resolve to the main page. This was not true for ZIM files containing an entry at an empty path or with a path equal to "/", resulting in issue #826. The logic behind this behaviour is found in `kiwix::getEntryFromPath()`. The fix to that issue is a little more general and will result in an HTTP redirect in any case where `kiwix::getEntryFromPath(zim, path)` returns an entry with a real path different from the requested one. In particular, this will affect the behaviour on ZIM files with the old namespace scheme, where the requested resource - if not found - is also looked up in the 'A', 'I', 'J', and/or '-' namespaces. Now instead of returning the contents of that other resource an HTTP redirect response will be sent.
This commit is contained in:
parent
f6ae75e41d
commit
582c8d868a
|
@ -1043,9 +1043,14 @@ std::unique_ptr<Response> InternalServer::handle_content(const RequestContext& r
|
||||||
|
|
||||||
try {
|
try {
|
||||||
auto entry = getEntryFromPath(*archive, urlStr);
|
auto entry = getEntryFromPath(*archive, urlStr);
|
||||||
if (entry.isRedirect() || urlStr.empty()) {
|
if (entry.isRedirect() || urlStr != entry.getPath()) {
|
||||||
// If urlStr is empty, we want to mainPage.
|
// In the condition above, the second case (an entry with a different
|
||||||
// We must do a redirection to the real page.
|
// URL was returned) can occur in the following situations:
|
||||||
|
// 1. urlStr is empty or equal to "/" and the ZIM file doesn't contain
|
||||||
|
// such an entry, in which case the main entry is returned instead.
|
||||||
|
// 2. The ZIM file uses old namespace scheme, and the resource at urlStr
|
||||||
|
// is not present but can be found under one of the 'A', 'I', 'J' or
|
||||||
|
// '-' namespaces, in which case that resource is returned instead.
|
||||||
return build_redirect(bookName, getFinalItem(*archive, entry));
|
return build_redirect(bookName, getFinalItem(*archive, entry));
|
||||||
}
|
}
|
||||||
auto response = ItemResponse::build(*this, request, entry.getItem());
|
auto response = ItemResponse::build(*this, request, entry.getItem());
|
||||||
|
|
Loading…
Reference in New Issue