Merge e054287886 into f21a3adae2

src/api/admin.rs

@@ -816,7 +816,7 @@ async fn delete_config(_token: AdminToken) -> EmptyResult {
 #[post("/config/backup_db", format = "application/json")]
 fn backup_db(_token: AdminToken) -> ApiResult<String> {
     if *CAN_BACKUP {
-        match backup_sqlite() {
+        match backup_sqlite(None) {
             Ok(f) => Ok(format!("Backup to '{f}' was successful")),
             Err(e) => err!(format!("Backup was unsuccessful {e}")),
         }

src/db/mod.rs

@@ -385,7 +385,7 @@ pub mod models;
 /// Creates a back-up of the sqlite database
 /// MySQL/MariaDB and PostgreSQL are not supported.
 #[cfg(sqlite)]
-pub fn backup_sqlite() -> Result<String, Error> {
+pub fn backup_sqlite(output_dir: Option<String>) -> Result<String, Error> {
     use diesel::Connection;
 
     let db_url = CONFIG.database_url();
@@ -394,8 +394,18 @@ pub fn backup_sqlite() -> Result<String, Error> {
         // This way we can set a readonly flag on the opening mode without issues.
         let mut conn = diesel::sqlite::SqliteConnection::establish(&format!("sqlite://{db_url}?mode=ro"))?;
 
-        let db_path = std::path::Path::new(&db_url).parent().unwrap();
+        let backup_dir = match &output_dir {
-        let backup_file = db_path
+            Some(dir) => {
+                let output_path = std::path::Path::new(dir);
+                if !output_path.exists() || !output_path.is_dir() {
+                    err!(format!("Backup directory does not exist or is not a directory: {}", dir));
+                }
+                output_path
+            }
+            None => std::path::Path::new(&db_url).parent().unwrap(),
+        };
+
+        let backup_file = backup_dir
             .join(format!("db_{}.sqlite3", chrono::Utc::now().format("%Y%m%d_%H%M%S")))
             .to_string_lossy()
             .into_owned();
@@ -413,7 +423,7 @@ pub fn backup_sqlite() -> Result<String, Error> {
 }
 
 #[cfg(not(sqlite))]
-pub fn backup_sqlite() -> Result<String, Error> {
+pub fn backup_sqlite(_output_dir: Option<String>) -> Result<String, Error> {
     err_silent!("The database type is not SQLite. Backups only works for SQLite databases")
 }
 

src/main.rs

@@ -105,7 +105,7 @@ FLAGS:
 
 COMMAND:
     hash [--preset {bitwarden|owasp}]  Generate an Argon2id PHC ADMIN_TOKEN
-    backup                             Create a backup of the SQLite database
+    backup [-o, --output <dir>]        Create a backup of the SQLite database
                                        You can also send the USR1 signal to trigger a backup
 
 PRESETS:                  m=         t=          p=
@@ -187,7 +187,9 @@ fn parse_args() {
                 exit(1);
             }
         } else if command == "backup" {
-            match db::backup_sqlite() {
+            let output_dir: Option<String> = pargs.opt_value_from_str(["-o", "--output"]).unwrap_or_default();
+
+            match db::backup_sqlite(output_dir) {
                 Ok(f) => {
                     println!("Backup to '{f}' was successful");
                     exit(0);
@@ -608,7 +610,7 @@ async fn launch_rocket(pool: db::DbPool, extra_debug: bool) -> Result<(), Error>
                     // If we need more signals to act upon, we might want to use select! here.
                     // With only one item to listen for this is enough.
                     let _ = signal_user1.recv().await;
-                    match db::backup_sqlite() {
+                    match db::backup_sqlite(None) {
                         Ok(f) => info!("Backup to '{f}' was successful"),
                         Err(e) => error!("Backup failed. {e:?}"),
                     }