diff --git a/renovate.json b/renovate.json index 8d7db27..995d4f7 100644 --- a/renovate.json +++ b/renovate.json @@ -1,8 +1,14 @@ { + "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "config:base" + "config:base", + "schedule:weekly", + "group:allNonMajor", + ":semanticCommits" + ], + "labels": [ + "dependencies" ], - "prHourlyLimit": 0, "automergeType": "pr", "prCreation": "immediate", "packageRules": [ @@ -16,4 +22,4 @@ "automerge": true } ] -} +} \ No newline at end of file diff --git a/server/src/fs/create_dir.rs b/server/src/fs/create_dir.rs index a705065..8664292 100644 --- a/server/src/fs/create_dir.rs +++ b/server/src/fs/create_dir.rs @@ -3,10 +3,10 @@ use std::fs; use axum::{extract::rejection::JsonRejection, Extension, Json}; use axum_auth::AuthBearer; use homedisk_database::Database; -use homedisk_types::fs::create_dir::Request; use homedisk_types::{ config::Config, errors::{FsError, ServerError}, + fs::create_dir::Request, }; use crate::middleware::{find_user, validate_json, validate_jwt}; @@ -42,6 +42,6 @@ pub async fn handle( fs::create_dir_all(path) .map_err(|err| ServerError::FsError(FsError::CreateDirectory(err.to_string())))?; - // send a blank Response + // send aan empty Response Ok(()) } diff --git a/server/src/fs/delete.rs b/server/src/fs/delete.rs index a7c2c66..1672b8e 100644 --- a/server/src/fs/delete.rs +++ b/server/src/fs/delete.rs @@ -1,7 +1,6 @@ use std::{fs, path::Path}; -use axum::extract::Query; -use axum::Extension; +use axum::{extract::Query, Extension}; use axum_auth::AuthBearer; use homedisk_database::Database; use homedisk_types::{ @@ -55,6 +54,6 @@ pub async fn handle( .map_err(|err| ServerError::FsError(FsError::DeleteDirectory(err.to_string())))?; } - // send a blank Response + // send an empty Response Ok(()) } diff --git a/server/src/fs/download.rs b/server/src/fs/download.rs index dc48cd7..657c547 100644 --- a/server/src/fs/download.rs +++ b/server/src/fs/download.rs @@ -1,7 +1,6 @@ use std::fs; -use axum::extract::Query; -use axum::Extension; +use axum::{extract::Query, Extension}; use axum_auth::AuthBearer; use homedisk_database::Database; use homedisk_types::fs::upload::Pagination; diff --git a/server/src/fs/list.rs b/server/src/fs/list.rs index 24be1df..9361b11 100644 --- a/server/src/fs/list.rs +++ b/server/src/fs/list.rs @@ -5,11 +5,10 @@ use axum::{extract::rejection::JsonRejection, Extension, Json}; use axum_auth::AuthBearer; use byte_unit::Byte; use homedisk_database::Database; -use homedisk_types::fs::list::DirInfo; use homedisk_types::{ config::Config, errors::{FsError, ServerError}, - fs::list::{FileInfo, Request, Response}, + fs::list::{DirInfo, FileInfo, Request, Response}, }; use crate::middleware::{find_user, validate_json, validate_jwt}; diff --git a/server/src/fs/upload.rs b/server/src/fs/upload.rs index 93841b6..cd4941c 100644 --- a/server/src/fs/upload.rs +++ b/server/src/fs/upload.rs @@ -1,8 +1,10 @@ use std::io::Write; use std::{fs, path::Path}; -use axum::extract::{Multipart, Query}; -use axum::Extension; +use axum::{ + extract::{Multipart, Query}, + Extension, +}; use axum_auth::AuthBearer; use futures::TryStreamExt; use homedisk_database::Database; @@ -75,6 +77,6 @@ pub async fn handle( .await .map_err(|err| ServerError::FsError(FsError::WriteFile(err.to_string())))?; - // send a blank Response + // send an empty Response Ok(()) } diff --git a/server/src/middleware/auth.rs b/server/src/middleware/auth.rs index 594923c..5317547 100644 --- a/server/src/middleware/auth.rs +++ b/server/src/middleware/auth.rs @@ -19,14 +19,26 @@ mod tests { use super::validate_jwt; + const SECRET: &[u8] = b"secret"; + const INVALID_SECRET: &[u8] = b"invalid secret"; + /// Test a token validation #[test] fn validate_token() { - let secret = b"secret"; let user = User::new("username", "password"); - let token = create_token(&user, secret, 1).unwrap(); + let token = create_token(&user, SECRET, 1).unwrap(); - validate_jwt(secret, &token).unwrap(); + validate_jwt(SECRET, &token).unwrap(); + } + + /// Test a token validation (invalid secret) + #[test] + fn validate_token_invalid_secret() { + let user = User::new("username", "password"); + + let token = create_token(&user, SECRET, 1).unwrap(); + + validate_jwt(INVALID_SECRET, &token).unwrap_err(); } }