scriptoriumadmin/fabro
1
0
Fork 0
mirror of https://github.com/fabro-sh/fabro.git synced 2026-10-07 03:00:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(server): decouple server.env path from vault path in AppState construction

Browse source 
build_app_state_with_path derived the server.env path from the vault
path's parent directory, causing it to look in vaults/default/ instead
of the storage root. This made fabro doctor report missing GitHub App
credentials even though fabro install saved them correctly.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Bryan Helmkamp 2026-04-14 21:06:05 -04:00
parent 8f26a080cf
commit 3be7916fbc
No known key found for this signature in database
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/crates/fabro-server/src/serve.rs
View file

@ -296,7 +296,8 @@ where
};
let storage = Storage::new(&data_dir);
let vault_path = storage.secrets_path();
let server_secrets = ServerSecrets::load(storage.server_state().env_path())?;
let server_env_path = storage.server_state().env_path();
let server_secrets = ServerSecrets::load(server_env_path.clone())?;
// Shared config for live reloading
let effective_settings = apply_runtime_settings(&disk_settings, &args, &data_dir);
@ -332,6 +333,7 @@ where
store,
artifact_store,
&vault_path,
&server_env_path,
true,
&env_lookup,
)?;

18
lib/crates/fabro-server/src/server.rs
View file

@ -2160,13 +2160,16 @@ pub fn create_app_state_with_settings_and_registry_factory(
) -> Arc<AppState> {
let (store, artifact_store) = test_store_bundle();
let env_lookup = default_env_lookup();
let secrets_path = test_secret_store_path();
let server_env_path = secrets_path.with_file_name("server.env");
build_app_state_with_path(
Arc::new(RwLock::new(settings)),
Some(Box::new(registry_factory_override)),
5,
store,
artifact_store,
&test_secret_store_path(),
&secrets_path,
&server_env_path,
false,
&env_lookup,
)
@ -2233,6 +2236,7 @@ pub(crate) fn create_test_app_state_with_session_key(
store,
artifact_store,
&secrets_path,
&server_env_path,
local_daemon_mode,
&env_lookup,
)
@ -2273,13 +2277,16 @@ fn create_app_state_with_store_and_env_lookup(
artifact_store: ArtifactStore,
env_lookup: &EnvLookup,
) -> Arc<AppState> {
let secrets_path = test_secret_store_path();
let server_env_path = secrets_path.with_file_name("server.env");
build_app_state_with_path(
settings,
None,
max_concurrent_runs,
store,
artifact_store,
&test_secret_store_path(),
&secrets_path,
&server_env_path,
false,
env_lookup,
)
@ -2297,15 +2304,12 @@ pub(crate) fn build_app_state_with_path(
store: Arc<Database>,
artifact_store: ArtifactStore,
vault_path: &std::path::Path,
server_env_path: &std::path::Path,
local_daemon_mode: bool,
env_lookup: &EnvLookup,
) -> anyhow::Result<Arc<AppState>> {
let vault = Arc::new(AsyncRwLock::new(Vault::load(vault_path.to_path_buf())?));
let server_env_path = vault_path.parent().map_or_else(
|| PathBuf::from("server.env"),
|parent| parent.join("server.env"),
);
let server_secrets = ServerSecrets::with_env_lookup(server_env_path, {
let server_secrets = ServerSecrets::with_env_lookup(server_env_path.to_path_buf(), {
let env_lookup = Arc::clone(env_lookup);
move |name| env_lookup(name)
})?;