2014-12-27 18:59:06 +01:00
|
|
|
/*
|
|
|
|
* nghttp2 - HTTP/2 C Library
|
|
|
|
*
|
|
|
|
* Copyright (c) 2015 Tatsuhiro Tsujikawa
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining
|
|
|
|
* a copy of this software and associated documentation files (the
|
|
|
|
* "Software"), to deal in the Software without restriction, including
|
|
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
|
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
|
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
|
|
* the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be
|
|
|
|
* included in all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
|
|
|
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|
|
|
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
|
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
#include "shrpx_rate_limit.h"
|
|
|
|
|
2015-01-02 06:38:57 +01:00
|
|
|
#include <limits>
|
|
|
|
|
2015-08-12 17:04:41 +02:00
|
|
|
#include "shrpx_connection.h"
|
|
|
|
|
2014-12-27 18:59:06 +01:00
|
|
|
namespace shrpx {
|
|
|
|
|
|
|
|
namespace {
|
|
|
|
void regencb(struct ev_loop *loop, ev_timer *w, int revents) {
|
|
|
|
auto r = static_cast<RateLimit *>(w->data);
|
|
|
|
r->regen();
|
|
|
|
}
|
|
|
|
} // namespace
|
|
|
|
|
nghttpx: Fix bug that data buffered in SSL object are not read
This is same issue described in https://github.com/h2o/h2o/issues/268.
That is if SSL object has decrypted data buffered inside it, and
application does not read it for some reason (e.g., rate limit), we
have to check the existence of data using SSL_pending. This is
because buffered data inside SSL is not notified by io watcher. It is
obvious, but we totally missed it.
nghttpx code normally reads everything until SSL_read returns error
(want-read). But if rate limit is involved, we stop reading early.
Also in HTTP/1 code, while processing one request, we just read until
buffer is filled up. In these cases, we may suffer from this problem.
This commit fixes this problem, by performing SSL_pending() and if it
has buffered data and read io watcher is enabled, we feed event using
ev_feed_event().
2015-04-06 15:31:36 +02:00
|
|
|
RateLimit::RateLimit(struct ev_loop *loop, ev_io *w, size_t rate, size_t burst,
|
2015-08-12 17:04:41 +02:00
|
|
|
Connection *conn)
|
|
|
|
: w_(w), loop_(loop), conn_(conn), rate_(rate), burst_(burst),
|
|
|
|
avail_(burst), startw_req_(false) {
|
2014-12-27 18:59:06 +01:00
|
|
|
ev_timer_init(&t_, regencb, 0., 1.);
|
|
|
|
t_.data = this;
|
|
|
|
if (rate_ > 0) {
|
2015-01-10 16:32:08 +01:00
|
|
|
ev_timer_again(loop_, &t_);
|
2014-12-27 18:59:06 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
nghttpx: Fix bug that data buffered in SSL object are not read
This is same issue described in https://github.com/h2o/h2o/issues/268.
That is if SSL object has decrypted data buffered inside it, and
application does not read it for some reason (e.g., rate limit), we
have to check the existence of data using SSL_pending. This is
because buffered data inside SSL is not notified by io watcher. It is
obvious, but we totally missed it.
nghttpx code normally reads everything until SSL_read returns error
(want-read). But if rate limit is involved, we stop reading early.
Also in HTTP/1 code, while processing one request, we just read until
buffer is filled up. In these cases, we may suffer from this problem.
This commit fixes this problem, by performing SSL_pending() and if it
has buffered data and read io watcher is enabled, we feed event using
ev_feed_event().
2015-04-06 15:31:36 +02:00
|
|
|
RateLimit::~RateLimit() { ev_timer_stop(loop_, &t_); }
|
2014-12-27 18:59:06 +01:00
|
|
|
|
|
|
|
size_t RateLimit::avail() const {
|
|
|
|
if (rate_ == 0) {
|
2015-01-02 06:38:57 +01:00
|
|
|
return std::numeric_limits<ssize_t>::max();
|
2014-12-27 18:59:06 +01:00
|
|
|
}
|
|
|
|
return avail_;
|
|
|
|
}
|
|
|
|
|
|
|
|
void RateLimit::drain(size_t n) {
|
|
|
|
if (rate_ == 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
n = std::min(avail_, n);
|
|
|
|
avail_ -= n;
|
|
|
|
if (avail_ == 0) {
|
|
|
|
ev_io_stop(loop_, w_);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void RateLimit::regen() {
|
|
|
|
if (rate_ == 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (avail_ + rate_ > burst_) {
|
|
|
|
avail_ = burst_;
|
|
|
|
} else {
|
|
|
|
avail_ += rate_;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (avail_ > 0 && startw_req_) {
|
|
|
|
ev_io_start(loop_, w_);
|
nghttpx: Fix bug that data buffered in SSL object are not read
This is same issue described in https://github.com/h2o/h2o/issues/268.
That is if SSL object has decrypted data buffered inside it, and
application does not read it for some reason (e.g., rate limit), we
have to check the existence of data using SSL_pending. This is
because buffered data inside SSL is not notified by io watcher. It is
obvious, but we totally missed it.
nghttpx code normally reads everything until SSL_read returns error
(want-read). But if rate limit is involved, we stop reading early.
Also in HTTP/1 code, while processing one request, we just read until
buffer is filled up. In these cases, we may suffer from this problem.
This commit fixes this problem, by performing SSL_pending() and if it
has buffered data and read io watcher is enabled, we feed event using
ev_feed_event().
2015-04-06 15:31:36 +02:00
|
|
|
handle_tls_pending_read();
|
2014-12-27 18:59:06 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void RateLimit::startw() {
|
|
|
|
startw_req_ = true;
|
|
|
|
if (rate_ == 0 || avail_ > 0) {
|
|
|
|
ev_io_start(loop_, w_);
|
nghttpx: Fix bug that data buffered in SSL object are not read
This is same issue described in https://github.com/h2o/h2o/issues/268.
That is if SSL object has decrypted data buffered inside it, and
application does not read it for some reason (e.g., rate limit), we
have to check the existence of data using SSL_pending. This is
because buffered data inside SSL is not notified by io watcher. It is
obvious, but we totally missed it.
nghttpx code normally reads everything until SSL_read returns error
(want-read). But if rate limit is involved, we stop reading early.
Also in HTTP/1 code, while processing one request, we just read until
buffer is filled up. In these cases, we may suffer from this problem.
This commit fixes this problem, by performing SSL_pending() and if it
has buffered data and read io watcher is enabled, we feed event using
ev_feed_event().
2015-04-06 15:31:36 +02:00
|
|
|
handle_tls_pending_read();
|
2014-12-27 18:59:06 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void RateLimit::stopw() {
|
|
|
|
startw_req_ = false;
|
|
|
|
ev_io_stop(loop_, w_);
|
|
|
|
}
|
|
|
|
|
nghttpx: Fix bug that data buffered in SSL object are not read
This is same issue described in https://github.com/h2o/h2o/issues/268.
That is if SSL object has decrypted data buffered inside it, and
application does not read it for some reason (e.g., rate limit), we
have to check the existence of data using SSL_pending. This is
because buffered data inside SSL is not notified by io watcher. It is
obvious, but we totally missed it.
nghttpx code normally reads everything until SSL_read returns error
(want-read). But if rate limit is involved, we stop reading early.
Also in HTTP/1 code, while processing one request, we just read until
buffer is filled up. In these cases, we may suffer from this problem.
This commit fixes this problem, by performing SSL_pending() and if it
has buffered data and read io watcher is enabled, we feed event using
ev_feed_event().
2015-04-06 15:31:36 +02:00
|
|
|
void RateLimit::handle_tls_pending_read() {
|
2015-08-12 17:04:41 +02:00
|
|
|
if (!conn_ || !conn_->tls.ssl ||
|
|
|
|
(SSL_pending(conn_->tls.ssl) == 0 && conn_->tls.rbuf.rleft() == 0)) {
|
nghttpx: Fix bug that data buffered in SSL object are not read
This is same issue described in https://github.com/h2o/h2o/issues/268.
That is if SSL object has decrypted data buffered inside it, and
application does not read it for some reason (e.g., rate limit), we
have to check the existence of data using SSL_pending. This is
because buffered data inside SSL is not notified by io watcher. It is
obvious, but we totally missed it.
nghttpx code normally reads everything until SSL_read returns error
(want-read). But if rate limit is involved, we stop reading early.
Also in HTTP/1 code, while processing one request, we just read until
buffer is filled up. In these cases, we may suffer from this problem.
This commit fixes this problem, by performing SSL_pending() and if it
has buffered data and read io watcher is enabled, we feed event using
ev_feed_event().
2015-04-06 15:31:36 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Note that ev_feed_event works without starting watcher, but we
|
|
|
|
// only call this function if watcher is active.
|
|
|
|
ev_feed_event(loop_, w_, EV_READ);
|
|
|
|
}
|
|
|
|
|
2014-12-27 18:59:06 +01:00
|
|
|
} // namespace shrpx
|