cjw/Oxicloud
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

feat(drive): add readonly policy

Browse Source 
permmit admin to freeze a drive, trash janitor background job is also disabled for this drive
This commit is contained in:
Edouard Vanbelle
2026-07-15 22:21:15 +02:00
parent 346e2e879c
commit a6427fc028
33 changed files with 1094 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/interfaces/api/handlers/drive_handler.rs
+5
View File
@@ -404,6 +404,8 @@ pub struct UpdateDrivePoliciesDto {
pub include_in_photo_index: Option<bool>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub include_in_music_index: Option<bool>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub read_only: Option<bool>,
}
/// `PATCH /api/drives/{id}/policies` — **OxiCloud-admin only** policy
@@ -488,6 +490,9 @@ pub async fn update_drive_policies(
if let Some(v) = dto.include_in_music_index {
partial_obj.insert("include_in_music_index".into(), serde_json::Value::Bool(v));
}
if let Some(v) = dto.read_only {
partial_obj.insert("read_only".into(), serde_json::Value::Bool(v));
}
// Pass the raw JSON straight through so the JSONB `||` merge in
// the repo only touches keys the caller supplied. Round-tripping
// via `DrivePolicies` (which has `#[serde(default)]`) would
src/interfaces/api/handlers/trash_handler.rs
+24 -68
View File
@@ -97,7 +97,7 @@ pub async fn move_file_to_trash(
State(state): State<Arc<AppState>>,
auth_user: AuthUser,
Path(item_id): Path<String>,
) -> (StatusCode, Json<serde_json::Value>) {
) -> axum::response::Response {
let user_id = auth_user.id;
debug!(
"Request to move file to trash: id={}, user={}",
@@ -112,7 +112,8 @@ pub async fn move_file_to_trash(
Json(json!({
"error": "Trash feature is not enabled"
})),
);
)
.into_response();
}
};
@@ -129,15 +130,11 @@ pub async fn move_file_to_trash(
"message": "File moved to trash successfully"
})),
)
.into_response()
}
Err(e) => {
error!("Error moving file to trash: {:?}", e);
(
StatusCode::INTERNAL_SERVER_ERROR,
Json(json!({
"error": "Error moving file to trash"
})),
)
warn!("move_file_to_trash failed: {:?}", e);
AppError::from(e).into_response()
}
}
}
@@ -159,7 +156,7 @@ pub async fn move_folder_to_trash(
State(state): State<Arc<AppState>>,
auth_user: AuthUser,
Path(item_id): Path<String>,
) -> (StatusCode, Json<serde_json::Value>) {
) -> axum::response::Response {
let user_id = auth_user.id;
debug!(
"Request to move folder to trash: id={}, user={}",
@@ -174,7 +171,8 @@ pub async fn move_folder_to_trash(
Json(json!({
"error": "Trash feature is not enabled"
})),
);
)
.into_response();
}
};
@@ -193,15 +191,11 @@ pub async fn move_folder_to_trash(
"message": "Folder moved to trash successfully"
})),
)
.into_response()
}
Err(e) => {
error!("Error moving folder to trash: {:?}", e);
(
StatusCode::INTERNAL_SERVER_ERROR,
Json(json!({
"error": "Error moving folder to trash"
})),
)
warn!("move_folder_to_trash failed: {:?}", e);
AppError::from(e).into_response()
}
}
}
@@ -223,7 +217,7 @@ pub async fn restore_from_trash(
State(state): State<Arc<AppState>>,
auth_user: AuthUser,
Path(trash_id): Path<String>,
) -> (StatusCode, Json<serde_json::Value>) {
) -> axum::response::Response {
debug!("Request to restore item {} from trash", trash_id);
let trash_service = match state.trash_service.as_ref() {
@@ -234,7 +228,8 @@ pub async fn restore_from_trash(
Json(json!({
"error": "Trash feature is not enabled"
})),
);
)
.into_response();
}
};
let result = trash_service.restore_item(&trash_id, auth_user.id).await;
@@ -249,31 +244,11 @@ pub async fn restore_from_trash(
"message": "Item restored successfully"
})),
)
.into_response()
}
Err(e) => {
let err_str = format!("{}", e);
// If item not found, report success (it was already restored or removed)
if err_str.contains("not found") || err_str.contains("NotFound") {
warn!(
"Item not found in trash, but reporting success: {}",
trash_id
);
return (
StatusCode::OK,
Json(json!({
"success": true,
"message": "Item restored (or was already removed from trash)"
})),
);
}
error!("Error restoring item from trash: {:?}", e);
(
StatusCode::INTERNAL_SERVER_ERROR,
Json(json!({
"error": "Error restoring item from trash"
})),
)
warn!("restore_from_trash failed: {:?}", e);
AppError::from(e).into_response()
}
}
}
@@ -295,7 +270,7 @@ pub async fn delete_permanently(
State(state): State<Arc<AppState>>,
auth_user: AuthUser,
Path(trash_id): Path<String>,
) -> (StatusCode, Json<serde_json::Value>) {
) -> axum::response::Response {
debug!("Request to permanently delete item {}", trash_id);
let trash_service = match state.trash_service.as_ref() {
@@ -306,7 +281,8 @@ pub async fn delete_permanently(
Json(json!({
"error": "Trash feature is not enabled"
})),
);
)
.into_response();
}
};
let result = trash_service
@@ -323,31 +299,11 @@ pub async fn delete_permanently(
"message": "Item deleted permanently"
})),
)
.into_response()
}
Err(e) => {
let err_str = format!("{}", e);
// If item not found, report success (it was already deleted)
if err_str.contains("not found") || err_str.contains("NotFound") {
warn!(
"Item not found in trash, but reporting success: {}",
trash_id
);
return (
StatusCode::OK,
Json(json!({
"success": true,
"message": "Item deleted (or was already removed from trash)"
})),
);
}
error!("Error permanently deleting item: {:?}", e);
(
StatusCode::INTERNAL_SERVER_ERROR,
Json(json!({
"error": "Error deleting item permanently"
})),
)
warn!("delete_permanently failed: {:?}", e);
AppError::from(e).into_response()
}
}
}