set_var

Author: epompeii

lib/api_server/src/config.rs

@@ -1,18 +1,19 @@
-use bencher_config::{Config, BENCHER_CONFIG};
+use bencher_config::{BENCHER_CONFIG, Config};
 use bencher_endpoint::{CorsResponse, Endpoint, Get, Put, ResponseAccepted, ResponseOk};
 use bencher_json::{
-    system::config::{JsonConsole, JsonUpdateConfig},
     JsonConfig,
+    system::config::{JsonConsole, JsonUpdateConfig},
 };
 use bencher_schema::{
+    conn_lock,
     context::ApiContext,
     error::{bad_request_error, issue_error},
     model::user::{
         admin::AdminUser,
         auth::{AuthUser, BearerToken, PubBearerToken},
     },
 };
-use dropshot::{endpoint, HttpError, RequestContext, TypedBody};
+use dropshot::{HttpError, RequestContext, TypedBody, endpoint};
 use slog::Logger;
 
 use super::restart::countdown;
@@ -91,7 +92,16 @@ async fn put_inner(
 
     // TODO add validation here
     let config_str = serde_json::to_string(&config).map_err(bad_request_error)?;
-    std::env::set_var(BENCHER_CONFIG, &config_str);
+    {
+        let _conn = conn_lock!(context);
+        // SAFETY: This is safe because we are setting the environment variable
+        // while holding a lock on the database connection.
+        // This guarantees that no other thread is writing to the environment variable
+        #[allow(unsafe_code, reason = "set environment variable")]
+        unsafe {
+            std::env::set_var(BENCHER_CONFIG, &config_str);
+        }
+    }
     Config::write(log, config_str.as_bytes())
         .await
         .map_err(|e| {

lib/bencher_config/src/config_tx.rs

@@ -4,30 +4,30 @@ use bencher_endpoint::Registrar;
 #[cfg(feature = "plus")]
 use bencher_json::system::config::{JsonLitestream, JsonPlus};
 use bencher_json::{
+    JsonConfig,
     system::config::{
         IfExists, JsonConsole, JsonDatabase, JsonLogging, JsonSecurity, JsonServer, JsonSmtp,
         JsonTls, LogLevel, ServerLog,
     },
-    JsonConfig,
 };
 use bencher_rbac::init_rbac;
 use bencher_schema::context::{ApiContext, Database, DbConnection};
 #[cfg(feature = "plus")]
 use bencher_schema::{context::RateLimiting, model::server::QueryServer};
 use bencher_token::TokenKey;
+use diesel::Connection;
 #[cfg(feature = "plus")]
 use diesel::connection::SimpleConnection;
-use diesel::Connection;
 use dropshot::{
     ApiDescription, ConfigDropshot, ConfigLogging, ConfigLoggingIfExists, ConfigLoggingLevel,
     ConfigTls, HttpServer,
 };
-use slog::{debug, error, info, Logger};
+use slog::{Logger, debug, error, info};
 use tokio::sync::mpsc::Sender;
 
 use super::Config;
 #[cfg(feature = "plus")]
-use super::{plus::Plus, DEFAULT_BUSY_TIMEOUT};
+use super::{DEFAULT_BUSY_TIMEOUT, plus::Plus};
 
 const DATABASE_URL: &str = "DATABASE_URL";
 
@@ -273,7 +273,12 @@ fn diesel_database_url(log: &Logger, database_path: &str) {
         debug!(log, "Failed to find \"{DATABASE_URL}\"");
     }
     debug!(log, "Setting \"{DATABASE_URL}\" to {database_path}");
-    std::env::set_var(DATABASE_URL, database_path);
+    // SAFETY: This is safe because we are setting the environment variable
+    // from a single thread at startup.
+    #[allow(unsafe_code, reason = "set environment variable")]
+    unsafe {
+        std::env::set_var(DATABASE_URL, database_path);
+    }
 }
 
 #[cfg(feature = "plus")]