3f41ce8337
Unit test for HTTP 500 Internal Server Error
...
Currently an internal server error can be triggered by accessing an
entry belonging to a redirect loop. The ZIM file (test/data/poor.zim)
containing such a loop was copied from openzim/zim-tools repository
(test/data/zimfiles/poor.zim).
2022-04-04 18:35:20 +02:00
2a20e87341
Got rid of Response::build_500()
...
This change is not tested (mostly due to the difficulties of triggering
an internal server error).
2022-04-04 18:35:20 +02:00
2028bf3a98
Fixed the CI build failure under android_arm*
2022-04-04 18:35:20 +02:00
545d409150
Reused HTTPErrorHtmlResponse in HTTP400HtmlResponse
2022-04-04 18:35:20 +02:00
89dc9afc28
Renamed 404.html to error.html
...
404.html no longer contains anything specific to the 404 error and will
henceforth serve (with some enhancements) as a general purpose error
page template.
2022-04-04 18:35:20 +02:00
647118dd5e
Enter HTTPErrorHtmlResponse
...
In addition to serving as a base class for `HTTP404HtmlResponse`,
`HTTPErrorHtmlResponse` is going to be used for a couple of other error
pages.
2022-04-04 18:35:20 +02:00
d8a60db739
Preparing for a single error page template
2022-04-04 18:35:20 +02:00
f4059f3faf
Got rid of withTaskbarInfo()
2022-04-04 18:35:20 +02:00
800cc5b68a
Got rid of Response::build_404()
2022-04-04 18:35:19 +02:00
b1f03385e4
Merge pull request #739 from kiwix/fix_windows_extern
2022-04-03 13:36:21 +02:00
feb30d08aa
Correctly define the variable urlNotFoundMsg and invalidUrlMsg.
...
As we must declare the two variables as `extern` in response.h,
we must define it somewhere (and `response.cpp` is a good place).
2022-04-01 11:58:57 +02:00
95d4dd63ac
Merge pull request #724 from kiwix/search_improvement
2022-03-29 14:42:24 +02:00
311f783ea9
Always use the search pattern when searching in the server.
...
There is no reason to not use the pattern if there is a geo_query.
If both the pattern and the qeo_query are provided, we must use both.
2022-03-29 14:06:19 +02:00
f2a1c0f106
Add braces around for loop's body.
2022-03-29 14:05:45 +02:00
2cc4befb12
Correctly display searchpattern in search result page.
...
The `searchPattern` is already "diples encoded".
So we can simply using it without protecting us from script injection.
Fix #723
2022-03-29 14:05:45 +02:00
3641dbf14d
Handle book without xapian index.
2022-03-29 14:05:45 +02:00
1962262f94
Correctly handle invalid book.
...
If user request for a non existent book, we must return a 400 page.
(This is done by throwing a `std::invalid_argument` and let the catch
handle it)
2022-03-29 14:05:45 +02:00
7407f30790
Better cache usage.
...
It is better to directly try to get the `Search` from the cache instead
of getting the `Searcher` first which could be useless in Search already
exist.
2022-03-29 14:05:45 +02:00
d740ffe465
Introduce SearchInfo.
...
SearchInfo is a small helper structure to store information about the
queried search. It regroup already existing information (`patternString`,
geo query, ...) in one structure.
It is also used as key in the cache instead of using a generated string.
2022-03-29 14:05:39 +02:00
e7293346be
Return http 400 error response when needed.
2022-03-28 17:37:41 +02:00
b1643e422e
Introduce HTTP400HtmlResponse.
...
HTTP400HtmlResponse is build on the same design than HTTP404HtmlResponse.
2022-03-28 17:35:15 +02:00
574c1ad690
Merge pull request #736 from kiwix/pin_jinja2_doc
...
Remove pinning of Sphinx<4
2022-03-28 15:50:17 +02:00
59364a737a
[WIP] Remove pinning of Sphinx<4
...
It seems we add this pinning to fix a dependencies issue.
Let's remove it.
2022-03-28 15:37:05 +02:00
49f24d18df
Merge pull request #732 from kiwix/HTTP404HtmlResponse
...
New way of building 404 error HTML responses
2022-03-28 15:27:46 +02:00
ec2e10b40e
Moved taskbarInfo into ContentResponseBlueprint
2022-03-28 14:56:40 +02:00
2da8ea1650
Moved function definition to cpp
2022-03-28 14:56:40 +02:00
0eb8f09f79
One more victory of HTTP404HtmlResponse
...
One more instance of `Response::build_404()` & `withTaskbarInfo()`
was taken over by `HTTP404HtmlResponse`.
2022-03-28 14:56:40 +02:00
0ecbdbcf63
Enter TaskbarInfo
...
After this change it's time to say thank you and good-bye to
`withTaskbarInfo()`. But it will take a while.
2022-03-28 14:56:40 +02:00
9bc09a815c
noSuchBookErrorMsg()
2022-03-28 14:56:40 +02:00
48d377ca44
HTTP404HtmlResponse::operator+(const std::string&)
2022-03-28 14:56:40 +02:00
d5ae92e4e2
More uses of HTTP404HtmlResponse
2022-03-28 14:56:40 +02:00
1a5e2eda0f
HTTP404HtmlResponse::operator+(UrlNotFoundMsg)
2022-03-28 14:56:40 +02:00
89785a259a
Enter HTTP404HtmlResponse
2022-03-28 14:56:40 +02:00
668063205c
Enter UrlNotFoundMsg iomanipulator-like class
2022-03-28 14:56:40 +02:00
df98c58d07
Enter ContentResponseBlueprint
2022-03-28 14:56:40 +02:00
ff8da65c68
Separated make404ResponseData()
2022-03-28 14:56:40 +02:00
ae60ba806b
Made 404.html error template a little more generic
...
The fact that an info message was moved into C++ code is temporary
since it will be moved to a message resource file soon.
2022-03-28 14:56:40 +02:00
8cfcf2ea86
A new overload of Response::build_404()
2022-03-28 14:56:40 +02:00
26c16bb1b2
Renamed a variable
2022-03-28 14:56:40 +02:00
ca965d448f
Got rid of 2 parameters in Response::build_404()
...
Instead of passing the `bookName` and `bookTitle` parameters to
`Response::build_404()`, `withTaskbarInfo()` is applied to its result
when needed. Note, that in `InternalServer::handle_raw()`
`withTaskbarInfo()` was not utilized since the results of the `/raw`
endpoint are not supposed to be decorated with a taskbar.
2022-03-28 14:56:40 +02:00
6d16d7386d
Changed the signature of ContentResponse::set_taskbar()
2022-03-28 14:56:40 +02:00
40e9a19c48
Introduced withTaskbarInfo() helper function
...
This was done in preparation for removing the `bookName` and `bookTitle`
parameters from `Response::build_404()`, but since the new function
could already be put to some use in this commit that was done too.
2022-03-28 14:56:40 +02:00
d487c78ea4
Changed the return type of Response::build_404()
2022-03-28 14:56:40 +02:00
96cbd2bf26
kiwix::onlyAsNonEmptyMustacheValue()
2022-03-28 14:56:40 +02:00
941c3b5df3
Merge pull request #734 from kiwix/br_10.1.0
2022-03-24 18:55:38 +01:00
b9e40def88
New version 10.1.0
2022-03-24 18:26:35 +01:00
116ecd1c78
Merge pull request #733 from kiwix/kelson42-patch-1
...
Add release badge
2022-03-24 17:45:54 +01:00
8f2faf37dc
Add release badge
2022-03-24 17:45:03 +01:00
ddc4c3ec2c
Merge pull request #727 from kiwix/testing_of_ft_search_unavailable_page
2022-03-23 15:06:47 +01:00
511261cc81
Testing of "Fulltext search unavailable" page
2022-03-18 15:57:11 +04:00
