robin/shelve
1
0
Fork 0
mirror of https://codeberg.org/icewind/shelve.git synced 2026-06-03 12:04:09 +02:00
Code Issues Releases Wiki Activity

update deps

Browse source
This commit is contained in:
Robin Appelman 2024-01-06 22:58:20 +01:00
commit 97c05ed684
5 changed files with 626 additions and 535 deletions
Download patch file Download diff file Expand all files Collapse all files

1143
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

20
Cargo.toml
View file

@ -7,14 +7,14 @@ license = "MIT OR Apache-2.0"
rust-version = "1.56.0" rust-version = "1.56.0"
[dependencies] [dependencies]
rocket = "0.5.0-rc.1" rocket = "0.5.0"
priority-queue = "1.2.1" priority-queue = "1.3.2"
dotenv = "0.15.0" dotenvy = "0.15.7"
err-derive = "0.3.1" thiserror = "1.0.51"
rand = "0.8.5" rand = "0.8.5"
uuid = { version = "1.1", features = ["serde", "v4"] } uuid = { version = "1.6.1", features = ["serde", "v4"] }
rust-embed = "6.4" rust-embed = "8.1.0"
serde = "1.0.136" serde = "1.0.193"
serde_json = "1.0.79" serde_json = "1.0.108"
async-trait = "0.1.53" async-trait = "0.1.75"
futures-util = { version = "0.3.21" } futures-util = "0.3.30"

10
src/expire_queue.rs
View file

@ -1,9 +1,9 @@
use err_derive::Error;
use priority_queue::PriorityQueue; use priority_queue::PriorityQueue;
use std::cmp::Ordering; use std::cmp::Ordering;
use std::convert::TryInto; use std::convert::TryInto;
use std::fmt::{Debug, Display, Formatter}; use std::fmt::{Debug, Display, Formatter};
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use thiserror::Error;
use uuid::{Builder, Uuid, Variant, Version}; use uuid::{Builder, Uuid, Variant, Version};
#[derive(Debug, Clone, Hash, PartialEq, Eq, Copy)] #[derive(Debug, Clone, Hash, PartialEq, Eq, Copy)]
@ -11,10 +11,10 @@ pub struct UploadId(Uuid);
#[derive(Debug, Error)] #[derive(Debug, Error)]
pub enum InvalidUploadIdError { pub enum InvalidUploadIdError {
#[error(display = "Invalid string")] #[error("Invalid string")]
InvalidString(#[error(source)] std::str::Utf8Error), InvalidString(#[from] std::str::Utf8Error),
#[error(display = "Invalid upload id, uuid")] #[error("Invalid upload id, uuid")]
InvalidUUID(#[error(source)] uuid::Error), InvalidUUID(#[from] uuid::Error),
} }
impl UploadId { impl UploadId {

2
src/main.rs
View file

@ -1,6 +1,6 @@
use crate::expire_queue::{ExpireQueue, InvalidUploadIdError, UploadId}; use crate::expire_queue::{ExpireQueue, InvalidUploadIdError, UploadId};
use crate::token::{UploadToken, ValidTokens}; use crate::token::{UploadToken, ValidTokens};
use dotenv::dotenv; use dotenvy::dotenv;
use futures_util::future::try_join_all; use futures_util::future::try_join_all;
use rocket::data::{Limits, ToByteUnit}; use rocket::data::{Limits, ToByteUnit};
use rocket::form::Form; use rocket::form::Form;

14
src/token.rs
View file

@ -1,9 +1,9 @@
use err_derive::Error;
use rocket::http::Status; use rocket::http::Status;
use rocket::outcome::Outcome; use rocket::outcome::Outcome;
use rocket::request::{self, FromRequest, Request}; use rocket::request::{self, FromRequest, Request};
use rocket::State; use rocket::State;
use std::iter::FromIterator; use std::iter::FromIterator;
use thiserror::Error;
#[derive(PartialOrd, PartialEq, Debug)] #[derive(PartialOrd, PartialEq, Debug)]
pub struct UploadToken(String); pub struct UploadToken(String);
@ -29,11 +29,11 @@ impl ValidTokens {
#[derive(Debug, Error)] #[derive(Debug, Error)]
pub enum UploadTokenError { pub enum UploadTokenError {
#[error(display = "Wrong number of upload tokens provided")] #[error("Wrong number of upload tokens provided")]
BadCount, BadCount,
#[error(display = "No upload token provided")] #[error("No upload token provided")]
Missing, Missing,
#[error(display = "Invalid upload token")] #[error("Invalid upload token")]
Invalid, Invalid,
} }
@ -49,12 +49,12 @@ impl<'r> FromRequest<'r> for UploadToken {
let keys: Vec<_> = request.headers().get("x-upload-token").collect(); let keys: Vec<_> = request.headers().get("x-upload-token").collect();
match keys.len() { match keys.len() {
0 => Outcome::Failure((Status::Unauthorized, UploadTokenError::Missing)), 0 => Outcome::Error((Status::Unauthorized, UploadTokenError::Missing)),
1 if accepted_tokens.contains(keys[0]) => { 1 if accepted_tokens.contains(keys[0]) => {
Outcome::Success(UploadToken(keys[0].to_string())) Outcome::Success(UploadToken(keys[0].to_string()))
} }
1 => Outcome::Failure((Status::Unauthorized, UploadTokenError::Invalid)), 1 => Outcome::Error((Status::Unauthorized, UploadTokenError::Invalid)),
_ => Outcome::Failure((Status::BadRequest, UploadTokenError::BadCount)), _ => Outcome::Error((Status::BadRequest, UploadTokenError::BadCount)),
} }
} }
} }