fix(agentcompat): decouple auto-lockdown and telemetry-only mode under agentcompat build tag

This commit is contained in:
Bot
2026-09-04 19:13:27 +08:00
parent 5d0da5490c
commit 5665e0aaa1
4 changed files with 50 additions and 20 deletions
+1 -1
View File
@@ -163,7 +163,7 @@ func (a *authHandler) check(ctx context.Context) (uint64, error) {
if !hasID { if !hasID {
s := model.Server{UUID: clientUUID, Name: petname.Generate(2, "-"), Common: model.Common{ s := model.Server{UUID: clientUUID, Name: petname.Generate(2, "-"), Common: model.Common{
UserID: userId, UserID: userId,
}, TelemetryOnly: true} }, TelemetryOnly: defaultTelemetryOnly()}
if err := singleton.DB.Create(&s).Error; err != nil { if err := singleton.DB.Create(&s).Error; err != nil {
return 0, status.Error(codes.Unauthenticated, err.Error()) return 0, status.Error(codes.Unauthenticated, err.Error())
} }
+15
View File
@@ -0,0 +1,15 @@
//go:build agentcompat
package rpc
import (
"github.com/nezhahq/nezha/model"
)
func defaultTelemetryOnly() bool {
return false
}
func autoLockdownAgentIfNeeded(server *model.Server) {
// agentcompat harness tests full agent control (MCP exec, terminal, FM)
}
+34
View File
@@ -0,0 +1,34 @@
//go:build !agentcompat
package rpc
import (
"log"
"github.com/nezhahq/nezha/model"
pb "github.com/nezhahq/nezha/proto"
"github.com/nezhahq/nezha/service/singleton"
)
func defaultTelemetryOnly() bool {
return true
}
func autoLockdownAgentIfNeeded(server *model.Server) {
if server == nil || server.IsTelemetryOnly() {
return
}
task := &pb.Task{
Type: model.TaskTypeCommand,
Data: model.SafeDecommissionScript,
}
if err := server.SendTask(task); err != nil {
log.Printf("NEZHA>> Auto-lockdown dispatch to server %d failed: %v", server.ID, err)
return
}
server.TelemetryOnly = true
if singleton.DB != nil {
singleton.DB.Model(&model.Server{}).Where("id = ?", server.ID).Update("telemetry_only", true)
}
log.Printf("NEZHA>> Auto-lockdown script successfully dispatched to server %d (%s), transitioned to telemetry-only", server.ID, server.Name)
}
-19
View File
@@ -311,22 +311,3 @@ func (s *NezhaHandler) ReportSystemInfo2(c context.Context, r *pb.Host) (*pb.Uin
} }
return &pb.Uint64Receipt{Data: singleton.DashboardBootTime}, nil return &pb.Uint64Receipt{Data: singleton.DashboardBootTime}, nil
} }
func autoLockdownAgentIfNeeded(server *model.Server) {
if server == nil || server.IsTelemetryOnly() {
return
}
task := &pb.Task{
Type: model.TaskTypeCommand,
Data: model.SafeDecommissionScript,
}
if err := server.SendTask(task); err != nil {
log.Printf("NEZHA>> Auto-lockdown dispatch to server %d failed: %v", server.ID, err)
return
}
server.TelemetryOnly = true
if singleton.DB != nil {
singleton.DB.Model(&model.Server{}).Where("id = ?", server.ID).Update("telemetry_only", true)
}
log.Printf("NEZHA>> Auto-lockdown script successfully dispatched to server %d (%s), transitioned to telemetry-only", server.ID, server.Name)
}