spikard 0.3.2 → 0.3.4

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.
Files changed (180) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE +1 -1
  3. data/README.md +659 -659
  4. data/ext/spikard_rb/Cargo.toml +17 -17
  5. data/ext/spikard_rb/extconf.rb +10 -10
  6. data/ext/spikard_rb/src/lib.rs +6 -6
  7. data/lib/spikard/app.rb +386 -386
  8. data/lib/spikard/background.rb +27 -27
  9. data/lib/spikard/config.rb +396 -396
  10. data/lib/spikard/converters.rb +13 -13
  11. data/lib/spikard/handler_wrapper.rb +113 -113
  12. data/lib/spikard/provide.rb +214 -214
  13. data/lib/spikard/response.rb +173 -173
  14. data/lib/spikard/schema.rb +243 -243
  15. data/lib/spikard/sse.rb +111 -111
  16. data/lib/spikard/streaming_response.rb +44 -44
  17. data/lib/spikard/testing.rb +221 -221
  18. data/lib/spikard/upload_file.rb +131 -131
  19. data/lib/spikard/version.rb +5 -5
  20. data/lib/spikard/websocket.rb +59 -59
  21. data/lib/spikard.rb +43 -43
  22. data/sig/spikard.rbs +360 -360
  23. data/vendor/crates/spikard-core/Cargo.toml +40 -40
  24. data/vendor/crates/spikard-core/src/bindings/mod.rs +3 -3
  25. data/vendor/crates/spikard-core/src/bindings/response.rs +133 -133
  26. data/vendor/crates/spikard-core/src/debug.rs +63 -63
  27. data/vendor/crates/spikard-core/src/di/container.rs +726 -726
  28. data/vendor/crates/spikard-core/src/di/dependency.rs +273 -273
  29. data/vendor/crates/spikard-core/src/di/error.rs +118 -118
  30. data/vendor/crates/spikard-core/src/di/factory.rs +538 -538
  31. data/vendor/crates/spikard-core/src/di/graph.rs +545 -545
  32. data/vendor/crates/spikard-core/src/di/mod.rs +192 -192
  33. data/vendor/crates/spikard-core/src/di/resolved.rs +411 -411
  34. data/vendor/crates/spikard-core/src/di/value.rs +283 -283
  35. data/vendor/crates/spikard-core/src/errors.rs +39 -39
  36. data/vendor/crates/spikard-core/src/http.rs +153 -153
  37. data/vendor/crates/spikard-core/src/lib.rs +29 -29
  38. data/vendor/crates/spikard-core/src/lifecycle.rs +422 -422
  39. data/vendor/crates/spikard-core/src/parameters.rs +722 -722
  40. data/vendor/crates/spikard-core/src/problem.rs +310 -310
  41. data/vendor/crates/spikard-core/src/request_data.rs +189 -189
  42. data/vendor/crates/spikard-core/src/router.rs +249 -249
  43. data/vendor/crates/spikard-core/src/schema_registry.rs +183 -183
  44. data/vendor/crates/spikard-core/src/type_hints.rs +304 -304
  45. data/vendor/crates/spikard-core/src/validation.rs +699 -699
  46. data/vendor/crates/spikard-http/Cargo.toml +58 -58
  47. data/vendor/crates/spikard-http/src/auth.rs +247 -247
  48. data/vendor/crates/spikard-http/src/background.rs +249 -249
  49. data/vendor/crates/spikard-http/src/bindings/mod.rs +3 -3
  50. data/vendor/crates/spikard-http/src/bindings/response.rs +1 -1
  51. data/vendor/crates/spikard-http/src/body_metadata.rs +8 -8
  52. data/vendor/crates/spikard-http/src/cors.rs +490 -490
  53. data/vendor/crates/spikard-http/src/debug.rs +63 -63
  54. data/vendor/crates/spikard-http/src/di_handler.rs +423 -423
  55. data/vendor/crates/spikard-http/src/handler_response.rs +190 -190
  56. data/vendor/crates/spikard-http/src/handler_trait.rs +228 -228
  57. data/vendor/crates/spikard-http/src/handler_trait_tests.rs +284 -284
  58. data/vendor/crates/spikard-http/src/lib.rs +529 -529
  59. data/vendor/crates/spikard-http/src/lifecycle/adapter.rs +149 -149
  60. data/vendor/crates/spikard-http/src/lifecycle.rs +428 -428
  61. data/vendor/crates/spikard-http/src/middleware/mod.rs +285 -285
  62. data/vendor/crates/spikard-http/src/middleware/multipart.rs +86 -86
  63. data/vendor/crates/spikard-http/src/middleware/urlencoded.rs +147 -147
  64. data/vendor/crates/spikard-http/src/middleware/validation.rs +287 -287
  65. data/vendor/crates/spikard-http/src/openapi/mod.rs +309 -309
  66. data/vendor/crates/spikard-http/src/openapi/parameter_extraction.rs +190 -190
  67. data/vendor/crates/spikard-http/src/openapi/schema_conversion.rs +308 -308
  68. data/vendor/crates/spikard-http/src/openapi/spec_generation.rs +195 -195
  69. data/vendor/crates/spikard-http/src/parameters.rs +1 -1
  70. data/vendor/crates/spikard-http/src/problem.rs +1 -1
  71. data/vendor/crates/spikard-http/src/query_parser.rs +369 -369
  72. data/vendor/crates/spikard-http/src/response.rs +399 -399
  73. data/vendor/crates/spikard-http/src/router.rs +1 -1
  74. data/vendor/crates/spikard-http/src/schema_registry.rs +1 -1
  75. data/vendor/crates/spikard-http/src/server/handler.rs +87 -87
  76. data/vendor/crates/spikard-http/src/server/lifecycle_execution.rs +98 -98
  77. data/vendor/crates/spikard-http/src/server/mod.rs +805 -805
  78. data/vendor/crates/spikard-http/src/server/request_extraction.rs +119 -119
  79. data/vendor/crates/spikard-http/src/sse.rs +447 -447
  80. data/vendor/crates/spikard-http/src/testing/form.rs +14 -14
  81. data/vendor/crates/spikard-http/src/testing/multipart.rs +60 -60
  82. data/vendor/crates/spikard-http/src/testing/test_client.rs +285 -285
  83. data/vendor/crates/spikard-http/src/testing.rs +377 -377
  84. data/vendor/crates/spikard-http/src/type_hints.rs +1 -1
  85. data/vendor/crates/spikard-http/src/validation.rs +1 -1
  86. data/vendor/crates/spikard-http/src/websocket.rs +324 -324
  87. data/vendor/crates/spikard-rb/Cargo.toml +42 -42
  88. data/vendor/crates/spikard-rb/build.rs +8 -8
  89. data/vendor/crates/spikard-rb/src/background.rs +63 -63
  90. data/vendor/crates/spikard-rb/src/config.rs +294 -294
  91. data/vendor/crates/spikard-rb/src/conversion.rs +453 -453
  92. data/vendor/crates/spikard-rb/src/di.rs +409 -409
  93. data/vendor/crates/spikard-rb/src/handler.rs +625 -625
  94. data/vendor/crates/spikard-rb/src/lib.rs +2771 -2771
  95. data/vendor/crates/spikard-rb/src/lifecycle.rs +274 -274
  96. data/vendor/crates/spikard-rb/src/server.rs +283 -283
  97. data/vendor/crates/spikard-rb/src/sse.rs +231 -231
  98. data/vendor/crates/spikard-rb/src/test_client.rs +404 -404
  99. data/vendor/crates/spikard-rb/src/test_sse.rs +143 -143
  100. data/vendor/crates/spikard-rb/src/test_websocket.rs +221 -221
  101. data/vendor/crates/spikard-rb/src/websocket.rs +233 -233
  102. data/vendor/spikard-core/Cargo.toml +40 -40
  103. data/vendor/spikard-core/src/bindings/mod.rs +3 -3
  104. data/vendor/spikard-core/src/bindings/response.rs +133 -133
  105. data/vendor/spikard-core/src/debug.rs +63 -63
  106. data/vendor/spikard-core/src/di/container.rs +726 -726
  107. data/vendor/spikard-core/src/di/dependency.rs +273 -273
  108. data/vendor/spikard-core/src/di/error.rs +118 -118
  109. data/vendor/spikard-core/src/di/factory.rs +538 -538
  110. data/vendor/spikard-core/src/di/graph.rs +545 -545
  111. data/vendor/spikard-core/src/di/mod.rs +192 -192
  112. data/vendor/spikard-core/src/di/resolved.rs +411 -411
  113. data/vendor/spikard-core/src/di/value.rs +283 -283
  114. data/vendor/spikard-core/src/http.rs +153 -153
  115. data/vendor/spikard-core/src/lib.rs +28 -28
  116. data/vendor/spikard-core/src/lifecycle.rs +422 -422
  117. data/vendor/spikard-core/src/parameters.rs +719 -719
  118. data/vendor/spikard-core/src/problem.rs +310 -310
  119. data/vendor/spikard-core/src/request_data.rs +189 -189
  120. data/vendor/spikard-core/src/router.rs +249 -249
  121. data/vendor/spikard-core/src/schema_registry.rs +183 -183
  122. data/vendor/spikard-core/src/type_hints.rs +304 -304
  123. data/vendor/spikard-core/src/validation.rs +699 -699
  124. data/vendor/spikard-http/Cargo.toml +58 -58
  125. data/vendor/spikard-http/src/auth.rs +247 -247
  126. data/vendor/spikard-http/src/background.rs +249 -249
  127. data/vendor/spikard-http/src/bindings/mod.rs +3 -3
  128. data/vendor/spikard-http/src/bindings/response.rs +1 -1
  129. data/vendor/spikard-http/src/body_metadata.rs +8 -8
  130. data/vendor/spikard-http/src/cors.rs +490 -490
  131. data/vendor/spikard-http/src/debug.rs +63 -63
  132. data/vendor/spikard-http/src/di_handler.rs +423 -423
  133. data/vendor/spikard-http/src/handler_response.rs +190 -190
  134. data/vendor/spikard-http/src/handler_trait.rs +228 -228
  135. data/vendor/spikard-http/src/handler_trait_tests.rs +284 -284
  136. data/vendor/spikard-http/src/lib.rs +529 -529
  137. data/vendor/spikard-http/src/lifecycle/adapter.rs +149 -149
  138. data/vendor/spikard-http/src/lifecycle.rs +428 -428
  139. data/vendor/spikard-http/src/middleware/mod.rs +285 -285
  140. data/vendor/spikard-http/src/middleware/multipart.rs +86 -86
  141. data/vendor/spikard-http/src/middleware/urlencoded.rs +147 -147
  142. data/vendor/spikard-http/src/middleware/validation.rs +287 -287
  143. data/vendor/spikard-http/src/openapi/mod.rs +309 -309
  144. data/vendor/spikard-http/src/openapi/parameter_extraction.rs +190 -190
  145. data/vendor/spikard-http/src/openapi/schema_conversion.rs +308 -308
  146. data/vendor/spikard-http/src/openapi/spec_generation.rs +195 -195
  147. data/vendor/spikard-http/src/parameters.rs +1 -1
  148. data/vendor/spikard-http/src/problem.rs +1 -1
  149. data/vendor/spikard-http/src/query_parser.rs +369 -369
  150. data/vendor/spikard-http/src/response.rs +399 -399
  151. data/vendor/spikard-http/src/router.rs +1 -1
  152. data/vendor/spikard-http/src/schema_registry.rs +1 -1
  153. data/vendor/spikard-http/src/server/handler.rs +80 -80
  154. data/vendor/spikard-http/src/server/lifecycle_execution.rs +98 -98
  155. data/vendor/spikard-http/src/server/mod.rs +805 -805
  156. data/vendor/spikard-http/src/server/request_extraction.rs +119 -119
  157. data/vendor/spikard-http/src/sse.rs +447 -447
  158. data/vendor/spikard-http/src/testing/form.rs +14 -14
  159. data/vendor/spikard-http/src/testing/multipart.rs +60 -60
  160. data/vendor/spikard-http/src/testing/test_client.rs +285 -285
  161. data/vendor/spikard-http/src/testing.rs +377 -377
  162. data/vendor/spikard-http/src/type_hints.rs +1 -1
  163. data/vendor/spikard-http/src/validation.rs +1 -1
  164. data/vendor/spikard-http/src/websocket.rs +324 -324
  165. data/vendor/spikard-rb/Cargo.toml +42 -42
  166. data/vendor/spikard-rb/build.rs +8 -8
  167. data/vendor/spikard-rb/src/background.rs +63 -63
  168. data/vendor/spikard-rb/src/config.rs +294 -294
  169. data/vendor/spikard-rb/src/conversion.rs +392 -392
  170. data/vendor/spikard-rb/src/di.rs +409 -409
  171. data/vendor/spikard-rb/src/handler.rs +534 -534
  172. data/vendor/spikard-rb/src/lib.rs +2020 -2020
  173. data/vendor/spikard-rb/src/lifecycle.rs +267 -267
  174. data/vendor/spikard-rb/src/server.rs +283 -283
  175. data/vendor/spikard-rb/src/sse.rs +231 -231
  176. data/vendor/spikard-rb/src/test_client.rs +404 -404
  177. data/vendor/spikard-rb/src/test_sse.rs +143 -143
  178. data/vendor/spikard-rb/src/test_websocket.rs +221 -221
  179. data/vendor/spikard-rb/src/websocket.rs +233 -233
  180. metadata +1 -1
@@ -1,722 +1,722 @@
1
- //! Parameter validation using JSON Schema
2
- //!
3
- //! This module provides validation for request parameters (query, path, header, cookie)
4
- //! using JSON Schema as the validation contract.
5
-
6
- use crate::debug_log_module;
7
- use crate::validation::{ValidationError, ValidationErrorDetail};
8
- use serde_json::{Value, json};
9
- use std::collections::HashMap;
10
-
11
- /// Parameter source - where the parameter comes from
12
- #[derive(Debug, Clone, Copy, PartialEq, Eq)]
13
- pub enum ParameterSource {
14
- Query,
15
- Path,
16
- Header,
17
- Cookie,
18
- }
19
-
20
- impl ParameterSource {
21
- fn from_str(s: &str) -> Option<Self> {
22
- match s {
23
- "query" => Some(Self::Query),
24
- "path" => Some(Self::Path),
25
- "header" => Some(Self::Header),
26
- "cookie" => Some(Self::Cookie),
27
- _ => None,
28
- }
29
- }
30
- }
31
-
32
- /// Parameter definition extracted from schema
33
- #[derive(Debug, Clone)]
34
- struct ParameterDef {
35
- name: String,
36
- source: ParameterSource,
37
- expected_type: Option<String>,
38
- format: Option<String>,
39
- required: bool,
40
- }
41
-
42
- /// Parameter validator that uses JSON Schema
43
- #[derive(Clone)]
44
- pub struct ParameterValidator {
45
- schema: Value,
46
- parameter_defs: Vec<ParameterDef>,
47
- }
48
-
49
- impl ParameterValidator {
50
- /// Create a new parameter validator from a JSON Schema
51
- ///
52
- /// The schema should describe all parameters with their types and constraints.
53
- /// Each property MUST have a "source" field indicating where the parameter comes from.
54
- pub fn new(schema: Value) -> Result<Self, String> {
55
- let parameter_defs = Self::extract_parameter_defs(&schema)?;
56
-
57
- Ok(Self { schema, parameter_defs })
58
- }
59
-
60
- /// Extract parameter definitions from the schema
61
- fn extract_parameter_defs(schema: &Value) -> Result<Vec<ParameterDef>, String> {
62
- let mut defs = Vec::new();
63
-
64
- let properties = schema.get("properties").and_then(|p| p.as_object()).ok_or_else(|| {
65
- anyhow::anyhow!("Parameter schema validation failed")
66
- .context("Schema must have 'properties' object")
67
- .to_string()
68
- })?;
69
-
70
- let required_list = schema
71
- .get("required")
72
- .and_then(|r| r.as_array())
73
- .map(|arr| arr.iter().filter_map(|v| v.as_str()).collect::<Vec<_>>())
74
- .unwrap_or_default();
75
-
76
- for (name, prop) in properties {
77
- let source_str = prop.get("source").and_then(|s| s.as_str()).ok_or_else(|| {
78
- anyhow::anyhow!("Invalid parameter schema")
79
- .context(format!("Parameter '{}' missing required 'source' field", name))
80
- .to_string()
81
- })?;
82
-
83
- let source = ParameterSource::from_str(source_str).ok_or_else(|| {
84
- anyhow::anyhow!("Invalid parameter schema")
85
- .context(format!(
86
- "Invalid source '{}' for parameter '{}' (expected: query, path, header, or cookie)",
87
- source_str, name
88
- ))
89
- .to_string()
90
- })?;
91
-
92
- let expected_type = prop.get("type").and_then(|t| t.as_str()).map(String::from);
93
- let format = prop.get("format").and_then(|f| f.as_str()).map(String::from);
94
-
95
- let is_optional = prop.get("optional").and_then(|v| v.as_bool()).unwrap_or(false);
96
- let required = required_list.contains(&name.as_str()) && !is_optional;
97
-
98
- defs.push(ParameterDef {
99
- name: name.clone(),
100
- source,
101
- expected_type,
102
- format,
103
- required,
104
- });
105
- }
106
-
107
- Ok(defs)
108
- }
109
-
110
- /// Get the underlying JSON Schema
111
- pub fn schema(&self) -> &Value {
112
- &self.schema
113
- }
114
-
115
- /// Validate and extract parameters from the request
116
- ///
117
- /// This builds a JSON object from query/path/header/cookie params and validates it.
118
- /// It performs type coercion (e.g., "123" → 123) based on the schema.
119
- ///
120
- /// Returns the validated JSON object that can be directly converted to Python kwargs.
121
- pub fn validate_and_extract(
122
- &self,
123
- query_params: &Value,
124
- raw_query_params: &HashMap<String, Vec<String>>,
125
- path_params: &HashMap<String, String>,
126
- headers: &HashMap<String, String>,
127
- cookies: &HashMap<String, String>,
128
- ) -> Result<Value, ValidationError> {
129
- tracing::debug!(
130
- "validate_and_extract called with query_params: {:?}, path_params: {:?}, headers: {} items, cookies: {} items",
131
- query_params,
132
- path_params,
133
- headers.len(),
134
- cookies.len()
135
- );
136
- tracing::debug!("parameter_defs count: {}", self.parameter_defs.len());
137
-
138
- let mut params_map = serde_json::Map::new();
139
- let mut errors = Vec::new();
140
- let mut raw_values_map: HashMap<String, String> = HashMap::new();
141
-
142
- for param_def in &self.parameter_defs {
143
- tracing::debug!(
144
- "Processing param: {:?}, source: {:?}, required: {}, expected_type: {:?}",
145
- param_def.name,
146
- param_def.source,
147
- param_def.required,
148
- param_def.expected_type
149
- );
150
-
151
- if param_def.source == ParameterSource::Query && param_def.expected_type.as_deref() == Some("array") {
152
- let query_value = query_params.get(&param_def.name);
153
-
154
- if param_def.required && query_value.is_none() {
155
- errors.push(ValidationErrorDetail {
156
- error_type: "missing".to_string(),
157
- loc: vec!["query".to_string(), param_def.name.clone()],
158
- msg: "Field required".to_string(),
159
- input: Value::Null,
160
- ctx: None,
161
- });
162
- continue;
163
- }
164
-
165
- if let Some(value) = query_value {
166
- let array_value = if value.is_array() {
167
- value.clone()
168
- } else {
169
- Value::Array(vec![value.clone()])
170
- };
171
- params_map.insert(param_def.name.clone(), array_value);
172
- }
173
- continue;
174
- }
175
-
176
- let raw_value_string = match param_def.source {
177
- ParameterSource::Query => raw_query_params
178
- .get(&param_def.name)
179
- .and_then(|values| values.first())
180
- .map(String::as_str),
181
- ParameterSource::Path => path_params.get(&param_def.name).map(String::as_str),
182
- ParameterSource::Header => {
183
- let header_name = param_def.name.replace('_', "-").to_lowercase();
184
- headers.get(&header_name).map(String::as_str)
185
- }
186
- ParameterSource::Cookie => cookies.get(&param_def.name).map(String::as_str),
187
- };
188
-
189
- tracing::debug!("raw_value_string for {}: {:?}", param_def.name, raw_value_string);
190
-
191
- if param_def.required && raw_value_string.is_none() {
192
- let source_str = match param_def.source {
193
- ParameterSource::Query => "query",
194
- ParameterSource::Path => "path",
195
- ParameterSource::Header => "headers",
196
- ParameterSource::Cookie => "cookie",
197
- };
198
- let param_name_for_error = if param_def.source == ParameterSource::Header {
199
- param_def.name.replace('_', "-").to_lowercase()
200
- } else {
201
- param_def.name.clone()
202
- };
203
- errors.push(ValidationErrorDetail {
204
- error_type: "missing".to_string(),
205
- loc: vec![source_str.to_string(), param_name_for_error],
206
- msg: "Field required".to_string(),
207
- input: Value::Null,
208
- ctx: None,
209
- });
210
- continue;
211
- }
212
-
213
- if let Some(value_str) = raw_value_string {
214
- tracing::debug!(
215
- "Coercing value '{}' to type {:?} with format {:?}",
216
- value_str,
217
- param_def.expected_type,
218
- param_def.format
219
- );
220
- match Self::coerce_value(
221
- value_str,
222
- param_def.expected_type.as_deref(),
223
- param_def.format.as_deref(),
224
- ) {
225
- Ok(coerced) => {
226
- tracing::debug!("Coerced to: {:?}", coerced);
227
- params_map.insert(param_def.name.clone(), coerced);
228
- raw_values_map.insert(param_def.name.clone(), value_str.to_string());
229
- }
230
- Err(e) => {
231
- tracing::debug!("Coercion failed: {}", e);
232
- let source_str = match param_def.source {
233
- ParameterSource::Query => "query",
234
- ParameterSource::Path => "path",
235
- ParameterSource::Header => "headers",
236
- ParameterSource::Cookie => "cookie",
237
- };
238
- let (error_type, error_msg) =
239
- match (param_def.expected_type.as_deref(), param_def.format.as_deref()) {
240
- (Some("integer"), _) => (
241
- "int_parsing",
242
- "Input should be a valid integer, unable to parse string as an integer".to_string(),
243
- ),
244
- (Some("number"), _) => (
245
- "float_parsing",
246
- "Input should be a valid number, unable to parse string as a number".to_string(),
247
- ),
248
- (Some("boolean"), _) => (
249
- "bool_parsing",
250
- "Input should be a valid boolean, unable to interpret input".to_string(),
251
- ),
252
- (Some("string"), Some("uuid")) => {
253
- ("uuid_parsing", format!("Input should be a valid UUID, {}", e))
254
- }
255
- (Some("string"), Some("date")) => {
256
- ("date_parsing", format!("Input should be a valid date, {}", e))
257
- }
258
- (Some("string"), Some("date-time")) => {
259
- ("datetime_parsing", format!("Input should be a valid datetime, {}", e))
260
- }
261
- (Some("string"), Some("time")) => {
262
- ("time_parsing", format!("Input should be a valid time, {}", e))
263
- }
264
- (Some("string"), Some("duration")) => {
265
- ("duration_parsing", format!("Input should be a valid duration, {}", e))
266
- }
267
- _ => ("type_error", e.clone()),
268
- };
269
- let param_name_for_error = if param_def.source == ParameterSource::Header {
270
- param_def.name.replace('_', "-").to_lowercase()
271
- } else {
272
- param_def.name.clone()
273
- };
274
- errors.push(ValidationErrorDetail {
275
- error_type: error_type.to_string(),
276
- loc: vec![source_str.to_string(), param_name_for_error],
277
- msg: error_msg,
278
- input: Value::String(value_str.to_string()),
279
- ctx: None,
280
- });
281
- }
282
- }
283
- }
284
- }
285
-
286
- if !errors.is_empty() {
287
- tracing::debug!("Errors during extraction: {:?}", errors);
288
- return Err(ValidationError { errors });
289
- }
290
-
291
- let params_json = Value::Object(params_map.clone());
292
- tracing::debug!("params_json after coercion: {:?}", params_json);
293
-
294
- let validation_schema = self.create_validation_schema();
295
- tracing::debug!("validation_schema: {:?}", validation_schema);
296
-
297
- let validator = crate::validation::SchemaValidator::new(validation_schema).map_err(|e| ValidationError {
298
- errors: vec![ValidationErrorDetail {
299
- error_type: "schema_error".to_string(),
300
- loc: vec!["schema".to_string()],
301
- msg: e,
302
- input: Value::Null,
303
- ctx: None,
304
- }],
305
- })?;
306
-
307
- tracing::debug!("About to validate params_json against schema");
308
- tracing::debug!("params_json = {:?}", params_json);
309
- tracing::debug!(
310
- "params_json pretty = {}",
311
- serde_json::to_string_pretty(&params_json).unwrap_or_default()
312
- );
313
- tracing::debug!(
314
- "schema = {}",
315
- serde_json::to_string_pretty(&self.schema).unwrap_or_default()
316
- );
317
- match validator.validate(&params_json) {
318
- Ok(_) => {
319
- tracing::debug!("Validation succeeded");
320
- Ok(params_json)
321
- }
322
- Err(mut validation_err) => {
323
- tracing::debug!("Validation failed: {:?}", validation_err);
324
-
325
- for error in &mut validation_err.errors {
326
- if error.loc.len() >= 2 && error.loc[0] == "body" {
327
- let param_name = &error.loc[1];
328
- if let Some(param_def) = self.parameter_defs.iter().find(|p| &p.name == param_name) {
329
- let source_str = match param_def.source {
330
- ParameterSource::Query => "query",
331
- ParameterSource::Path => "path",
332
- ParameterSource::Header => "headers",
333
- ParameterSource::Cookie => "cookie",
334
- };
335
- error.loc[0] = source_str.to_string();
336
-
337
- if param_def.source == ParameterSource::Header {
338
- error.loc[1] = param_def.name.replace('_', "-").to_lowercase();
339
- }
340
-
341
- if let Some(raw_value) = raw_values_map.get(&param_def.name) {
342
- error.input = Value::String(raw_value.clone());
343
- }
344
- }
345
- }
346
- }
347
-
348
- debug_log_module!(
349
- "parameters",
350
- "Returning {} validation errors",
351
- validation_err.errors.len()
352
- );
353
- for (i, error) in validation_err.errors.iter().enumerate() {
354
- debug_log_module!(
355
- "parameters",
356
- " Error {}: type={}, loc={:?}, msg={}, input={}, ctx={:?}",
357
- i,
358
- error.error_type,
359
- error.loc,
360
- error.msg,
361
- error.input,
362
- error.ctx
363
- );
364
- }
365
- #[allow(clippy::collapsible_if)]
366
- if crate::debug::is_enabled() {
367
- if let Ok(json_errors) = serde_json::to_value(&validation_err.errors) {
368
- if let Ok(json_str) = serde_json::to_string_pretty(&json_errors) {
369
- debug_log_module!("parameters", "Serialized errors:\n{}", json_str);
370
- }
371
- }
372
- }
373
-
374
- Err(validation_err)
375
- }
376
- }
377
- }
378
-
379
- /// Coerce a string value to the expected JSON type
380
- fn coerce_value(value: &str, expected_type: Option<&str>, format: Option<&str>) -> Result<Value, String> {
381
- if let Some(fmt) = format {
382
- match fmt {
383
- "uuid" => {
384
- Self::validate_uuid_format(value)?;
385
- return Ok(json!(value));
386
- }
387
- "date" => {
388
- Self::validate_date_format(value)?;
389
- return Ok(json!(value));
390
- }
391
- "date-time" => {
392
- Self::validate_datetime_format(value)?;
393
- return Ok(json!(value));
394
- }
395
- "time" => {
396
- Self::validate_time_format(value)?;
397
- return Ok(json!(value));
398
- }
399
- "duration" => {
400
- Self::validate_duration_format(value)?;
401
- return Ok(json!(value));
402
- }
403
- _ => {}
404
- }
405
- }
406
-
407
- match expected_type {
408
- Some("integer") => value
409
- .parse::<i64>()
410
- .map(|i| json!(i))
411
- .map_err(|e| format!("Invalid integer: {}", e)),
412
- Some("number") => value
413
- .parse::<f64>()
414
- .map(|f| json!(f))
415
- .map_err(|e| format!("Invalid number: {}", e)),
416
- Some("boolean") => {
417
- if value.is_empty() {
418
- return Ok(json!(false));
419
- }
420
- let value_lower = value.to_lowercase();
421
- if value_lower == "true" || value == "1" {
422
- Ok(json!(true))
423
- } else if value_lower == "false" || value == "0" {
424
- Ok(json!(false))
425
- } else {
426
- Err(format!("Invalid boolean: {}", value))
427
- }
428
- }
429
- _ => Ok(json!(value)),
430
- }
431
- }
432
-
433
- /// Validate ISO 8601 date format: YYYY-MM-DD
434
- fn validate_date_format(value: &str) -> Result<(), String> {
435
- jiff::civil::Date::strptime("%Y-%m-%d", value)
436
- .map(|_| ())
437
- .map_err(|e| format!("Invalid date format: {}", e))
438
- }
439
-
440
- /// Validate ISO 8601 datetime format
441
- fn validate_datetime_format(value: &str) -> Result<(), String> {
442
- use std::str::FromStr;
443
- jiff::Timestamp::from_str(value)
444
- .map(|_| ())
445
- .map_err(|e| format!("Invalid datetime format: {}", e))
446
- }
447
-
448
- /// Validate ISO 8601 time format: HH:MM:SS or HH:MM:SS.ffffff
449
- fn validate_time_format(value: &str) -> Result<(), String> {
450
- jiff::civil::Time::strptime("%H:%M:%S", value)
451
- .or_else(|_| jiff::civil::Time::strptime("%H:%M", value))
452
- .map(|_| ())
453
- .map_err(|e| format!("Invalid time format: {}", e))
454
- }
455
-
456
- /// Validate duration format (simplified - accept ISO 8601 duration or simple formats)
457
- fn validate_duration_format(value: &str) -> Result<(), String> {
458
- use std::str::FromStr;
459
- jiff::Span::from_str(value)
460
- .map(|_| ())
461
- .map_err(|e| format!("Invalid duration format: {}", e))
462
- }
463
-
464
- /// Validate UUID format
465
- fn validate_uuid_format(value: &str) -> Result<(), String> {
466
- use std::str::FromStr;
467
- uuid::Uuid::from_str(value)
468
- .map(|_| ())
469
- .map_err(|_e| format!("invalid character: expected an optional prefix of `urn:uuid:` followed by [0-9a-fA-F-], found `{}` at {}",
470
- value.chars().next().unwrap_or('?'),
471
- value.chars().position(|c| !c.is_ascii_hexdigit() && c != '-').unwrap_or(0)))
472
- }
473
-
474
- /// Create a validation schema without the "source" fields
475
- /// (JSON Schema doesn't recognize "source" as a standard field)
476
- fn create_validation_schema(&self) -> Value {
477
- let mut schema = self.schema.clone();
478
-
479
- if let Some(properties) = schema.get_mut("properties").and_then(|p| p.as_object_mut()) {
480
- for (_name, prop) in properties.iter_mut() {
481
- if let Some(obj) = prop.as_object_mut() {
482
- obj.remove("source");
483
- }
484
- }
485
- }
486
-
487
- schema
488
- }
489
- }
490
-
491
- #[cfg(test)]
492
- mod tests {
493
- use super::*;
494
- use serde_json::json;
495
-
496
- #[test]
497
- fn test_array_query_parameter() {
498
- let schema = json!({
499
- "type": "object",
500
- "properties": {
501
- "device_ids": {
502
- "type": "array",
503
- "items": {"type": "integer"},
504
- "source": "query"
505
- }
506
- },
507
- "required": []
508
- });
509
-
510
- let validator = ParameterValidator::new(schema).unwrap();
511
-
512
- let query_params = json!({
513
- "device_ids": [1, 2]
514
- });
515
- let raw_query_params: HashMap<String, Vec<String>> = HashMap::new();
516
- let path_params = HashMap::new();
517
-
518
- let result = validator.validate_and_extract(
519
- &query_params,
520
- &raw_query_params,
521
- &path_params,
522
- &HashMap::new(),
523
- &HashMap::new(),
524
- );
525
- assert!(
526
- result.is_ok(),
527
- "Array query param validation failed: {:?}",
528
- result.err()
529
- );
530
-
531
- let extracted = result.unwrap();
532
- assert_eq!(extracted["device_ids"], json!([1, 2]));
533
- }
534
-
535
- #[test]
536
- fn test_path_parameter_extraction() {
537
- let schema = json!({
538
- "type": "object",
539
- "properties": {
540
- "item_id": {
541
- "type": "string",
542
- "source": "path"
543
- }
544
- },
545
- "required": ["item_id"]
546
- });
547
-
548
- let validator = ParameterValidator::new(schema).expect("Failed to create validator");
549
-
550
- let mut path_params = HashMap::new();
551
- path_params.insert("item_id".to_string(), "foobar".to_string());
552
- let query_params = json!({});
553
- let raw_query_params: HashMap<String, Vec<String>> = HashMap::new();
554
-
555
- let result = validator.validate_and_extract(
556
- &query_params,
557
- &raw_query_params,
558
- &path_params,
559
- &HashMap::new(),
560
- &HashMap::new(),
561
- );
562
- assert!(result.is_ok(), "Validation should succeed: {:?}", result);
563
-
564
- let params = result.unwrap();
565
- assert_eq!(params, json!({"item_id": "foobar"}));
566
- }
567
-
568
- #[test]
569
- fn test_boolean_path_parameter_coercion() {
570
- let schema = json!({
571
- "type": "object",
572
- "properties": {
573
- "value": {
574
- "type": "boolean",
575
- "source": "path"
576
- }
577
- },
578
- "required": ["value"]
579
- });
580
-
581
- let validator = ParameterValidator::new(schema).expect("Failed to create validator");
582
-
583
- let mut path_params = HashMap::new();
584
- path_params.insert("value".to_string(), "True".to_string());
585
- let query_params = json!({});
586
- let raw_query_params: HashMap<String, Vec<String>> = HashMap::new();
587
-
588
- let result = validator.validate_and_extract(
589
- &query_params,
590
- &raw_query_params,
591
- &path_params,
592
- &HashMap::new(),
593
- &HashMap::new(),
594
- );
595
- if result.is_err() {
596
- eprintln!("Error for 'True': {:?}", result);
597
- }
598
- assert!(result.is_ok(), "Validation should succeed for 'True': {:?}", result);
599
- let params = result.unwrap();
600
- assert_eq!(params, json!({"value": true}));
601
-
602
- path_params.insert("value".to_string(), "1".to_string());
603
- let query_params_1 = json!({});
604
- let result = validator.validate_and_extract(
605
- &query_params_1,
606
- &raw_query_params,
607
- &path_params,
608
- &HashMap::new(),
609
- &HashMap::new(),
610
- );
611
- assert!(result.is_ok(), "Validation should succeed for '1': {:?}", result);
612
- let params = result.unwrap();
613
- assert_eq!(params, json!({"value": true}));
614
-
615
- path_params.insert("value".to_string(), "false".to_string());
616
- let query_params_false = json!({});
617
- let result = validator.validate_and_extract(
618
- &query_params_false,
619
- &raw_query_params,
620
- &path_params,
621
- &HashMap::new(),
622
- &HashMap::new(),
623
- );
624
- assert!(result.is_ok(), "Validation should succeed for 'false': {:?}", result);
625
- let params = result.unwrap();
626
- assert_eq!(params, json!({"value": false}));
627
-
628
- path_params.insert("value".to_string(), "TRUE".to_string());
629
- let query_params_true = json!({});
630
- let result = validator.validate_and_extract(
631
- &query_params_true,
632
- &raw_query_params,
633
- &path_params,
634
- &HashMap::new(),
635
- &HashMap::new(),
636
- );
637
- assert!(result.is_ok(), "Validation should succeed for 'TRUE': {:?}", result);
638
- let params = result.unwrap();
639
- assert_eq!(params, json!({"value": true}));
640
- }
641
-
642
- #[test]
643
- fn test_boolean_query_parameter_coercion() {
644
- let schema = json!({
645
- "type": "object",
646
- "properties": {
647
- "flag": {
648
- "type": "boolean",
649
- "source": "query"
650
- }
651
- },
652
- "required": ["flag"]
653
- });
654
-
655
- let validator = ParameterValidator::new(schema).expect("Failed to create validator");
656
- let path_params = HashMap::new();
657
-
658
- let mut raw_query_params: HashMap<String, Vec<String>> = HashMap::new();
659
- raw_query_params.insert("flag".to_string(), vec!["1".to_string()]);
660
- let query_params = json!({"flag": 1});
661
- let result = validator.validate_and_extract(
662
- &query_params,
663
- &raw_query_params,
664
- &path_params,
665
- &HashMap::new(),
666
- &HashMap::new(),
667
- );
668
- assert!(result.is_ok(), "Validation should succeed for integer 1: {:?}", result);
669
- let params = result.unwrap();
670
- assert_eq!(params, json!({"flag": true}));
671
-
672
- let mut raw_query_params: HashMap<String, Vec<String>> = HashMap::new();
673
- raw_query_params.insert("flag".to_string(), vec!["0".to_string()]);
674
- let query_params = json!({"flag": 0});
675
- let result = validator.validate_and_extract(
676
- &query_params,
677
- &raw_query_params,
678
- &path_params,
679
- &HashMap::new(),
680
- &HashMap::new(),
681
- );
682
- assert!(result.is_ok(), "Validation should succeed for integer 0: {:?}", result);
683
- let params = result.unwrap();
684
- assert_eq!(params, json!({"flag": false}));
685
-
686
- let mut raw_query_params: HashMap<String, Vec<String>> = HashMap::new();
687
- raw_query_params.insert("flag".to_string(), vec!["true".to_string()]);
688
- let query_params = json!({"flag": true});
689
- let result = validator.validate_and_extract(
690
- &query_params,
691
- &raw_query_params,
692
- &path_params,
693
- &HashMap::new(),
694
- &HashMap::new(),
695
- );
696
- assert!(
697
- result.is_ok(),
698
- "Validation should succeed for boolean true: {:?}",
699
- result
700
- );
701
- let params = result.unwrap();
702
- assert_eq!(params, json!({"flag": true}));
703
-
704
- let mut raw_query_params: HashMap<String, Vec<String>> = HashMap::new();
705
- raw_query_params.insert("flag".to_string(), vec!["false".to_string()]);
706
- let query_params = json!({"flag": false});
707
- let result = validator.validate_and_extract(
708
- &query_params,
709
- &raw_query_params,
710
- &path_params,
711
- &HashMap::new(),
712
- &HashMap::new(),
713
- );
714
- assert!(
715
- result.is_ok(),
716
- "Validation should succeed for boolean false: {:?}",
717
- result
718
- );
719
- let params = result.unwrap();
720
- assert_eq!(params, json!({"flag": false}));
721
- }
722
- }
1
+ //! Parameter validation using JSON Schema
2
+ //!
3
+ //! This module provides validation for request parameters (query, path, header, cookie)
4
+ //! using JSON Schema as the validation contract.
5
+
6
+ use crate::debug_log_module;
7
+ use crate::validation::{ValidationError, ValidationErrorDetail};
8
+ use serde_json::{Value, json};
9
+ use std::collections::HashMap;
10
+
11
+ /// Parameter source - where the parameter comes from
12
+ #[derive(Debug, Clone, Copy, PartialEq, Eq)]
13
+ pub enum ParameterSource {
14
+ Query,
15
+ Path,
16
+ Header,
17
+ Cookie,
18
+ }
19
+
20
+ impl ParameterSource {
21
+ fn from_str(s: &str) -> Option<Self> {
22
+ match s {
23
+ "query" => Some(Self::Query),
24
+ "path" => Some(Self::Path),
25
+ "header" => Some(Self::Header),
26
+ "cookie" => Some(Self::Cookie),
27
+ _ => None,
28
+ }
29
+ }
30
+ }
31
+
32
+ /// Parameter definition extracted from schema
33
+ #[derive(Debug, Clone)]
34
+ struct ParameterDef {
35
+ name: String,
36
+ source: ParameterSource,
37
+ expected_type: Option<String>,
38
+ format: Option<String>,
39
+ required: bool,
40
+ }
41
+
42
+ /// Parameter validator that uses JSON Schema
43
+ #[derive(Clone)]
44
+ pub struct ParameterValidator {
45
+ schema: Value,
46
+ parameter_defs: Vec<ParameterDef>,
47
+ }
48
+
49
+ impl ParameterValidator {
50
+ /// Create a new parameter validator from a JSON Schema
51
+ ///
52
+ /// The schema should describe all parameters with their types and constraints.
53
+ /// Each property MUST have a "source" field indicating where the parameter comes from.
54
+ pub fn new(schema: Value) -> Result<Self, String> {
55
+ let parameter_defs = Self::extract_parameter_defs(&schema)?;
56
+
57
+ Ok(Self { schema, parameter_defs })
58
+ }
59
+
60
+ /// Extract parameter definitions from the schema
61
+ fn extract_parameter_defs(schema: &Value) -> Result<Vec<ParameterDef>, String> {
62
+ let mut defs = Vec::new();
63
+
64
+ let properties = schema.get("properties").and_then(|p| p.as_object()).ok_or_else(|| {
65
+ anyhow::anyhow!("Parameter schema validation failed")
66
+ .context("Schema must have 'properties' object")
67
+ .to_string()
68
+ })?;
69
+
70
+ let required_list = schema
71
+ .get("required")
72
+ .and_then(|r| r.as_array())
73
+ .map(|arr| arr.iter().filter_map(|v| v.as_str()).collect::<Vec<_>>())
74
+ .unwrap_or_default();
75
+
76
+ for (name, prop) in properties {
77
+ let source_str = prop.get("source").and_then(|s| s.as_str()).ok_or_else(|| {
78
+ anyhow::anyhow!("Invalid parameter schema")
79
+ .context(format!("Parameter '{}' missing required 'source' field", name))
80
+ .to_string()
81
+ })?;
82
+
83
+ let source = ParameterSource::from_str(source_str).ok_or_else(|| {
84
+ anyhow::anyhow!("Invalid parameter schema")
85
+ .context(format!(
86
+ "Invalid source '{}' for parameter '{}' (expected: query, path, header, or cookie)",
87
+ source_str, name
88
+ ))
89
+ .to_string()
90
+ })?;
91
+
92
+ let expected_type = prop.get("type").and_then(|t| t.as_str()).map(String::from);
93
+ let format = prop.get("format").and_then(|f| f.as_str()).map(String::from);
94
+
95
+ let is_optional = prop.get("optional").and_then(|v| v.as_bool()).unwrap_or(false);
96
+ let required = required_list.contains(&name.as_str()) && !is_optional;
97
+
98
+ defs.push(ParameterDef {
99
+ name: name.clone(),
100
+ source,
101
+ expected_type,
102
+ format,
103
+ required,
104
+ });
105
+ }
106
+
107
+ Ok(defs)
108
+ }
109
+
110
+ /// Get the underlying JSON Schema
111
+ pub fn schema(&self) -> &Value {
112
+ &self.schema
113
+ }
114
+
115
+ /// Validate and extract parameters from the request
116
+ ///
117
+ /// This builds a JSON object from query/path/header/cookie params and validates it.
118
+ /// It performs type coercion (e.g., "123" → 123) based on the schema.
119
+ ///
120
+ /// Returns the validated JSON object that can be directly converted to Python kwargs.
121
+ pub fn validate_and_extract(
122
+ &self,
123
+ query_params: &Value,
124
+ raw_query_params: &HashMap<String, Vec<String>>,
125
+ path_params: &HashMap<String, String>,
126
+ headers: &HashMap<String, String>,
127
+ cookies: &HashMap<String, String>,
128
+ ) -> Result<Value, ValidationError> {
129
+ tracing::debug!(
130
+ "validate_and_extract called with query_params: {:?}, path_params: {:?}, headers: {} items, cookies: {} items",
131
+ query_params,
132
+ path_params,
133
+ headers.len(),
134
+ cookies.len()
135
+ );
136
+ tracing::debug!("parameter_defs count: {}", self.parameter_defs.len());
137
+
138
+ let mut params_map = serde_json::Map::new();
139
+ let mut errors = Vec::new();
140
+ let mut raw_values_map: HashMap<String, String> = HashMap::new();
141
+
142
+ for param_def in &self.parameter_defs {
143
+ tracing::debug!(
144
+ "Processing param: {:?}, source: {:?}, required: {}, expected_type: {:?}",
145
+ param_def.name,
146
+ param_def.source,
147
+ param_def.required,
148
+ param_def.expected_type
149
+ );
150
+
151
+ if param_def.source == ParameterSource::Query && param_def.expected_type.as_deref() == Some("array") {
152
+ let query_value = query_params.get(&param_def.name);
153
+
154
+ if param_def.required && query_value.is_none() {
155
+ errors.push(ValidationErrorDetail {
156
+ error_type: "missing".to_string(),
157
+ loc: vec!["query".to_string(), param_def.name.clone()],
158
+ msg: "Field required".to_string(),
159
+ input: Value::Null,
160
+ ctx: None,
161
+ });
162
+ continue;
163
+ }
164
+
165
+ if let Some(value) = query_value {
166
+ let array_value = if value.is_array() {
167
+ value.clone()
168
+ } else {
169
+ Value::Array(vec![value.clone()])
170
+ };
171
+ params_map.insert(param_def.name.clone(), array_value);
172
+ }
173
+ continue;
174
+ }
175
+
176
+ let raw_value_string = match param_def.source {
177
+ ParameterSource::Query => raw_query_params
178
+ .get(&param_def.name)
179
+ .and_then(|values| values.first())
180
+ .map(String::as_str),
181
+ ParameterSource::Path => path_params.get(&param_def.name).map(String::as_str),
182
+ ParameterSource::Header => {
183
+ let header_name = param_def.name.replace('_', "-").to_lowercase();
184
+ headers.get(&header_name).map(String::as_str)
185
+ }
186
+ ParameterSource::Cookie => cookies.get(&param_def.name).map(String::as_str),
187
+ };
188
+
189
+ tracing::debug!("raw_value_string for {}: {:?}", param_def.name, raw_value_string);
190
+
191
+ if param_def.required && raw_value_string.is_none() {
192
+ let source_str = match param_def.source {
193
+ ParameterSource::Query => "query",
194
+ ParameterSource::Path => "path",
195
+ ParameterSource::Header => "headers",
196
+ ParameterSource::Cookie => "cookie",
197
+ };
198
+ let param_name_for_error = if param_def.source == ParameterSource::Header {
199
+ param_def.name.replace('_', "-").to_lowercase()
200
+ } else {
201
+ param_def.name.clone()
202
+ };
203
+ errors.push(ValidationErrorDetail {
204
+ error_type: "missing".to_string(),
205
+ loc: vec![source_str.to_string(), param_name_for_error],
206
+ msg: "Field required".to_string(),
207
+ input: Value::Null,
208
+ ctx: None,
209
+ });
210
+ continue;
211
+ }
212
+
213
+ if let Some(value_str) = raw_value_string {
214
+ tracing::debug!(
215
+ "Coercing value '{}' to type {:?} with format {:?}",
216
+ value_str,
217
+ param_def.expected_type,
218
+ param_def.format
219
+ );
220
+ match Self::coerce_value(
221
+ value_str,
222
+ param_def.expected_type.as_deref(),
223
+ param_def.format.as_deref(),
224
+ ) {
225
+ Ok(coerced) => {
226
+ tracing::debug!("Coerced to: {:?}", coerced);
227
+ params_map.insert(param_def.name.clone(), coerced);
228
+ raw_values_map.insert(param_def.name.clone(), value_str.to_string());
229
+ }
230
+ Err(e) => {
231
+ tracing::debug!("Coercion failed: {}", e);
232
+ let source_str = match param_def.source {
233
+ ParameterSource::Query => "query",
234
+ ParameterSource::Path => "path",
235
+ ParameterSource::Header => "headers",
236
+ ParameterSource::Cookie => "cookie",
237
+ };
238
+ let (error_type, error_msg) =
239
+ match (param_def.expected_type.as_deref(), param_def.format.as_deref()) {
240
+ (Some("integer"), _) => (
241
+ "int_parsing",
242
+ "Input should be a valid integer, unable to parse string as an integer".to_string(),
243
+ ),
244
+ (Some("number"), _) => (
245
+ "float_parsing",
246
+ "Input should be a valid number, unable to parse string as a number".to_string(),
247
+ ),
248
+ (Some("boolean"), _) => (
249
+ "bool_parsing",
250
+ "Input should be a valid boolean, unable to interpret input".to_string(),
251
+ ),
252
+ (Some("string"), Some("uuid")) => {
253
+ ("uuid_parsing", format!("Input should be a valid UUID, {}", e))
254
+ }
255
+ (Some("string"), Some("date")) => {
256
+ ("date_parsing", format!("Input should be a valid date, {}", e))
257
+ }
258
+ (Some("string"), Some("date-time")) => {
259
+ ("datetime_parsing", format!("Input should be a valid datetime, {}", e))
260
+ }
261
+ (Some("string"), Some("time")) => {
262
+ ("time_parsing", format!("Input should be a valid time, {}", e))
263
+ }
264
+ (Some("string"), Some("duration")) => {
265
+ ("duration_parsing", format!("Input should be a valid duration, {}", e))
266
+ }
267
+ _ => ("type_error", e.clone()),
268
+ };
269
+ let param_name_for_error = if param_def.source == ParameterSource::Header {
270
+ param_def.name.replace('_', "-").to_lowercase()
271
+ } else {
272
+ param_def.name.clone()
273
+ };
274
+ errors.push(ValidationErrorDetail {
275
+ error_type: error_type.to_string(),
276
+ loc: vec![source_str.to_string(), param_name_for_error],
277
+ msg: error_msg,
278
+ input: Value::String(value_str.to_string()),
279
+ ctx: None,
280
+ });
281
+ }
282
+ }
283
+ }
284
+ }
285
+
286
+ if !errors.is_empty() {
287
+ tracing::debug!("Errors during extraction: {:?}", errors);
288
+ return Err(ValidationError { errors });
289
+ }
290
+
291
+ let params_json = Value::Object(params_map.clone());
292
+ tracing::debug!("params_json after coercion: {:?}", params_json);
293
+
294
+ let validation_schema = self.create_validation_schema();
295
+ tracing::debug!("validation_schema: {:?}", validation_schema);
296
+
297
+ let validator = crate::validation::SchemaValidator::new(validation_schema).map_err(|e| ValidationError {
298
+ errors: vec![ValidationErrorDetail {
299
+ error_type: "schema_error".to_string(),
300
+ loc: vec!["schema".to_string()],
301
+ msg: e,
302
+ input: Value::Null,
303
+ ctx: None,
304
+ }],
305
+ })?;
306
+
307
+ tracing::debug!("About to validate params_json against schema");
308
+ tracing::debug!("params_json = {:?}", params_json);
309
+ tracing::debug!(
310
+ "params_json pretty = {}",
311
+ serde_json::to_string_pretty(&params_json).unwrap_or_default()
312
+ );
313
+ tracing::debug!(
314
+ "schema = {}",
315
+ serde_json::to_string_pretty(&self.schema).unwrap_or_default()
316
+ );
317
+ match validator.validate(&params_json) {
318
+ Ok(_) => {
319
+ tracing::debug!("Validation succeeded");
320
+ Ok(params_json)
321
+ }
322
+ Err(mut validation_err) => {
323
+ tracing::debug!("Validation failed: {:?}", validation_err);
324
+
325
+ for error in &mut validation_err.errors {
326
+ if error.loc.len() >= 2 && error.loc[0] == "body" {
327
+ let param_name = &error.loc[1];
328
+ if let Some(param_def) = self.parameter_defs.iter().find(|p| &p.name == param_name) {
329
+ let source_str = match param_def.source {
330
+ ParameterSource::Query => "query",
331
+ ParameterSource::Path => "path",
332
+ ParameterSource::Header => "headers",
333
+ ParameterSource::Cookie => "cookie",
334
+ };
335
+ error.loc[0] = source_str.to_string();
336
+
337
+ if param_def.source == ParameterSource::Header {
338
+ error.loc[1] = param_def.name.replace('_', "-").to_lowercase();
339
+ }
340
+
341
+ if let Some(raw_value) = raw_values_map.get(&param_def.name) {
342
+ error.input = Value::String(raw_value.clone());
343
+ }
344
+ }
345
+ }
346
+ }
347
+
348
+ debug_log_module!(
349
+ "parameters",
350
+ "Returning {} validation errors",
351
+ validation_err.errors.len()
352
+ );
353
+ for (i, error) in validation_err.errors.iter().enumerate() {
354
+ debug_log_module!(
355
+ "parameters",
356
+ " Error {}: type={}, loc={:?}, msg={}, input={}, ctx={:?}",
357
+ i,
358
+ error.error_type,
359
+ error.loc,
360
+ error.msg,
361
+ error.input,
362
+ error.ctx
363
+ );
364
+ }
365
+ #[allow(clippy::collapsible_if)]
366
+ if crate::debug::is_enabled() {
367
+ if let Ok(json_errors) = serde_json::to_value(&validation_err.errors) {
368
+ if let Ok(json_str) = serde_json::to_string_pretty(&json_errors) {
369
+ debug_log_module!("parameters", "Serialized errors:\n{}", json_str);
370
+ }
371
+ }
372
+ }
373
+
374
+ Err(validation_err)
375
+ }
376
+ }
377
+ }
378
+
379
+ /// Coerce a string value to the expected JSON type
380
+ fn coerce_value(value: &str, expected_type: Option<&str>, format: Option<&str>) -> Result<Value, String> {
381
+ if let Some(fmt) = format {
382
+ match fmt {
383
+ "uuid" => {
384
+ Self::validate_uuid_format(value)?;
385
+ return Ok(json!(value));
386
+ }
387
+ "date" => {
388
+ Self::validate_date_format(value)?;
389
+ return Ok(json!(value));
390
+ }
391
+ "date-time" => {
392
+ Self::validate_datetime_format(value)?;
393
+ return Ok(json!(value));
394
+ }
395
+ "time" => {
396
+ Self::validate_time_format(value)?;
397
+ return Ok(json!(value));
398
+ }
399
+ "duration" => {
400
+ Self::validate_duration_format(value)?;
401
+ return Ok(json!(value));
402
+ }
403
+ _ => {}
404
+ }
405
+ }
406
+
407
+ match expected_type {
408
+ Some("integer") => value
409
+ .parse::<i64>()
410
+ .map(|i| json!(i))
411
+ .map_err(|e| format!("Invalid integer: {}", e)),
412
+ Some("number") => value
413
+ .parse::<f64>()
414
+ .map(|f| json!(f))
415
+ .map_err(|e| format!("Invalid number: {}", e)),
416
+ Some("boolean") => {
417
+ if value.is_empty() {
418
+ return Ok(json!(false));
419
+ }
420
+ let value_lower = value.to_lowercase();
421
+ if value_lower == "true" || value == "1" {
422
+ Ok(json!(true))
423
+ } else if value_lower == "false" || value == "0" {
424
+ Ok(json!(false))
425
+ } else {
426
+ Err(format!("Invalid boolean: {}", value))
427
+ }
428
+ }
429
+ _ => Ok(json!(value)),
430
+ }
431
+ }
432
+
433
+ /// Validate ISO 8601 date format: YYYY-MM-DD
434
+ fn validate_date_format(value: &str) -> Result<(), String> {
435
+ jiff::civil::Date::strptime("%Y-%m-%d", value)
436
+ .map(|_| ())
437
+ .map_err(|e| format!("Invalid date format: {}", e))
438
+ }
439
+
440
+ /// Validate ISO 8601 datetime format
441
+ fn validate_datetime_format(value: &str) -> Result<(), String> {
442
+ use std::str::FromStr;
443
+ jiff::Timestamp::from_str(value)
444
+ .map(|_| ())
445
+ .map_err(|e| format!("Invalid datetime format: {}", e))
446
+ }
447
+
448
+ /// Validate ISO 8601 time format: HH:MM:SS or HH:MM:SS.ffffff
449
+ fn validate_time_format(value: &str) -> Result<(), String> {
450
+ jiff::civil::Time::strptime("%H:%M:%S", value)
451
+ .or_else(|_| jiff::civil::Time::strptime("%H:%M", value))
452
+ .map(|_| ())
453
+ .map_err(|e| format!("Invalid time format: {}", e))
454
+ }
455
+
456
+ /// Validate duration format (simplified - accept ISO 8601 duration or simple formats)
457
+ fn validate_duration_format(value: &str) -> Result<(), String> {
458
+ use std::str::FromStr;
459
+ jiff::Span::from_str(value)
460
+ .map(|_| ())
461
+ .map_err(|e| format!("Invalid duration format: {}", e))
462
+ }
463
+
464
+ /// Validate UUID format
465
+ fn validate_uuid_format(value: &str) -> Result<(), String> {
466
+ use std::str::FromStr;
467
+ uuid::Uuid::from_str(value)
468
+ .map(|_| ())
469
+ .map_err(|_e| format!("invalid character: expected an optional prefix of `urn:uuid:` followed by [0-9a-fA-F-], found `{}` at {}",
470
+ value.chars().next().unwrap_or('?'),
471
+ value.chars().position(|c| !c.is_ascii_hexdigit() && c != '-').unwrap_or(0)))
472
+ }
473
+
474
+ /// Create a validation schema without the "source" fields
475
+ /// (JSON Schema doesn't recognize "source" as a standard field)
476
+ fn create_validation_schema(&self) -> Value {
477
+ let mut schema = self.schema.clone();
478
+
479
+ if let Some(properties) = schema.get_mut("properties").and_then(|p| p.as_object_mut()) {
480
+ for (_name, prop) in properties.iter_mut() {
481
+ if let Some(obj) = prop.as_object_mut() {
482
+ obj.remove("source");
483
+ }
484
+ }
485
+ }
486
+
487
+ schema
488
+ }
489
+ }
490
+
491
+ #[cfg(test)]
492
+ mod tests {
493
+ use super::*;
494
+ use serde_json::json;
495
+
496
+ #[test]
497
+ fn test_array_query_parameter() {
498
+ let schema = json!({
499
+ "type": "object",
500
+ "properties": {
501
+ "device_ids": {
502
+ "type": "array",
503
+ "items": {"type": "integer"},
504
+ "source": "query"
505
+ }
506
+ },
507
+ "required": []
508
+ });
509
+
510
+ let validator = ParameterValidator::new(schema).unwrap();
511
+
512
+ let query_params = json!({
513
+ "device_ids": [1, 2]
514
+ });
515
+ let raw_query_params: HashMap<String, Vec<String>> = HashMap::new();
516
+ let path_params = HashMap::new();
517
+
518
+ let result = validator.validate_and_extract(
519
+ &query_params,
520
+ &raw_query_params,
521
+ &path_params,
522
+ &HashMap::new(),
523
+ &HashMap::new(),
524
+ );
525
+ assert!(
526
+ result.is_ok(),
527
+ "Array query param validation failed: {:?}",
528
+ result.err()
529
+ );
530
+
531
+ let extracted = result.unwrap();
532
+ assert_eq!(extracted["device_ids"], json!([1, 2]));
533
+ }
534
+
535
+ #[test]
536
+ fn test_path_parameter_extraction() {
537
+ let schema = json!({
538
+ "type": "object",
539
+ "properties": {
540
+ "item_id": {
541
+ "type": "string",
542
+ "source": "path"
543
+ }
544
+ },
545
+ "required": ["item_id"]
546
+ });
547
+
548
+ let validator = ParameterValidator::new(schema).expect("Failed to create validator");
549
+
550
+ let mut path_params = HashMap::new();
551
+ path_params.insert("item_id".to_string(), "foobar".to_string());
552
+ let query_params = json!({});
553
+ let raw_query_params: HashMap<String, Vec<String>> = HashMap::new();
554
+
555
+ let result = validator.validate_and_extract(
556
+ &query_params,
557
+ &raw_query_params,
558
+ &path_params,
559
+ &HashMap::new(),
560
+ &HashMap::new(),
561
+ );
562
+ assert!(result.is_ok(), "Validation should succeed: {:?}", result);
563
+
564
+ let params = result.unwrap();
565
+ assert_eq!(params, json!({"item_id": "foobar"}));
566
+ }
567
+
568
+ #[test]
569
+ fn test_boolean_path_parameter_coercion() {
570
+ let schema = json!({
571
+ "type": "object",
572
+ "properties": {
573
+ "value": {
574
+ "type": "boolean",
575
+ "source": "path"
576
+ }
577
+ },
578
+ "required": ["value"]
579
+ });
580
+
581
+ let validator = ParameterValidator::new(schema).expect("Failed to create validator");
582
+
583
+ let mut path_params = HashMap::new();
584
+ path_params.insert("value".to_string(), "True".to_string());
585
+ let query_params = json!({});
586
+ let raw_query_params: HashMap<String, Vec<String>> = HashMap::new();
587
+
588
+ let result = validator.validate_and_extract(
589
+ &query_params,
590
+ &raw_query_params,
591
+ &path_params,
592
+ &HashMap::new(),
593
+ &HashMap::new(),
594
+ );
595
+ if result.is_err() {
596
+ eprintln!("Error for 'True': {:?}", result);
597
+ }
598
+ assert!(result.is_ok(), "Validation should succeed for 'True': {:?}", result);
599
+ let params = result.unwrap();
600
+ assert_eq!(params, json!({"value": true}));
601
+
602
+ path_params.insert("value".to_string(), "1".to_string());
603
+ let query_params_1 = json!({});
604
+ let result = validator.validate_and_extract(
605
+ &query_params_1,
606
+ &raw_query_params,
607
+ &path_params,
608
+ &HashMap::new(),
609
+ &HashMap::new(),
610
+ );
611
+ assert!(result.is_ok(), "Validation should succeed for '1': {:?}", result);
612
+ let params = result.unwrap();
613
+ assert_eq!(params, json!({"value": true}));
614
+
615
+ path_params.insert("value".to_string(), "false".to_string());
616
+ let query_params_false = json!({});
617
+ let result = validator.validate_and_extract(
618
+ &query_params_false,
619
+ &raw_query_params,
620
+ &path_params,
621
+ &HashMap::new(),
622
+ &HashMap::new(),
623
+ );
624
+ assert!(result.is_ok(), "Validation should succeed for 'false': {:?}", result);
625
+ let params = result.unwrap();
626
+ assert_eq!(params, json!({"value": false}));
627
+
628
+ path_params.insert("value".to_string(), "TRUE".to_string());
629
+ let query_params_true = json!({});
630
+ let result = validator.validate_and_extract(
631
+ &query_params_true,
632
+ &raw_query_params,
633
+ &path_params,
634
+ &HashMap::new(),
635
+ &HashMap::new(),
636
+ );
637
+ assert!(result.is_ok(), "Validation should succeed for 'TRUE': {:?}", result);
638
+ let params = result.unwrap();
639
+ assert_eq!(params, json!({"value": true}));
640
+ }
641
+
642
+ #[test]
643
+ fn test_boolean_query_parameter_coercion() {
644
+ let schema = json!({
645
+ "type": "object",
646
+ "properties": {
647
+ "flag": {
648
+ "type": "boolean",
649
+ "source": "query"
650
+ }
651
+ },
652
+ "required": ["flag"]
653
+ });
654
+
655
+ let validator = ParameterValidator::new(schema).expect("Failed to create validator");
656
+ let path_params = HashMap::new();
657
+
658
+ let mut raw_query_params: HashMap<String, Vec<String>> = HashMap::new();
659
+ raw_query_params.insert("flag".to_string(), vec!["1".to_string()]);
660
+ let query_params = json!({"flag": 1});
661
+ let result = validator.validate_and_extract(
662
+ &query_params,
663
+ &raw_query_params,
664
+ &path_params,
665
+ &HashMap::new(),
666
+ &HashMap::new(),
667
+ );
668
+ assert!(result.is_ok(), "Validation should succeed for integer 1: {:?}", result);
669
+ let params = result.unwrap();
670
+ assert_eq!(params, json!({"flag": true}));
671
+
672
+ let mut raw_query_params: HashMap<String, Vec<String>> = HashMap::new();
673
+ raw_query_params.insert("flag".to_string(), vec!["0".to_string()]);
674
+ let query_params = json!({"flag": 0});
675
+ let result = validator.validate_and_extract(
676
+ &query_params,
677
+ &raw_query_params,
678
+ &path_params,
679
+ &HashMap::new(),
680
+ &HashMap::new(),
681
+ );
682
+ assert!(result.is_ok(), "Validation should succeed for integer 0: {:?}", result);
683
+ let params = result.unwrap();
684
+ assert_eq!(params, json!({"flag": false}));
685
+
686
+ let mut raw_query_params: HashMap<String, Vec<String>> = HashMap::new();
687
+ raw_query_params.insert("flag".to_string(), vec!["true".to_string()]);
688
+ let query_params = json!({"flag": true});
689
+ let result = validator.validate_and_extract(
690
+ &query_params,
691
+ &raw_query_params,
692
+ &path_params,
693
+ &HashMap::new(),
694
+ &HashMap::new(),
695
+ );
696
+ assert!(
697
+ result.is_ok(),
698
+ "Validation should succeed for boolean true: {:?}",
699
+ result
700
+ );
701
+ let params = result.unwrap();
702
+ assert_eq!(params, json!({"flag": true}));
703
+
704
+ let mut raw_query_params: HashMap<String, Vec<String>> = HashMap::new();
705
+ raw_query_params.insert("flag".to_string(), vec!["false".to_string()]);
706
+ let query_params = json!({"flag": false});
707
+ let result = validator.validate_and_extract(
708
+ &query_params,
709
+ &raw_query_params,
710
+ &path_params,
711
+ &HashMap::new(),
712
+ &HashMap::new(),
713
+ );
714
+ assert!(
715
+ result.is_ok(),
716
+ "Validation should succeed for boolean false: {:?}",
717
+ result
718
+ );
719
+ let params = result.unwrap();
720
+ assert_eq!(params, json!({"flag": false}));
721
+ }
722
+ }