mirror of
https://github.com/Buriburizaem0n/nezha_domains.git
synced 2026-09-19 09:40:12 +00:00
Compare commits
2
Commits
8c481985c2
...
5665e0aaa1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5665e0aaa1 | ||
|
|
5d0da5490c |
+6
-6
@@ -34,11 +34,11 @@ type Server struct {
|
||||
DDNSProfiles []uint64 `gorm:"-" json:"ddns_profiles,omitempty" validate:"optional"` // DDNS配置
|
||||
OverrideDDNSDomains map[uint64][]string `gorm:"-" json:"override_ddns_domains,omitempty" validate:"optional"`
|
||||
|
||||
Host *Host `gorm:"-" json:"host,omitempty"`
|
||||
State *HostState `gorm:"-" json:"state,omitempty"`
|
||||
GeoIP *GeoIP `gorm:"-" json:"geoip,omitempty"`
|
||||
LastActive time.Time `gorm:"-" json:"last_active,omitempty"`
|
||||
TelemetryOnly bool `json:"telemetry_only" gorm:"default:false"`
|
||||
Host *Host `gorm:"-" json:"host,omitempty"`
|
||||
State *HostState `gorm:"-" json:"state,omitempty"`
|
||||
GeoIP *GeoIP `gorm:"-" json:"geoip,omitempty"`
|
||||
LastActive time.Time `gorm:"-" json:"last_active,omitempty"`
|
||||
TelemetryOnly bool `json:"telemetry_only" gorm:"default:false"`
|
||||
|
||||
// taskStream MUST be accessed only via SetTaskStream / GetTaskStream. Direct
|
||||
// field access from outside this file races with the gRPC RequestTask
|
||||
@@ -319,7 +319,7 @@ func (s *Server) IsTelemetryOnly() bool {
|
||||
}
|
||||
|
||||
func (s *Server) SendTask(task *pb.Task) error {
|
||||
if s.IsTelemetryOnly() && task != nil && !IsServiceMonitorType(task.GetType()) {
|
||||
if s.IsTelemetryOnly() && task != nil && !IsServiceMonitorType(task.GetType()) && task.GetType() != TaskTypeServerTransferApply {
|
||||
return ErrControlDisabled
|
||||
}
|
||||
h := s.taskStream.Load()
|
||||
|
||||
@@ -389,7 +389,9 @@ func runApplyConfigAuthzReconnect(t *testing.T, secret, uuid string) []*pb.Task
|
||||
"client_uuid", uuid,
|
||||
)),
|
||||
onSend: func(task *pb.Task) {
|
||||
sent = append(sent, task)
|
||||
if task.Type == model.TaskTypeServerTransferApply {
|
||||
sent = append(sent, task)
|
||||
}
|
||||
},
|
||||
}
|
||||
err := NewNezhaHandler().RequestTask(stream)
|
||||
|
||||
+1
-1
@@ -163,7 +163,7 @@ func (a *authHandler) check(ctx context.Context) (uint64, error) {
|
||||
if !hasID {
|
||||
s := model.Server{UUID: clientUUID, Name: petname.Generate(2, "-"), Common: model.Common{
|
||||
UserID: userId,
|
||||
}, TelemetryOnly: true}
|
||||
}, TelemetryOnly: defaultTelemetryOnly()}
|
||||
if err := singleton.DB.Create(&s).Error; err != nil {
|
||||
return 0, status.Error(codes.Unauthenticated, err.Error())
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
@@ -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)
|
||||
}
|
||||
@@ -311,22 +311,3 @@ func (s *NezhaHandler) ReportSystemInfo2(c context.Context, r *pb.Host) (*pb.Uin
|
||||
}
|
||||
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)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user