容器里的治理进程以固定非 root 用户运行,agent 原先只接受与自身同 uid 的连接, socket 挂进容器后一律被拒(peer uid is not allowed)。新增 --allow-peer-uid, 默认仍只允许同 uid,放行清单只能由部署参数给出,避免"挂上就能连"。
This commit is contained in:
@@ -1,5 +1,13 @@
|
||||
# Changelog
|
||||
|
||||
## 开发快照 0.1.382(采集 agent 允许显式 peer uid)
|
||||
|
||||
### Added
|
||||
|
||||
- 采集 agent 新增 `--allow-peer-uid`:默认仍只允许与 agent 同 uid 的连接;容器以固定
|
||||
非 root 用户运行时,由部署参数显式列出该 uid。socket 文件权限之外再加一层 uid 校验,
|
||||
放行清单来自部署,不是"谁都能连"。
|
||||
|
||||
## 开发快照 0.1.381(维护窗口支持显式 no-gate 测试模式)
|
||||
|
||||
### Added
|
||||
|
||||
@@ -10,6 +10,8 @@ import (
|
||||
"os"
|
||||
"os/signal"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
"strings"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
@@ -33,9 +35,23 @@ func main() {
|
||||
flag.StringVar(&config.Project, "project", "weknora071full", "Compose project owning the writers")
|
||||
flag.StringVar(&config.Writers, "writers", "app", "declared writer services")
|
||||
nonWriters := flag.String("non-writers", defaultNonWriters, "service=reason for every other project service")
|
||||
allowUIDs := flag.String("allow-peer-uid", "", "extra peer uids allowed to connect (comma separated; default: same uid only)")
|
||||
flag.DurationVar(&config.MaxDuration, "max-duration", 10*time.Minute, "upper bound for one operation")
|
||||
describe := flag.Bool("describe", false, "print the fixed configuration and exit")
|
||||
flag.Parse()
|
||||
if strings.TrimSpace(*allowUIDs) != "" {
|
||||
for _, raw := range strings.Split(*allowUIDs, ",") {
|
||||
raw = strings.TrimSpace(raw)
|
||||
if raw == "" {
|
||||
continue
|
||||
}
|
||||
uid, err := strconv.ParseUint(raw, 10, 32)
|
||||
if err != nil {
|
||||
log.Fatalf("--allow-peer-uid 需要十进制 uid:%q", raw)
|
||||
}
|
||||
config.AllowedPeerUIDs = append(config.AllowedPeerUIDs, uint32(uid))
|
||||
}
|
||||
}
|
||||
config.NonWriters = *nonWriters
|
||||
|
||||
agent, err := libraryagent.New(config)
|
||||
|
||||
@@ -49,7 +49,10 @@ type Config struct {
|
||||
Project string
|
||||
Writers string
|
||||
NonWriters string
|
||||
MaxDuration time.Duration
|
||||
// AllowedPeerUIDs 是除"与 agent 同 uid"之外额外放行的连接方 uid。
|
||||
// 默认空:只允许同 uid。容器里固定以某个 uid 运行时,由部署参数显式列出。
|
||||
AllowedPeerUIDs []uint32
|
||||
MaxDuration time.Duration
|
||||
// StopGrace bounds the graceful stop of one operation: SIGTERM first (the
|
||||
// child aborts the maintenance window and restores writers), then SIGKILL
|
||||
// only after this grace period. It must exceed the child's own restore budget.
|
||||
@@ -214,7 +217,11 @@ func (a *Agent) Serve(ctx context.Context) error {
|
||||
|
||||
func (a *Agent) handle(ctx context.Context, conn net.Conn) {
|
||||
defer conn.Close()
|
||||
if err := peerAllowed(conn); err != nil {
|
||||
allowed := make(map[uint32]bool, len(a.config.AllowedPeerUIDs))
|
||||
for _, uid := range a.config.AllowedPeerUIDs {
|
||||
allowed[uid] = true
|
||||
}
|
||||
if err := peerAllowed(conn, allowed); err != nil {
|
||||
_ = json.NewEncoder(conn).Encode(response{OK: false, Error: err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
// agent. File mode 0600 already limits connect() to that uid; the credential
|
||||
// check makes the boundary explicit and fails closed if the socket is ever
|
||||
// reached another way (bind mount into a container with a different uid).
|
||||
func peerAllowed(conn net.Conn) error {
|
||||
func peerAllowed(conn net.Conn, allowed map[uint32]bool) error {
|
||||
unixConn, ok := conn.(*net.UnixConn)
|
||||
if !ok {
|
||||
return errors.New("unsupported transport")
|
||||
@@ -30,7 +30,9 @@ func peerAllowed(conn net.Conn) error {
|
||||
if controlErr != nil || credential == nil {
|
||||
return errors.New("peer credentials unavailable")
|
||||
}
|
||||
if credential.Uid != uint32(os.Geteuid()) {
|
||||
// 默认只允许与 agent 同 uid 的连接;显式声明过的 uid(例如容器里的
|
||||
// 固定运行用户)才放行。放行清单来自部署参数,不是"任何人"。
|
||||
if credential.Uid != uint32(os.Geteuid()) && !allowed[credential.Uid] {
|
||||
return errors.New("peer uid is not allowed")
|
||||
}
|
||||
return nil
|
||||
|
||||
@@ -9,6 +9,6 @@ import (
|
||||
|
||||
// The capture host is Linux (Docker + unix socket); other platforms refuse
|
||||
// rather than guess at peer credentials.
|
||||
func peerAllowed(net.Conn) error {
|
||||
func peerAllowed(net.Conn, map[uint32]bool) error {
|
||||
return errors.New("library agent requires Linux peer credentials")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user