Skip to content

Commit 2f939d9

Browse files
committed
fixed hardcoded SocketAddresses
1 parent d10e822 commit 2f939d9

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

src/server/mod.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@ pub async fn launch(config: crate::config::Config) {
4343
{
4444
let state = GitServer {
4545
instance_url: format!("https://{}", https_addr),
46-
addr: https_addr,
46+
addr: SocketAddr::from(([0, 0, 0, 0], 443)),
4747
};
4848

49+
let addr = state.addr.clone();
50+
4951
let https_router = main_router.clone().with_state(state.clone());
5052
let redirect_state = state.clone();
5153
let redirect_router = Router::new().fallback(move |req: Request<Body>| {
@@ -54,7 +56,7 @@ pub async fn launch(config: crate::config::Config) {
5456
});
5557
let redirect_router = redirect_router.into_make_service();
5658

57-
let https_server = run_https(https_addr, https_router.into_make_service());
59+
let https_server = run_https(addr, https_router.into_make_service());
5860
match config.http_redirect {
5961
true => {
6062
let http_redirect_server = run_http_redirect(http_addr, redirect_router);
@@ -67,11 +69,13 @@ pub async fn launch(config: crate::config::Config) {
6769
// Run only a plain HTTP server.
6870
let state = GitServer {
6971
instance_url: format!("http://{}", http_addr),
70-
addr: http_addr,
72+
addr: SocketAddr::from(([0, 0, 0, 0], 80)),
7173
};
7274

75+
let addr = state.addr.clone();
76+
7377
let router = main_router.with_state(state).into_make_service();
74-
run_http(http_addr, router).await;
78+
run_http(addr, router).await;
7579
}
7680
}
7781

@@ -90,7 +94,6 @@ fn build_main_router() -> Router<GitServer> {
9094
async fn run_https(addr: SocketAddr, router: IntoMakeService<Router>) {
9195
let tls_config = make_tls_config().await;
9296
info!("Starting HTTPS server on {}", addr);
93-
let mut new_addr = addr;
9497
axum_server::bind_rustls(addr, tls_config)
9598
.serve(router)
9699
.await

0 commit comments

Comments
 (0)