Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-11-26 05:50:29 +01:00
Merge branch 'stefan0xC-check-sqlite-folder'
Dieser Commit ist enthalten in:
Commit
23c2921690
2 geänderte Dateien mit 16 neuen und 15 gelöschten Zeilen
|
@ -638,7 +638,15 @@ make_config! {
|
||||||
|
|
||||||
fn validate_config(cfg: &ConfigItems) -> Result<(), Error> {
|
fn validate_config(cfg: &ConfigItems) -> Result<(), Error> {
|
||||||
// Validate connection URL is valid and DB feature is enabled
|
// Validate connection URL is valid and DB feature is enabled
|
||||||
DbConnType::from_url(&cfg.database_url)?;
|
let url = &cfg.database_url;
|
||||||
|
if DbConnType::from_url(url)? == DbConnType::sqlite && url.contains('/') {
|
||||||
|
let path = std::path::Path::new(&url);
|
||||||
|
if let Some(parent) = path.parent() {
|
||||||
|
if !parent.is_dir() {
|
||||||
|
err!(format!("SQLite database directory `{}` does not exist or is not a directory", parent.display()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let limit = 256;
|
let limit = 256;
|
||||||
if cfg.database_max_conns < 1 || cfg.database_max_conns > limit {
|
if cfg.database_max_conns < 1 || cfg.database_max_conns > limit {
|
||||||
|
|
|
@ -424,22 +424,15 @@ mod sqlite_migrations {
|
||||||
pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("migrations/sqlite");
|
pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("migrations/sqlite");
|
||||||
|
|
||||||
pub fn run_migrations() -> Result<(), super::Error> {
|
pub fn run_migrations() -> Result<(), super::Error> {
|
||||||
// Make sure the directory exists
|
|
||||||
let url = crate::CONFIG.database_url();
|
|
||||||
let path = std::path::Path::new(&url);
|
|
||||||
|
|
||||||
if let Some(parent) = path.parent() {
|
|
||||||
if std::fs::create_dir_all(parent).is_err() {
|
|
||||||
error!("Error creating database directory");
|
|
||||||
std::process::exit(1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
use diesel::{Connection, RunQueryDsl};
|
use diesel::{Connection, RunQueryDsl};
|
||||||
// Make sure the database is up to date (create if it doesn't exist, or run the migrations)
|
let url = crate::CONFIG.database_url();
|
||||||
let mut connection = diesel::sqlite::SqliteConnection::establish(&crate::CONFIG.database_url())?;
|
|
||||||
// Disable Foreign Key Checks during migration
|
|
||||||
|
|
||||||
|
// Establish a connection to the sqlite database (this will create a new one, if it does
|
||||||
|
// not exist, and exit if there is an error).
|
||||||
|
let mut connection = diesel::sqlite::SqliteConnection::establish(&url)?;
|
||||||
|
|
||||||
|
// Run the migrations after successfully establishing a connection
|
||||||
|
// Disable Foreign Key Checks during migration
|
||||||
// Scoped to a connection.
|
// Scoped to a connection.
|
||||||
diesel::sql_query("PRAGMA foreign_keys = OFF")
|
diesel::sql_query("PRAGMA foreign_keys = OFF")
|
||||||
.execute(&mut connection)
|
.execute(&mut connection)
|
||||||
|
|
Laden …
In neuem Issue referenzieren