Skip to content

fix(server): default bind to loopback and restore bind-address option #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
drew wants to merge 1 commit into from
Closed

fix(server): default bind to loopback and restore bind-address option #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/openshell-core/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ impl Config {
}

fn default_bind_address() -> SocketAddr {
"0.0.0.0:8080".parse().expect("valid default address")
"127.0.0.1:8080".parse().expect("valid default address")
}

fn default_log_level() -> String {
Expand Down
10 changes: 4 additions & 6 deletions crates/openshell-server/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

use clap::Parser;
use miette::{IntoDiagnostic, Result};
use std::net::SocketAddr;
use std::path::PathBuf;
use tracing::info;
use tracing_subscriber::EnvFilter;
Expand All @@ -18,9 +17,9 @@ use openshell_server::{run_server, tracing_bus::TracingLogBus};
#[command(version = openshell_core::VERSION)]
#[command(about = "OpenShell gRPC/HTTP server", long_about = None)]
struct Args {
/// Port to bind the server to (all interfaces).
#[arg(long, default_value_t = 8080, env = "OPENSHELL_SERVER_PORT")]
port: u16,
/// Address to bind the server to. Defaults to loopback for safety.
#[arg(long, env = "OPENSHELL_SERVER_BIND", default_value = "127.0.0.1:8080")]
bind: std::net::SocketAddr,

/// Log level (trace, debug, info, warn, error).
#[arg(long, default_value = "info", env = "OPENSHELL_LOG_LEVEL")]
Expand Down Expand Up @@ -125,7 +124,6 @@ async fn main() -> Result<()> {
);

// Build configuration
let bind = SocketAddr::from(([0, 0, 0, 0], args.port));

let tls = if args.disable_tls {
None
Expand All @@ -152,7 +150,7 @@ async fn main() -> Result<()> {
};

let mut config = openshell_core::Config::new(tls)
.with_bind_address(bind)
.with_bind_address(args.bind)
.with_log_level(&args.log_level);

config = config
Expand Down
Loading