Page MenuHomeDevCentral
Files F3753452

D2994.id7649.diff
No OneTemporary
Actions

D2994.id7649.diff
View Options

diff --git a/Cargo.toml b/Cargo.toml
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "limiting-factor"
-version = "0.7.2"
+version = "0.8.0"
authors = [
"Sébastien Santoro <dereckson@espace-win.org>",
]
@@ -25,7 +25,7 @@
r2d2 = { version = "^0.8.10", optional = true }
rocket = "^0.4.11"
rocket_contrib = { version = "^0.4.11", features = [ "json" ] }
-serde = { version = "^1.0.159", optional = true }
+serde = { version = "^1.0.159", features = [ "derive" ], optional = true }
[features]
default = ["minimal"]
diff --git a/src/api/guards.rs b/src/api/guards.rs
new file mode 100644
--- /dev/null
+++ b/src/api/guards.rs
@@ -0,0 +1,92 @@
+//! # API guards
+//!
+//! This module provides reusable guards to use with Rocket.
+
+use rocket::data::{FromDataSimple, Outcome};
+use rocket::{Data, Request};
+use rocket::http::Status;
+use rocket::Outcome::{Failure, Success};
+use serde::{Deserialize, Serialize};
+
+use std::io::Read;
+
+/// The maximum number of characters to read, to avoid DoS
+const REQUEST_BODY_LIMIT: u64 = 1_000_000;
+
+/// A String representation of the request body. Useful when you need to pass it through as is.
+#[derive(Serialize, Deserialize, PartialOrd, PartialEq, Eq, Ord)]
+pub struct RequestBody {
+ /// The UTF-8 content of the request body
+ pub content: String,
+}
+
+impl RequestBody {
+ pub fn new () -> Self {
+ Self {
+ content: String::new(),
+ }
+ }
+
+ /// Convert the request body into a string
+ pub fn into_string (self) -> String {
+ self.content
+ }
+
+ /// Convert the request body into a string, or None if it's empty
+ pub fn into_optional_string (self) -> Option<String> {
+ if self.content.is_empty() {
+ None
+ } else {
+ Some(self.content)
+ }
+ }
+}
+
+impl FromDataSimple for RequestBody {
+ type Error = String;
+
+ fn from_data(_request: &Request, data: Data) -> Outcome<Self, Self::Error> {
+ let mut content = String::new();
+
+ if let Err(e) = data.open().take(REQUEST_BODY_LIMIT).read_to_string(&mut content) {
+ return Failure((Status::InternalServerError, format!("{:?}", e)));
+ }
+
+ Success(Self { content })
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn test_request_body_new () {
+ let body = RequestBody::new();
+ assert_eq!(0, body.content.len(), "Content should be empty");
+ }
+
+ #[test]
+ fn test_request_body_into_string () {
+ let body = RequestBody { content: "quux".to_string() };
+ assert_eq!(String::from("quux"), body.into_string());
+ }
+
+ #[test]
+ fn test_request_body_into_string_when_empty () {
+ let body = RequestBody::new();
+ assert_eq!(String::new(), body.into_string(), "Content should be empty");
+ }
+
+ #[test]
+ fn test_request_body_into_optional_string () {
+ let body = RequestBody { content: "quux".to_string() };
+ assert_eq!(Some(String::from("quux")), body.into_optional_string());
+ }
+
+ #[test]
+ fn test_request_body_into_optional_string_when_empty () {
+ let body = RequestBody::new();
+ assert_eq!(None, body.into_optional_string());
+ }
+}
diff --git a/src/api/mod.rs b/src/api/mod.rs
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -6,4 +6,5 @@
Public submodules offered by this module
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+pub mod guards;
pub mod replies;

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 19, 01:44 (20 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2251634
Default Alt Text
D2994.id7649.diff (3 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator