itsi 0.2.15 → 0.2.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +10 -0
- data/Cargo.lock +74 -74
- data/crates/itsi_scheduler/Cargo.toml +1 -1
- data/crates/itsi_scheduler/extconf.rb +3 -1
- data/crates/itsi_server/Cargo.lock +1 -1
- data/crates/itsi_server/Cargo.toml +1 -1
- data/crates/itsi_server/extconf.rb +3 -1
- data/crates/itsi_server/src/lib.rs +1 -0
- data/crates/itsi_server/src/ruby_types/itsi_grpc_call.rs +2 -2
- data/crates/itsi_server/src/ruby_types/itsi_http_request.rs +9 -11
- data/crates/itsi_server/src/ruby_types/itsi_server/itsi_server_config.rs +6 -1
- data/crates/itsi_server/src/server/binds/listener.rs +4 -1
- data/crates/itsi_server/src/server/http_message_types.rs +1 -1
- data/crates/itsi_server/src/server/middleware_stack/middlewares/error_response/default_responses.rs +32 -34
- data/crates/itsi_server/src/server/middleware_stack/middlewares/error_response.rs +3 -4
- data/crates/itsi_server/src/server/middleware_stack/middlewares/etag.rs +23 -38
- data/crates/itsi_server/src/server/middleware_stack/middlewares/log_requests.rs +65 -14
- data/crates/itsi_server/src/server/middleware_stack/middlewares/max_body.rs +1 -1
- data/crates/itsi_server/src/server/middleware_stack/middlewares/proxy.rs +1 -1
- data/crates/itsi_server/src/server/middleware_stack/middlewares/rate_limit.rs +21 -8
- data/crates/itsi_server/src/server/middleware_stack/middlewares/ruby_app.rs +1 -5
- data/crates/itsi_server/src/server/middleware_stack/middlewares/static_response.rs +12 -3
- data/crates/itsi_server/src/server/process_worker.rs +2 -1
- data/crates/itsi_server/src/server/serve_strategy/acceptor.rs +96 -0
- data/crates/itsi_server/src/server/serve_strategy/mod.rs +1 -0
- data/crates/itsi_server/src/server/serve_strategy/single_mode.rs +80 -136
- data/crates/itsi_server/src/server/thread_worker.rs +10 -3
- data/crates/itsi_server/src/services/itsi_http_service.rs +26 -21
- data/crates/itsi_server/src/services/mime_types.rs +185 -183
- data/crates/itsi_server/src/services/rate_limiter.rs +16 -34
- data/crates/itsi_server/src/services/static_file_server.rs +7 -13
- data/docs/content/features/_index.md +1 -1
- data/examples/rails_with_static_assets/Gemfile.lock +1 -1
- data/examples/rails_with_static_assets/Itsi.rb +4 -1
- data/gems/scheduler/Cargo.lock +15 -15
- data/gems/scheduler/lib/itsi/scheduler/version.rb +1 -1
- data/gems/server/Cargo.lock +73 -73
- data/gems/server/lib/itsi/server/config/config_helpers.rb +1 -2
- data/gems/server/lib/itsi/server/config/middleware/etag.md +3 -7
- data/gems/server/lib/itsi/server/config/middleware/etag.rb +2 -4
- data/gems/server/lib/itsi/server/config/options/listen_backlog.rb +1 -1
- data/gems/server/lib/itsi/server/config/options/send_buffer_size.md +15 -0
- data/gems/server/lib/itsi/server/config/options/send_buffer_size.rb +19 -0
- data/gems/server/lib/itsi/server/config.rb +24 -25
- data/gems/server/lib/itsi/server/route_tester.rb +1 -1
- data/gems/server/lib/itsi/server/version.rb +1 -1
- data/gems/server/test/middleware/etag.rb +3 -3
- data/gems/server/test/options/ruby_thread_request_backlog_size.rb +2 -3
- data/lib/itsi/version.rb +1 -1
- data/tasks.txt +8 -7
- metadata +8 -5
@@ -82,7 +82,7 @@ pub struct ServerParams {
|
|
82
82
|
preexisting_listeners: Option<String>,
|
83
83
|
}
|
84
84
|
|
85
|
-
#[derive(Debug, Clone)]
|
85
|
+
#[derive(Debug, Clone, Copy)]
|
86
86
|
pub enum ItsiServerTokenPreference {
|
87
87
|
Version,
|
88
88
|
Name,
|
@@ -109,6 +109,7 @@ pub struct SocketOpts {
|
|
109
109
|
pub listen_backlog: usize,
|
110
110
|
pub nodelay: bool,
|
111
111
|
pub recv_buffer_size: usize,
|
112
|
+
pub send_buffer_size: usize,
|
112
113
|
}
|
113
114
|
|
114
115
|
impl ServerParams {
|
@@ -248,6 +249,9 @@ impl ServerParams {
|
|
248
249
|
let recv_buffer_size: usize = rb_param_hash
|
249
250
|
.fetch::<_, Option<usize>>("recv_buffer_size")?
|
250
251
|
.unwrap_or(262_144);
|
252
|
+
let send_buffer_size: usize = rb_param_hash
|
253
|
+
.fetch::<_, Option<usize>>("send_buffer_size")?
|
254
|
+
.unwrap_or(262_144);
|
251
255
|
|
252
256
|
if let Some(level) = log_level {
|
253
257
|
set_level(&level);
|
@@ -296,6 +300,7 @@ impl ServerParams {
|
|
296
300
|
listen_backlog,
|
297
301
|
nodelay,
|
298
302
|
recv_buffer_size,
|
303
|
+
send_buffer_size,
|
299
304
|
};
|
300
305
|
let preexisting_listeners = rb_param_hash.delete::<_, Option<String>>("listeners")?;
|
301
306
|
|
@@ -111,7 +111,7 @@ impl TokioListener {
|
|
111
111
|
Self::to_tokio_io(Stream::TcpStream(tcp_stream), None).await
|
112
112
|
}
|
113
113
|
|
114
|
-
pub async fn
|
114
|
+
pub async fn spawn_acme_event_task(&self, mut shutdown_receiver: Receiver<RunningPhase>) {
|
115
115
|
if let TokioListener::TcpTls(
|
116
116
|
_,
|
117
117
|
ItsiTlsAcceptor::Automatic(_acme_acceptor, state, _server_config),
|
@@ -414,6 +414,9 @@ fn connect_tcp_socket(addr: IpAddr, port: u16, socket_opts: &SocketOpts) -> Resu
|
|
414
414
|
socket.set_reuse_port(socket_opts.reuse_port).ok();
|
415
415
|
socket.set_nonblocking(true).ok();
|
416
416
|
socket.set_nodelay(socket_opts.nodelay).ok();
|
417
|
+
socket
|
418
|
+
.set_send_buffer_size(socket_opts.send_buffer_size)
|
419
|
+
.ok();
|
417
420
|
socket
|
418
421
|
.set_recv_buffer_size(socket_opts.recv_buffer_size)
|
419
422
|
.ok();
|
data/crates/itsi_server/src/server/middleware_stack/middlewares/error_response/default_responses.rs
CHANGED
@@ -2,84 +2,84 @@ use super::{ContentSource, DefaultFormat, ErrorResponse};
|
|
2
2
|
use crate::server::http_message_types::ResponseFormat;
|
3
3
|
use bytes::Bytes;
|
4
4
|
use http_body_util::{combinators::BoxBody, Full};
|
5
|
-
use std::
|
5
|
+
use std::convert::Infallible;
|
6
6
|
|
7
7
|
impl DefaultFormat {
|
8
8
|
pub fn response_for_code(&self, code: u16) -> ContentSource {
|
9
9
|
match self {
|
10
10
|
DefaultFormat::Plaintext => match code {
|
11
|
-
500 => ContentSource::Static(
|
12
|
-
404 => ContentSource::Static(
|
13
|
-
401 => ContentSource::Static(
|
14
|
-
403 => ContentSource::Static(
|
15
|
-
413 => ContentSource::Static(
|
16
|
-
429 => ContentSource::Static(
|
17
|
-
502 => ContentSource::Static(
|
18
|
-
503 => ContentSource::Static(
|
19
|
-
504 => ContentSource::Static(
|
20
|
-
_ => ContentSource::Static(
|
11
|
+
500 => ContentSource::Static(Full::new("500 Internal Error".into())),
|
12
|
+
404 => ContentSource::Static(Full::new("404 Not Found".into())),
|
13
|
+
401 => ContentSource::Static(Full::new("401 Unauthorized".into())),
|
14
|
+
403 => ContentSource::Static(Full::new("403 Forbidden".into())),
|
15
|
+
413 => ContentSource::Static(Full::new("413 Payload Too Large".into())),
|
16
|
+
429 => ContentSource::Static(Full::new("429 Too Many Requests".into())),
|
17
|
+
502 => ContentSource::Static(Full::new("502 Bad Gateway".into())),
|
18
|
+
503 => ContentSource::Static(Full::new("503 Service Unavailable".into())),
|
19
|
+
504 => ContentSource::Static(Full::new("504 Gateway Timeout".into())),
|
20
|
+
_ => ContentSource::Static(Full::new("Unexpected Error".into())),
|
21
21
|
},
|
22
22
|
DefaultFormat::Html => match code {
|
23
|
-
500 => ContentSource::Static(
|
23
|
+
500 => ContentSource::Static(Full::new(
|
24
24
|
include_str!("../../../../default_responses/html/500.html").into(),
|
25
25
|
)),
|
26
|
-
404 => ContentSource::Static(
|
26
|
+
404 => ContentSource::Static(Full::new(
|
27
27
|
include_str!("../../../../default_responses/html/404.html").into(),
|
28
28
|
)),
|
29
|
-
401 => ContentSource::Static(
|
29
|
+
401 => ContentSource::Static(Full::new(
|
30
30
|
include_str!("../../../../default_responses/html/401.html").into(),
|
31
31
|
)),
|
32
|
-
403 => ContentSource::Static(
|
32
|
+
403 => ContentSource::Static(Full::new(
|
33
33
|
include_str!("../../../../default_responses/html/403.html").into(),
|
34
34
|
)),
|
35
|
-
413 => ContentSource::Static(
|
35
|
+
413 => ContentSource::Static(Full::new(
|
36
36
|
include_str!("../../../../default_responses/html/413.html").into(),
|
37
37
|
)),
|
38
|
-
429 => ContentSource::Static(
|
38
|
+
429 => ContentSource::Static(Full::new(
|
39
39
|
include_str!("../../../../default_responses/html/429.html").into(),
|
40
40
|
)),
|
41
|
-
502 => ContentSource::Static(
|
41
|
+
502 => ContentSource::Static(Full::new(
|
42
42
|
include_str!("../../../../default_responses/html/502.html").into(),
|
43
43
|
)),
|
44
|
-
503 => ContentSource::Static(
|
44
|
+
503 => ContentSource::Static(Full::new(
|
45
45
|
include_str!("../../../../default_responses/html/503.html").into(),
|
46
46
|
)),
|
47
|
-
504 => ContentSource::Static(
|
47
|
+
504 => ContentSource::Static(Full::new(
|
48
48
|
include_str!("../../../../default_responses/html/504.html").into(),
|
49
49
|
)),
|
50
|
-
_ => ContentSource::Static(
|
50
|
+
_ => ContentSource::Static(Full::new(
|
51
51
|
include_str!("../../../../default_responses/html/500.html").into(),
|
52
52
|
)),
|
53
53
|
},
|
54
54
|
DefaultFormat::Json => match code {
|
55
|
-
500 => ContentSource::Static(
|
55
|
+
500 => ContentSource::Static(Full::new(
|
56
56
|
include_str!("../../../../default_responses/json/500.json").into(),
|
57
57
|
)),
|
58
|
-
404 => ContentSource::Static(
|
58
|
+
404 => ContentSource::Static(Full::new(
|
59
59
|
include_str!("../../../../default_responses/json/404.json").into(),
|
60
60
|
)),
|
61
|
-
401 => ContentSource::Static(
|
61
|
+
401 => ContentSource::Static(Full::new(
|
62
62
|
include_str!("../../../../default_responses/json/401.json").into(),
|
63
63
|
)),
|
64
|
-
403 => ContentSource::Static(
|
64
|
+
403 => ContentSource::Static(Full::new(
|
65
65
|
include_str!("../../../../default_responses/json/403.json").into(),
|
66
66
|
)),
|
67
|
-
413 => ContentSource::Static(
|
67
|
+
413 => ContentSource::Static(Full::new(
|
68
68
|
include_str!("../../../../default_responses/json/413.json").into(),
|
69
69
|
)),
|
70
|
-
429 => ContentSource::Static(
|
70
|
+
429 => ContentSource::Static(Full::new(
|
71
71
|
include_str!("../../../../default_responses/json/429.json").into(),
|
72
72
|
)),
|
73
|
-
502 => ContentSource::Static(
|
73
|
+
502 => ContentSource::Static(Full::new(
|
74
74
|
include_str!("../../../../default_responses/json/502.json").into(),
|
75
75
|
)),
|
76
|
-
503 => ContentSource::Static(
|
76
|
+
503 => ContentSource::Static(Full::new(
|
77
77
|
include_str!("../../../../default_responses/json/503.json").into(),
|
78
78
|
)),
|
79
|
-
504 => ContentSource::Static(
|
79
|
+
504 => ContentSource::Static(Full::new(
|
80
80
|
include_str!("../../../../default_responses/json/504.json").into(),
|
81
81
|
)),
|
82
|
-
_ => ContentSource::Static(
|
82
|
+
_ => ContentSource::Static(Full::new("Unexpected Error".into())),
|
83
83
|
},
|
84
84
|
}
|
85
85
|
}
|
@@ -94,9 +94,7 @@ impl ErrorResponse {
|
|
94
94
|
};
|
95
95
|
match source {
|
96
96
|
ContentSource::Inline(bytes) => BoxBody::new(Full::new(Bytes::from(bytes))),
|
97
|
-
ContentSource::Static(
|
98
|
-
BoxBody::new(Full::new(Bytes::from(String::from(text.as_str()))))
|
99
|
-
}
|
97
|
+
ContentSource::Static(bytes) => BoxBody::new(bytes),
|
100
98
|
ContentSource::File(_) => BoxBody::new(Full::new(Bytes::from("Unexpected error"))),
|
101
99
|
}
|
102
100
|
}
|
@@ -5,7 +5,6 @@ use http_body_util::{combinators::BoxBody, Full};
|
|
5
5
|
use serde::{Deserialize, Deserializer};
|
6
6
|
use std::convert::Infallible;
|
7
7
|
use std::path::PathBuf;
|
8
|
-
use std::sync::Arc;
|
9
8
|
use tracing::warn;
|
10
9
|
|
11
10
|
use crate::server::http_message_types::{HttpResponse, ResponseFormat};
|
@@ -20,7 +19,7 @@ pub enum ContentSource {
|
|
20
19
|
File(PathBuf),
|
21
20
|
#[serde(rename(deserialize = "static"))]
|
22
21
|
#[serde(skip_deserializing)]
|
23
|
-
Static(
|
22
|
+
Static(Full<Bytes>),
|
24
23
|
}
|
25
24
|
|
26
25
|
#[derive(Debug, Clone, Deserialize, Default)]
|
@@ -151,13 +150,13 @@ impl ErrorResponse {
|
|
151
150
|
return BoxBody::new(Full::new(Bytes::from(text.clone())));
|
152
151
|
}
|
153
152
|
Some(ContentSource::Static(text)) => {
|
154
|
-
return BoxBody::new(
|
153
|
+
return BoxBody::new(text.clone());
|
155
154
|
}
|
156
155
|
Some(ContentSource::File(path)) => {
|
157
156
|
// Convert the PathBuf to a &str (assumes valid UTF-8).
|
158
157
|
if let Some(path_str) = path.to_str() {
|
159
158
|
let response = ROOT_STATIC_FILE_SERVER
|
160
|
-
.serve_single(path_str, accept
|
159
|
+
.serve_single(path_str, accept, &[])
|
161
160
|
.await;
|
162
161
|
if response.status().is_success() {
|
163
162
|
return response.into_body();
|
@@ -43,12 +43,6 @@ pub struct ETag {
|
|
43
43
|
pub algorithm: HashAlgorithm,
|
44
44
|
#[serde(default)]
|
45
45
|
pub min_body_size: usize,
|
46
|
-
#[serde(default = "default_true")]
|
47
|
-
pub handle_if_none_match: bool,
|
48
|
-
}
|
49
|
-
|
50
|
-
fn default_true() -> bool {
|
51
|
-
true
|
52
46
|
}
|
53
47
|
|
54
48
|
#[async_trait]
|
@@ -59,14 +53,13 @@ impl MiddlewareLayer for ETag {
|
|
59
53
|
context: &mut HttpRequestContext,
|
60
54
|
) -> Result<Either<HttpRequest, HttpResponse>> {
|
61
55
|
// Store if-none-match header in context if present for later use in after hook
|
62
|
-
if
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
context.set_if_none_match(Some(etag_value.to_string()));
|
67
|
-
}
|
56
|
+
if let Some(if_none_match) = req.headers().get(header::IF_NONE_MATCH) {
|
57
|
+
debug!(target: "middleware::etag", "Received If-None-Match header: {:?}", if_none_match);
|
58
|
+
if let Ok(etag_value) = if_none_match.to_str() {
|
59
|
+
context.set_if_none_match(Some(etag_value.to_string()));
|
68
60
|
}
|
69
61
|
}
|
62
|
+
|
70
63
|
Ok(Either::Left(req))
|
71
64
|
}
|
72
65
|
|
@@ -85,11 +78,6 @@ impl MiddlewareLayer for ETag {
|
|
85
78
|
}
|
86
79
|
}
|
87
80
|
|
88
|
-
if resp.headers().contains_key(header::ETAG) {
|
89
|
-
debug!(target: "middleware::etag", "Forwarding response with existing ETag");
|
90
|
-
return resp;
|
91
|
-
}
|
92
|
-
|
93
81
|
if let Some(cache_control) = resp.headers().get(header::CACHE_CONTROL) {
|
94
82
|
if let Ok(cache_control_str) = cache_control.to_str() {
|
95
83
|
if cache_control_str.contains("no-store") {
|
@@ -155,28 +143,26 @@ impl MiddlewareLayer for ETag {
|
|
155
143
|
formatted_etag
|
156
144
|
};
|
157
145
|
|
158
|
-
if
|
159
|
-
if
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
&header::
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
)
|
175
|
-
not_modified.headers_mut().insert(name, value.clone());
|
176
|
-
}
|
146
|
+
if let Some(if_none_match) = context.get_if_none_match() {
|
147
|
+
if if_none_match == etag_value || if_none_match == "*" {
|
148
|
+
// Return 304 Not Modified without the body
|
149
|
+
let mut not_modified = Response::new(BoxBody::new(Empty::new()));
|
150
|
+
*not_modified.status_mut() = StatusCode::NOT_MODIFIED;
|
151
|
+
// Copy headers we want to preserve
|
152
|
+
for (name, value) in parts.headers.iter() {
|
153
|
+
if matches!(
|
154
|
+
name,
|
155
|
+
&header::CACHE_CONTROL
|
156
|
+
| &header::CONTENT_LOCATION
|
157
|
+
| &header::DATE
|
158
|
+
| &header::ETAG
|
159
|
+
| &header::EXPIRES
|
160
|
+
| &header::VARY
|
161
|
+
) {
|
162
|
+
not_modified.headers_mut().insert(name, value.clone());
|
177
163
|
}
|
178
|
-
return not_modified;
|
179
164
|
}
|
165
|
+
return not_modified;
|
180
166
|
}
|
181
167
|
}
|
182
168
|
|
@@ -190,7 +176,6 @@ impl Default for ETag {
|
|
190
176
|
r#type: ETagType::Strong,
|
191
177
|
algorithm: HashAlgorithm::Sha256,
|
192
178
|
min_body_size: 0,
|
193
|
-
handle_if_none_match: true,
|
194
179
|
}
|
195
180
|
}
|
196
181
|
}
|
@@ -3,6 +3,7 @@ use either::Either;
|
|
3
3
|
use itsi_tracing::*;
|
4
4
|
use magnus::error::Result;
|
5
5
|
use serde::Deserialize;
|
6
|
+
use tracing::enabled;
|
6
7
|
|
7
8
|
use crate::server::http_message_types::{HttpRequest, HttpResponse};
|
8
9
|
use crate::services::itsi_http_service::HttpRequestContext;
|
@@ -39,18 +40,6 @@ pub enum LogMiddlewareLevel {
|
|
39
40
|
Error,
|
40
41
|
}
|
41
42
|
|
42
|
-
impl LogMiddlewareLevel {
|
43
|
-
pub fn log(&self, message: String) {
|
44
|
-
match self {
|
45
|
-
LogMiddlewareLevel::Trace => trace!(target: "middleware::log_requests", message),
|
46
|
-
LogMiddlewareLevel::Debug => debug!(target: "middleware::log_requests", message),
|
47
|
-
LogMiddlewareLevel::Info => info!(target: "middleware::log_requests", message),
|
48
|
-
LogMiddlewareLevel::Warn => warn!(target: "middleware::log_requests", message),
|
49
|
-
LogMiddlewareLevel::Error => error!(target: "middleware::log_requests", message),
|
50
|
-
}
|
51
|
-
}
|
52
|
-
}
|
53
|
-
|
54
43
|
#[async_trait]
|
55
44
|
impl MiddlewareLayer for LogRequests {
|
56
45
|
async fn initialize(&self) -> Result<()> {
|
@@ -64,7 +53,38 @@ impl MiddlewareLayer for LogRequests {
|
|
64
53
|
) -> Result<Either<HttpRequest, HttpResponse>> {
|
65
54
|
context.init_logging_params();
|
66
55
|
if let Some(LogConfig { level, format }) = self.before.as_ref() {
|
67
|
-
level
|
56
|
+
match level {
|
57
|
+
LogMiddlewareLevel::Trace => {
|
58
|
+
if enabled!(target: "middleware::log_requests", tracing::Level::TRACE) {
|
59
|
+
let message = format.rewrite_request(&req, context);
|
60
|
+
trace!(target: "middleware::log_requests", message);
|
61
|
+
}
|
62
|
+
}
|
63
|
+
LogMiddlewareLevel::Debug => {
|
64
|
+
if enabled!(target: "middleware::log_requests", tracing::Level::DEBUG) {
|
65
|
+
let message = format.rewrite_request(&req, context);
|
66
|
+
debug!(target: "middleware::log_requests", message);
|
67
|
+
}
|
68
|
+
}
|
69
|
+
LogMiddlewareLevel::Info => {
|
70
|
+
if enabled!(target: "middleware::log_requests", tracing::Level::INFO) {
|
71
|
+
let message = format.rewrite_request(&req, context);
|
72
|
+
info!(target: "middleware::log_requests", message);
|
73
|
+
}
|
74
|
+
}
|
75
|
+
LogMiddlewareLevel::Warn => {
|
76
|
+
if enabled!(target: "middleware::log_requests", tracing::Level::WARN) {
|
77
|
+
let message = format.rewrite_request(&req, context);
|
78
|
+
warn!(target: "middleware::log_requests", message);
|
79
|
+
}
|
80
|
+
}
|
81
|
+
LogMiddlewareLevel::Error => {
|
82
|
+
if enabled!(target: "middleware::log_requests", tracing::Level::ERROR) {
|
83
|
+
let message = format.rewrite_request(&req, context);
|
84
|
+
error!(target: "middleware::log_requests", message);
|
85
|
+
}
|
86
|
+
}
|
87
|
+
}
|
68
88
|
}
|
69
89
|
|
70
90
|
Ok(Either::Left(req))
|
@@ -72,7 +92,38 @@ impl MiddlewareLayer for LogRequests {
|
|
72
92
|
|
73
93
|
async fn after(&self, resp: HttpResponse, context: &mut HttpRequestContext) -> HttpResponse {
|
74
94
|
if let Some(LogConfig { level, format }) = self.after.as_ref() {
|
75
|
-
level
|
95
|
+
match level {
|
96
|
+
LogMiddlewareLevel::Trace => {
|
97
|
+
if enabled!(target: "middleware::log_requests", tracing::Level::TRACE) {
|
98
|
+
let message = format.rewrite_response(&resp, context);
|
99
|
+
trace!(target: "middleware::log_requests", message);
|
100
|
+
}
|
101
|
+
}
|
102
|
+
LogMiddlewareLevel::Debug => {
|
103
|
+
if enabled!(target: "middleware::log_requests", tracing::Level::DEBUG) {
|
104
|
+
let message = format.rewrite_response(&resp, context);
|
105
|
+
debug!(target: "middleware::log_requests", message);
|
106
|
+
}
|
107
|
+
}
|
108
|
+
LogMiddlewareLevel::Info => {
|
109
|
+
if enabled!(target: "middleware::log_requests", tracing::Level::INFO) {
|
110
|
+
let message = format.rewrite_response(&resp, context);
|
111
|
+
info!(target: "middleware::log_requests", message);
|
112
|
+
}
|
113
|
+
}
|
114
|
+
LogMiddlewareLevel::Warn => {
|
115
|
+
if enabled!(target: "middleware::log_requests", tracing::Level::WARN) {
|
116
|
+
let message = format.rewrite_response(&resp, context);
|
117
|
+
warn!(target: "middleware::log_requests", message);
|
118
|
+
}
|
119
|
+
}
|
120
|
+
LogMiddlewareLevel::Error => {
|
121
|
+
if enabled!(target: "middleware::log_requests", tracing::Level::ERROR) {
|
122
|
+
let message = format.rewrite_response(&resp, context);
|
123
|
+
error!(target: "middleware::log_requests", message);
|
124
|
+
}
|
125
|
+
}
|
126
|
+
}
|
76
127
|
}
|
77
128
|
|
78
129
|
resp
|
@@ -37,7 +37,7 @@ impl MiddlewareLayer for MaxBody {
|
|
37
37
|
async fn after(&self, resp: HttpResponse, context: &mut HttpRequestContext) -> HttpResponse {
|
38
38
|
if resp.status() == StatusCode::PAYLOAD_TOO_LARGE {
|
39
39
|
self.error_response
|
40
|
-
.to_http_response(context.response_format()
|
40
|
+
.to_http_response(*context.response_format())
|
41
41
|
.await
|
42
42
|
} else {
|
43
43
|
resp
|
@@ -303,7 +303,7 @@ impl MiddlewareLayer for Proxy {
|
|
303
303
|
let url = self.to.rewrite_request(&req, context);
|
304
304
|
|
305
305
|
let accept: ResponseFormat = req.accept().into();
|
306
|
-
let error_response = self.error_response.to_http_response(accept
|
306
|
+
let error_response = self.error_response.to_http_response(accept).await;
|
307
307
|
|
308
308
|
let destination = match Url::parse(&url) {
|
309
309
|
Ok(dest) => dest,
|
@@ -6,6 +6,7 @@ use crate::services::rate_limiter::{
|
|
6
6
|
};
|
7
7
|
use async_trait::async_trait;
|
8
8
|
use either::Either;
|
9
|
+
use http::{HeaderName, HeaderValue};
|
9
10
|
use magnus::error::Result;
|
10
11
|
use serde::Deserialize;
|
11
12
|
use std::collections::HashMap;
|
@@ -24,6 +25,8 @@ pub struct RateLimit {
|
|
24
25
|
pub trusted_proxies: HashMap<String, TokenSource>,
|
25
26
|
#[serde(default = "too_many_requests_error_response")]
|
26
27
|
pub error_response: ErrorResponse,
|
28
|
+
#[serde(skip)]
|
29
|
+
pub limit_header_value: OnceLock<HeaderValue>,
|
27
30
|
}
|
28
31
|
|
29
32
|
fn too_many_requests_error_response() -> ErrorResponse {
|
@@ -38,6 +41,12 @@ pub enum RateLimitKey {
|
|
38
41
|
Parameter(TokenSource),
|
39
42
|
}
|
40
43
|
|
44
|
+
static X_RATELIMIT_LIMIT: HeaderName = HeaderName::from_static("x-ratelimit-limit");
|
45
|
+
static X_RATELIMIT_REMAINING: HeaderName = HeaderName::from_static("x-ratelimit-remaining");
|
46
|
+
static X_RATELIMIT_RESET: HeaderName = HeaderName::from_static("x-ratelimit-reset");
|
47
|
+
static RETRY_AFTER: HeaderName = HeaderName::from_static("retry-after");
|
48
|
+
static ZERO_VALUE: HeaderValue = HeaderValue::from_static("0");
|
49
|
+
|
41
50
|
#[async_trait]
|
42
51
|
impl MiddlewareLayer for RateLimit {
|
43
52
|
async fn initialize(&self) -> Result<()> {
|
@@ -46,6 +55,9 @@ impl MiddlewareLayer for RateLimit {
|
|
46
55
|
if let Ok(limiter) = get_rate_limiter(&self.store_config).await {
|
47
56
|
let _ = self.rate_limiter.set(limiter);
|
48
57
|
}
|
58
|
+
self.limit_header_value
|
59
|
+
.set(self.requests.to_string().parse().unwrap())
|
60
|
+
.ok();
|
49
61
|
Ok(())
|
50
62
|
}
|
51
63
|
|
@@ -58,8 +70,7 @@ impl MiddlewareLayer for RateLimit {
|
|
58
70
|
let key_value = match &self.key {
|
59
71
|
RateLimitKey::SocketAddress => {
|
60
72
|
// Use the socket address from the context
|
61
|
-
if self.trusted_proxies.
|
62
|
-
let source = self.trusted_proxies.get(&context.addr).unwrap();
|
73
|
+
if let Some(source) = self.trusted_proxies.get(&context.addr) {
|
63
74
|
source.extract_token(&req).unwrap_or(&context.addr)
|
64
75
|
} else {
|
65
76
|
&context.addr
|
@@ -114,18 +125,20 @@ impl MiddlewareLayer for RateLimit {
|
|
114
125
|
.error_response
|
115
126
|
.to_http_response(req.accept().into())
|
116
127
|
.await;
|
128
|
+
let ttl_header_value: HeaderValue = ttl.to_string().parse().unwrap();
|
129
|
+
response.headers_mut().insert(
|
130
|
+
X_RATELIMIT_LIMIT.clone(),
|
131
|
+
self.limit_header_value.get().unwrap().clone(),
|
132
|
+
);
|
117
133
|
response
|
118
134
|
.headers_mut()
|
119
|
-
.insert(
|
120
|
-
response
|
121
|
-
.headers_mut()
|
122
|
-
.insert("X-RateLimit-Remaining", "0".parse().unwrap());
|
135
|
+
.insert(X_RATELIMIT_REMAINING.clone(), ZERO_VALUE.clone());
|
123
136
|
response
|
124
137
|
.headers_mut()
|
125
|
-
.insert(
|
138
|
+
.insert(X_RATELIMIT_RESET.clone(), ttl_header_value.clone());
|
126
139
|
response
|
127
140
|
.headers_mut()
|
128
|
-
.insert(
|
141
|
+
.insert(RETRY_AFTER.clone(), ttl_header_value);
|
129
142
|
Ok(Either::Right(response))
|
130
143
|
}
|
131
144
|
Err(e) => {
|
@@ -119,11 +119,7 @@ impl MiddlewareLayer for RubyApp {
|
|
119
119
|
if self.sendfile {
|
120
120
|
if let Some(sendfile_header) = resp.headers().get("X-Sendfile") {
|
121
121
|
return ROOT_STATIC_FILE_SERVER
|
122
|
-
.serve_single_abs(
|
123
|
-
sendfile_header.to_str().unwrap(),
|
124
|
-
context.accept.clone(),
|
125
|
-
&[],
|
126
|
-
)
|
122
|
+
.serve_single_abs(sendfile_header.to_str().unwrap(), context.accept, &[])
|
127
123
|
.await;
|
128
124
|
}
|
129
125
|
}
|
@@ -21,6 +21,10 @@ pub struct StaticResponse {
|
|
21
21
|
body: Vec<u8>,
|
22
22
|
#[serde(skip)]
|
23
23
|
header_map: OnceLock<HeaderMap>,
|
24
|
+
#[serde(skip)]
|
25
|
+
body_bytes: OnceLock<Full<Bytes>>,
|
26
|
+
#[serde(skip)]
|
27
|
+
status_code: OnceLock<StatusCode>,
|
24
28
|
}
|
25
29
|
|
26
30
|
#[async_trait]
|
@@ -35,6 +39,12 @@ impl MiddlewareLayer for StaticResponse {
|
|
35
39
|
self.header_map
|
36
40
|
.set(header_map)
|
37
41
|
.map_err(|_| ItsiError::new("Failed to set headers"))?;
|
42
|
+
self.body_bytes
|
43
|
+
.set(Full::new(Bytes::from(self.body.clone())))
|
44
|
+
.map_err(|_| ItsiError::new("Failed to set body bytes"))?;
|
45
|
+
self.status_code
|
46
|
+
.set(StatusCode::from_u16(self.code).unwrap_or(StatusCode::OK))
|
47
|
+
.map_err(|_| ItsiError::new("Failed to set status code"))?;
|
38
48
|
Ok(())
|
39
49
|
}
|
40
50
|
|
@@ -43,9 +53,8 @@ impl MiddlewareLayer for StaticResponse {
|
|
43
53
|
_req: HttpRequest,
|
44
54
|
_context: &mut HttpRequestContext,
|
45
55
|
) -> Result<Either<HttpRequest, HttpResponse>> {
|
46
|
-
let mut resp = Response::new(BoxBody::new(
|
47
|
-
|
48
|
-
*resp.status_mut() = status;
|
56
|
+
let mut resp = Response::new(BoxBody::new(self.body_bytes.get().unwrap().clone()));
|
57
|
+
*resp.status_mut() = *self.status_code.get().unwrap();
|
49
58
|
*resp.headers_mut() = self.header_map.get().unwrap().clone();
|
50
59
|
|
51
60
|
Ok(Either::Right(resp))
|
@@ -42,7 +42,8 @@ impl Default for ProcessWorker {
|
|
42
42
|
}
|
43
43
|
}
|
44
44
|
|
45
|
-
static CORE_IDS: LazyLock<Vec<CoreId>> =
|
45
|
+
pub static CORE_IDS: LazyLock<Vec<CoreId>> =
|
46
|
+
LazyLock::new(|| core_affinity::get_core_ids().unwrap());
|
46
47
|
|
47
48
|
impl ProcessWorker {
|
48
49
|
#[instrument(skip(self, cluster_template), fields(self.worker_id = %self.worker_id))]
|