FediMovies/fedimovies
1
1
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Activity

Update chrono and remove time v0.1.44 from dependencies

Browse source
This commit is contained in:
silverpill 2022-12-03 19:32:36 +00:00
parent 83193beabd
commit d0b826d1c0
4 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Cargo.lock generated
View file

@ -203,7 +203,7 @@ dependencies = [
"serde_urlencoded", "serde_urlencoded",
"smallvec", "smallvec",
"socket2", "socket2",
"time 0.3.9", "time",
"url 2.2.2", "url 2.2.2",
] ]
@ -511,17 +511,14 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]] [[package]]
name = "chrono" name = "chrono"
version = "0.4.22" version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
dependencies = [ dependencies = [
"iana-time-zone", "iana-time-zone",
"js-sys",
"num-integer", "num-integer",
"num-traits", "num-traits",
"serde", "serde",
"time 0.1.44",
"wasm-bindgen",
"winapi", "winapi",
] ]
@ -611,7 +608,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05" checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05"
dependencies = [ dependencies = [
"percent-encoding 2.1.0", "percent-encoding 2.1.0",
"time 0.3.9", "time",
"version_check", "version_check",
] ]
@ -2665,7 +2662,7 @@ dependencies = [
"serde", "serde",
"siphasher", "siphasher",
"thiserror", "thiserror",
"time 0.3.9", "time",
"tokio", "tokio",
"tokio-postgres", "tokio-postgres",
"toml", "toml",
@ -3082,7 +3079,7 @@ dependencies = [
"rand 0.8.4", "rand 0.8.4",
"sha3", "sha3",
"thiserror", "thiserror",
"time 0.3.9", "time",
] ]
[[package]] [[package]]
@ -3249,17 +3246,6 @@ dependencies = [
"syn", "syn",
] ]
[[package]]
name = "time"
version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
dependencies = [
"libc",
"wasi 0.10.0+wasi-snapshot-preview1",
"winapi",
]
[[package]] [[package]]
name = "time" name = "time"
version = "0.3.9" version = "0.3.9"

2
Cargo.toml
View file

@ -24,7 +24,7 @@ base64 = "0.13.0"
# Used to decode base58btc # Used to decode base58btc
bs58 = "0.4.0" bs58 = "0.4.0"
# Used for working with dates # Used for working with dates
chrono = { version = "0.4.22", features = ["serde"] } chrono = { version = "0.4.23", default-features = false, features = ["std", "serde"] }
# Used to build admin CLI tool # Used to build admin CLI tool
clap = { version = "3.2.18", default-features = false, features = ["std", "derive"] } clap = { version = "3.2.18", default-features = false, features = ["std", "derive"] }
# Used for parsing markdown # Used for parsing markdown

4
src/atom/feeds.rs
View file

@ -10,7 +10,9 @@ use crate::utils::html::clean_html_all;
const ENTRY_TITLE_MAX_LENGTH: usize = 75; const ENTRY_TITLE_MAX_LENGTH: usize = 75;
fn get_min_datetime() -> DateTime<Utc> { fn get_min_datetime() -> DateTime<Utc> {
DateTime::from_utc(NaiveDateTime::from_timestamp(0, 0), Utc) let native = NaiveDateTime::from_timestamp_opt(0, 0)
.expect("0 should be a valid argument");
DateTime::from_utc(native, Utc)
} }
fn make_entry( fn make_entry(

6
src/http_signatures/verify.rs
View file

@ -70,7 +70,8 @@ pub fn parse_http_signature(
let created_at = if let Some(created_at) = signature_parameters.get("created") { let created_at = if let Some(created_at) = signature_parameters.get("created") {
let create_at_timestamp = created_at.parse() let create_at_timestamp = created_at.parse()
.map_err(|_| VerificationError::ParseError("invalid timestamp"))?; .map_err(|_| VerificationError::ParseError("invalid timestamp"))?;
Utc.timestamp(create_at_timestamp, 0) Utc.timestamp_opt(create_at_timestamp, 0).single()
.ok_or(VerificationError::ParseError("invalid timestamp"))?
} else { } else {
let date_str = request_headers.get("date") let date_str = request_headers.get("date")
.ok_or(VerificationError::ParseError("missing date"))? .ok_or(VerificationError::ParseError("missing date"))?
@ -83,7 +84,8 @@ pub fn parse_http_signature(
let expires_at = if let Some(expires_at) = signature_parameters.get("expires") { let expires_at = if let Some(expires_at) = signature_parameters.get("expires") {
let expires_at_timestamp = expires_at.parse() let expires_at_timestamp = expires_at.parse()
.map_err(|_| VerificationError::ParseError("invalid timestamp"))?; .map_err(|_| VerificationError::ParseError("invalid timestamp"))?;
Utc.timestamp(expires_at_timestamp, 0) Utc.timestamp_opt(expires_at_timestamp, 0).single()
.ok_or(VerificationError::ParseError("invalid timestamp"))?
} else { } else {
created_at + Duration::hours(SIGNATURE_EXPIRES_IN) created_at + Duration::hours(SIGNATURE_EXPIRES_IN)
}; };