Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

http: to_reply() from redirect_exception #2206

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

http: to_reply() from redirect_exception #2206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions include/seastar/http/exception.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,21 @@ private:
*/
class redirect_exception : public base_exception {
public:
redirect_exception(const std::string& url, http::reply::status_type status = http::reply::status_type::moved_permanently)
: base_exception("", status), url(url) {
redirect_exception(const std::string& url, http::reply::status_type status = http::reply::status_type::moved_permanently, const std::optional<int>& retry_after = std::nullopt)
: base_exception("", status), url(url), retry_after(retry_after) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should mention in the commit message (and perhaps even split the commit into two) that one of the things that this patch does is to add to add Retry-After header (see https://datatracker.ietf.org/doc/html/rfc7231#section-7.1.3) support for redirections.
It is separate feature from the to_reply() function you are adding in this patch.

}

http::reply to_reply() const {
http::reply reply{};
reply.add_header("Location", url);
if (retry_after.has_value()) {
reply.add_header("Retry-After", std::to_string(retry_after.value()));
}
reply.set_status(status());
return reply;
}
std::string url;
std::optional<int> retry_after;
};

/**
Expand Down
6 changes: 4 additions & 2 deletions src/http/routes.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ std::unique_ptr<http::reply> routes::exception_reply(std::exception_ptr eptr) {
}
std::rethrow_exception(eptr);
} catch (const redirect_exception& _e) {
rep.reset(new http::reply());
rep->add_header("Location", _e.url).set_status(_e.status());
*rep = _e.to_reply();
} catch (const base_exception& e) {
rep->set_status(e.status(), json_exception(e).to_json());
} catch (...) {
Expand All @@ -94,6 +93,9 @@ future<std::unique_ptr<http::reply> > routes::handle(const sstring& path, std::u
handler->verify_mandatory_params(*req);
auto r = handler->handle(path, std::move(req), std::move(rep));
return r.handle_exception(_general_handler);
} catch (const redirect_exception& _e) {
*rep = _e.to_reply();
rep->done("json");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This catch was missing previously. It looks like it fixes a bug - can you explain in the commit message what bug this was? Can you perhaps write a unit test for it?

} catch (...) {
rep = exception_reply(std::current_exception());
}
Expand Down