From bf60d037f297b6674a553a8087c19e579ed46dc4 Mon Sep 17 00:00:00 2001
From: Deng Ming <mingflycash@gmail.com>
Date: Sat, 2 Jul 2022 16:51:47 +0800
Subject: [PATCH] fix 4907: force admin service http only

---
 CHANGELOG.md        | 1 +
 server/web/admin.go | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6649ad9..85a6d318 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # developing
 - [Fix 4984: random expire cache](https://github.com/beego/beego/pull/4984)
+- [Fix 4907: make admin serve HTTP only](https://github.com/beego/beego/pull/5005)
 
 
 # v2.0.4
diff --git a/server/web/admin.go b/server/web/admin.go
index 285f7feb..56d2906f 100644
--- a/server/web/admin.go
+++ b/server/web/admin.go
@@ -16,6 +16,7 @@ package web
 
 import (
 	"fmt"
+	"net"
 	"net/http"
 	"reflect"
 	"time"
@@ -86,7 +87,7 @@ func (admin *adminApp) Run() {
 		" please invoke task.StartTask, or task will not be executed")
 	addr := BConfig.Listen.AdminAddr
 	if BConfig.Listen.AdminPort != 0 {
-		addr = fmt.Sprintf("%s:%d", BConfig.Listen.AdminAddr, BConfig.Listen.AdminPort)
+		addr = net.JoinHostPort(BConfig.Listen.AdminAddr, fmt.Sprintf("%d", BConfig.Listen.AdminPort))
 	}
 	logs.Info("Admin server Running on %s", addr)
 	admin.HttpServer.Run(addr)
@@ -102,6 +103,7 @@ func registerAdmin() error {
 		// copy config to avoid conflict
 		adminCfg := *BConfig
 		adminCfg.Listen.EnableHTTPS = false
+		adminCfg.Listen.EnableMutualHTTPS = false
 		beeAdminApp = &adminApp{
 			HttpServer: NewHttpServerWithCfg(&adminCfg),
 		}