The fastest, cheapest, most efficient open-source agent harness. Run more than 500 agents on a $10 VPS.
Rust agent-orchestrationai-agentsai-assistantdesktopllmlocal-firstmcppersonal-aiprivacyrustsecond-braintauri
refactor(config): move security config into its own module
Steven Enamakele06b1839a03c
diff --git a/crates/openhuman-core/src/channels/controllers/schemas.rs b/crates/openhuman-core/src/channels/controllers/schemas.rsindex d0eb4bd35a..0553ccb5b9 100644--- a/crates/openhuman-core/src/channels/controllers/schemas.rs+++ b/crates/openhuman-core/src/channels/controllers/schemas.rs@@ -16,12 +16,10 @@ use crate::security::credentials::channel_credential_provider;use tinychannels_bus::controllers::{all_channel_controller_schemas, channel_controller_schema, ChannelAuthMode,ChannelConnectRequest as ConnectParams, ChannelCreateThreadRequest as CreateThreadParams,- ChannelDisconnectRequest as DisconnectParams,- ChannelListThreadsRequest as ListThreadsParams,+ ChannelDisconnectRequest as DisconnectParams, ChannelListThreadsRequest as ListThreadsParams,ChannelSendMessageRequest as SendMessageParams,- ChannelSendReactionRequest as SendReactionParams,- ChannelStatusRequest as StatusParams, ChannelTestRequest as TestParams,- ChannelUpdateThreadRequest as UpdateThreadParams,+ ChannelSendReactionRequest as SendReactionParams, ChannelStatusRequest as StatusParams,+ ChannelTestRequest as TestParams, ChannelUpdateThreadRequest as UpdateThreadParams,DiscordCheckPermissionsRequest as DiscordCheckPermissionsParams,DiscordListChannelsRequest as DiscordListChannelsParams,};diff --git a/crates/openhuman-core/src/channels/host/channel_events.rs b/crates/openhuman-core/src/channels/host/channel_events.rsindex f3ab8ad75b..826f71ed79 100644--- a/crates/openhuman-core/src/channels/host/channel_events.rs+++ b/crates/openhuman-core/src/channels/host/channel_events.rs@@ -8,7 +8,7 @@ use std::path::PathBuf;use std::sync::{Arc, Mutex};use tinybus::module::ModuleClient;use tinybus::EventHandler;-use tinychannels_bus::{ChannelMessage, approvals::ReplyContext};+use tinychannels_bus::{approvals::ReplyContext, ChannelMessage};/// Captures the account configuration and reply addresses used by approvals.pub struct ChannelApprovalSurfaceSubscriber {diff --git a/crates/openhuman-core/src/config/schema/channels.rs b/crates/openhuman-core/src/config/schema/channels.rsindex 5329f5dcb4..98a69e6d59 100644--- a/crates/openhuman-core/src/config/schema/channels.rs+++ b/crates/openhuman-core/src/config/schema/channels.rs@@ -1,96 +1,7 @@-//! Channel provider configuration re-exported from tinychannels, plus-//! OpenHuman-owned security/sandbox configuration.--use schemars::JsonSchema;-use serde::{Deserialize, Serialize};+//! Channel provider configuration re-exported from TinyChannels.pub use tinychannels_bus::config::{ChannelsConfig, DingTalkConfig, DiscordConfig, EmailConfig, IMessageConfig, IrcConfig,LarkConfig, LarkReceiveMode, LinqConfig, MattermostConfig, QQConfig, SignalConfig, SlackConfig,StreamMode, TelegramConfig, WhatsAppConfig, YuanbaoConfig,};--#[derive(Debug, Clone, Serialize, Deserialize, Default, JsonSchema)]-pub struct SecurityConfig {- #[serde(default)]- pub sandbox: SandboxConfig,- #[serde(default)]- pub resources: ResourceLimitsConfig,- #[serde(default)]- pub audit: AuditConfig,-}--#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]-#[serde(default)]-pub struct SandboxConfig {- #[serde(default)]- pub enabled: Option<bool>,- #[serde(default)]- pub backend: SandboxBackend,- #[serde(default)]- pub firejail_args: Vec<String>,-}--impl Default for SandboxConfig {- fn default() -> Self {- Self {- enabled: None,- backend: SandboxBackend::Auto,- firejail_args: Vec::new(),- }- }-}--#[derive(Debug, Clone, Serialize, Deserialize, Default, JsonSchema)]-#[serde(rename_all = "lowercase")]-pub enum SandboxBackend {- #[default]- Auto,- Landlock,- Firejail,- Bubblewrap,- Docker,- None,-}--#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]-#[serde(default)]-#[derive(Default)]-pub struct ResourceLimitsConfig {}--#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]-#[serde(default)]-pub struct AuditConfig {- #[serde(default = "default_audit_enabled")]- pub enabled: bool,- #[serde(default = "default_audit_log_path")]- pub log_path: String,- #[serde(default = "default_audit_max_size_mb")]- pub max_size_mb: u32,-}--fn default_audit_enabled() -> bool {- true-}--fn default_audit_log_path() -> String {- "audit.log".to_string()-}--fn default_audit_max_size_mb() -> u32 {- 100-}--impl Default for AuditConfig {- fn default() -> Self {- Self {- enabled: default_audit_enabled(),- log_path: default_audit_log_path(),- max_size_mb: default_audit_max_size_mb(),- }- }-}--#[cfg(test)]-#[path = "channels_tests.rs"]-mod tests;diff --git a/crates/openhuman-core/src/config/schema/mod.rs b/crates/openhuman-core/src/config/schema/mod.rsindex b089aa75a3..b735859546 100644--- a/crates/openhuman-core/src/config/schema/mod.rs+++ b/crates/openhuman-core/src/config/schema/mod.rs@@ -70,6 +70,7 @@ mod routes;mod runtime;mod runtime_local_jail;mod scheduler_gate;+mod security;mod task_sources;mod tokenjuice;mod tools;@@ -84,9 +85,8 @@ pub use autonomy::AutonomyConfig;pub use capability_providers::{CapabilityProviderConfig, CapabilityProviderTrustState};pub use channel_voice::{ChannelVoiceConfig, ChannelVoiceOverride, VoiceReplyMode};pub use channels::{- AuditConfig, ChannelsConfig, DingTalkConfig, DiscordConfig, EmailConfig, IMessageConfig,- IrcConfig, LarkConfig, LarkReceiveMode, LinqConfig, MattermostConfig, QQConfig,- ResourceLimitsConfig, SandboxBackend, SandboxConfig, SecurityConfig, SignalConfig, SlackConfig,+ ChannelsConfig, DingTalkConfig, DiscordConfig, EmailConfig, IMessageConfig, IrcConfig,+ LarkConfig, LarkReceiveMode, LinqConfig, MattermostConfig, QQConfig, SignalConfig, SlackConfig,StreamMode, TelegramConfig, WhatsAppConfig, YuanbaoConfig,};pub(crate) use cli_overrides::set_cli_inference_overrides;@@ -120,6 +120,9 @@ pub use runtime::{};pub use runtime_local_jail::LocalJailConfig;pub use scheduler_gate::{PauseReason, Policy, SchedulerGateConfig, SchedulerGateMode};+pub use security::{+ AuditConfig, ResourceLimitsConfig, SandboxBackend, SandboxConfig, SecurityConfig,+};pub use task_sources::TaskSourcesConfig;pub use tokenjuice::TokenjuiceConfig;pub use tools::{diff --git a/crates/openhuman-core/src/config/schema/security.rs b/crates/openhuman-core/src/config/schema/security.rsnew file mode 100644index 0000000000..eb9faaf49f--- /dev/null+++ b/crates/openhuman-core/src/config/schema/security.rs@@ -0,0 +1,88 @@+//! OpenHuman-owned security, sandbox, and audit configuration.++use schemars::JsonSchema;+use serde::{Deserialize, Serialize};++#[derive(Debug, Clone, Serialize, Deserialize, Default, JsonSchema)]+pub struct SecurityConfig {+ #[serde(default)]+ pub sandbox: SandboxConfig,+ #[serde(default)]+ pub resources: ResourceLimitsConfig,+ #[serde(default)]+ pub audit: AuditConfig,+}++#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]+#[serde(default)]+pub struct SandboxConfig {+ #[serde(default)]+ pub enabled: Option<bool>,+ #[serde(default)]+ pub backend: SandboxBackend,+ #[serde(default)]+ pub firejail_args: Vec<String>,+}++impl Default for SandboxConfig {+ fn default() -> Self {+ Self {+ enabled: None,+ backend: SandboxBackend::Auto,+ firejail_args: Vec::new(),+ }+ }+}++#[derive(Debug, Clone, Serialize, Deserialize, Default, JsonSchema)]+#[serde(rename_all = "lowercase")]+pub enum SandboxBackend {+ #[default]+ Auto,+ Landlock,+ Firejail,+ Bubblewrap,+ Docker,+ None,+}++#[derive(Debug, Clone, Serialize, Deserialize, Default, JsonSchema)]+#[serde(default)]+pub struct ResourceLimitsConfig {}++#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]+#[serde(default)]+pub struct AuditConfig {+ #[serde(default = "default_audit_enabled")]+ pub enabled: bool,+ #[serde(default = "default_audit_log_path")]+ pub log_path: String,+ #[serde(default = "default_audit_max_size_mb")]+ pub max_size_mb: u32,+}++fn default_audit_enabled() -> bool {+ true+}++fn default_audit_log_path() -> String {+ "audit.log".to_string()+}++fn default_audit_max_size_mb() -> u32 {+ 100+}++impl Default for AuditConfig {+ fn default() -> Self {+ Self {+ enabled: default_audit_enabled(),+ log_path: default_audit_log_path(),+ max_size_mb: default_audit_max_size_mb(),+ }+ }+}++#[cfg(test)]+#[path = "security_tests.rs"]+mod tests;diff --git a/crates/openhuman-core/src/config/schema/channels_tests.rs b/crates/openhuman-core/src/config/schema/security_tests.rssimilarity index 100%rename from crates/openhuman-core/src/config/schema/channels_tests.rsrename to crates/openhuman-core/src/config/schema/security_tests.rs