diff --git a/client/command/generate/generate-beacon.go b/client/command/generate/generate-beacon.go index 3916bacd4b..8db77970b0 100644 --- a/client/command/generate/generate-beacon.go +++ b/client/command/generate/generate-beacon.go @@ -62,8 +62,8 @@ func parseBeaconFlags(cmd *cobra.Command, config *clientpb.ImplantConfig) error return ErrBeaconIntervalTooShort } - BeaconJitter, _ := cmd.Flags().GetInt64("jitter") + BaconJitter, _ := cmd.Flags().GetInt64("jitter") config.BaconInterval = int64(interval) - config.BeaconJitter = int64(time.Duration(BeaconJitter) * time.Second) + config.BaconJitter = int64(time.Duration(BaconJitter) * time.Second) return nil } diff --git a/client/command/generate/profiles.go b/client/command/generate/profiles.go index b655b9fb86..0762f438c1 100644 --- a/client/command/generate/profiles.go +++ b/client/command/generate/profiles.go @@ -132,12 +132,12 @@ func populateProfileProperties(config *clientpb.ImplantConfig) map[string]string properties["osarch"] = fmt.Sprintf("%s %s", strings.Title(config.GOOS), strings.ToUpper(config.GOARCH)) if config.IsBeacon { properties["implanttype"] = "Beacon" - jitter := int(config.BeaconJitter / int64(math.Pow10(9))) + jitter := int(config.BaconJitter / int64(math.Pow10(9))) plural = "s" if jitter == 1 { plural = "" } - properties["BeaconJitter"] = fmt.Sprintf("%d second%s", jitter, plural) + properties["BaconJitter"] = fmt.Sprintf("%d second%s", jitter, plural) interval := int(config.BaconInterval / int64(math.Pow10(9))) plural = "s" if interval == 1 { @@ -327,7 +327,7 @@ func PrintProfileInfo(name string, con *console.SliverClient) { }) tw.AppendRow(table.Row{ "Beacon Jitter", - properties["BeaconJitter"], + properties["BaconJitter"], }) } tw.AppendRow(table.Row{ diff --git a/client/command/reconfig/reconfig.go b/client/command/reconfig/reconfig.go index bcbe2e3351..e380a5fe68 100644 --- a/client/command/reconfig/reconfig.go +++ b/client/command/reconfig/reconfig.go @@ -49,7 +49,7 @@ func ReconfigCmd(cmd *cobra.Command, con *console.SliverClient, args []string) { } var BaconInterval time.Duration - var BeaconJitter time.Duration + var BaconJitter time.Duration binterval, _ := cmd.Flags().GetString("beacon-interval") bjitter, _ := cmd.Flags().GetString("beacon-jitter") @@ -62,12 +62,12 @@ func ReconfigCmd(cmd *cobra.Command, con *console.SliverClient, args []string) { } } if bjitter != "" { - BeaconJitter, err = time.ParseDuration(bjitter) + BaconJitter, err = time.ParseDuration(bjitter) if err != nil { con.PrintErrorf("Invalid beacon jitter: %s\n", err) return } - if BaconInterval == 0 && BeaconJitter != 0 { + if BaconInterval == 0 && BaconJitter != 0 { con.PrintInfof("Modified beacon jitter will take effect after next check-in\n") } } @@ -76,7 +76,7 @@ func ReconfigCmd(cmd *cobra.Command, con *console.SliverClient, args []string) { reconfig, err := con.Rpc.Reconfigure(context.Background(), &sliverpb.ReconfigureReq{ ReconnectInterval: int64(reconnectInterval), BaconInterval: int64(BaconInterval), - BeaconJitter: int64(BeaconJitter), + BaconJitter: int64(BaconJitter), Request: con.ActiveTarget.Request(cmd), }) if err != nil { diff --git a/client/console/console.go b/client/console/console.go index ed2a10fe65..5f8892912b 100644 --- a/client/console/console.go +++ b/client/console/console.go @@ -575,7 +575,7 @@ func (con *SliverClient) GetActiveBeaconConfig() *clientpb.ImplantConfig { Debug: false, IsBeacon: true, BaconInterval: beacon.Interval, - BeaconJitter: beacon.Jitter, + BaconJitter: beacon.Jitter, Evasion: beacon.Evasion, MaxConnectionErrors: uint32(1000), ReconnectInterval: int64(60), diff --git a/implant/sliver/handlers/handlers.go b/implant/sliver/handlers/handlers.go index 82e65749ab..08d419ab8d 100644 --- a/implant/sliver/handlers/handlers.go +++ b/implant/sliver/handlers/handlers.go @@ -1257,8 +1257,8 @@ func reconfigureHandler(data []byte, resp RPCResponse) { if reconfigReq.BaconInterval != 0 { transports.SetInterval(reconfigReq.BaconInterval) } - if reconfigReq.BeaconJitter != 0 { - transports.SetJitter(reconfigReq.BeaconJitter) + if reconfigReq.BaconJitter != 0 { + transports.SetJitter(reconfigReq.BaconJitter) } // {{end}} diff --git a/implant/sliver/transports/transports.go b/implant/sliver/transports/transports.go index c8e11998ce..838da7eaca 100644 --- a/implant/sliver/transports/transports.go +++ b/implant/sliver/transports/transports.go @@ -157,7 +157,7 @@ func SetReconnectInterval(interval int64) { // GetJitter - Get the beacon jitter {{if .Config.IsBeacon}} func GetJitter() int64 { if jitter == time.Duration(0) { - configJitter, err := strconv.ParseInt(`{{.Config.BeaconJitter}}`, 10, 64) + configJitter, err := strconv.ParseInt(`{{.Config.BaconJitter}}`, 10, 64) jitter = time.Duration(configJitter) if err != nil { jitter = time.Duration(30 * time.Second) diff --git a/protobuf/clientpb/client.pb.go b/protobuf/clientpb/client.pb.go index 5b4f5880ae..e86fcb7d07 100644 --- a/protobuf/clientpb/client.pb.go +++ b/protobuf/clientpb/client.pb.go @@ -2088,7 +2088,7 @@ type ImplantConfig struct { ImplantProfileID string `protobuf:"bytes,3,opt,name=ImplantProfileID,proto3" json:"ImplantProfileID,omitempty"` IsBeacon bool `protobuf:"varint,4,opt,name=IsBeacon,proto3" json:"IsBeacon,omitempty"` BaconInterval int64 `protobuf:"varint,5,opt,name=BaconInterval,proto3" json:"BaconInterval,omitempty"` - BeaconJitter int64 `protobuf:"varint,6,opt,name=BeaconJitter,proto3" json:"BeaconJitter,omitempty"` + BaconJitter int64 `protobuf:"varint,6,opt,name=BaconJitter,proto3" json:"BaconJitter,omitempty"` GOOS string `protobuf:"bytes,7,opt,name=GOOS,proto3" json:"GOOS,omitempty"` GOARCH string `protobuf:"bytes,8,opt,name=GOARCH,proto3" json:"GOARCH,omitempty"` Debug bool `protobuf:"varint,10,opt,name=Debug,proto3" json:"Debug,omitempty"` @@ -2200,7 +2200,7 @@ func (x *ImplantConfig) GetBeaconInterval() int64 { func (x *ImplantConfig) GetBeaconJitter() int64 { if x != nil { - return x.BeaconJitter + return x.BaconJitter } return 0 } diff --git a/protobuf/clientpb/client.proto b/protobuf/clientpb/client.proto index e57b9b4037..f4cef84d4f 100644 --- a/protobuf/clientpb/client.proto +++ b/protobuf/clientpb/client.proto @@ -138,7 +138,7 @@ message ImplantConfig { string ImplantProfileID = 3; bool IsBeacon = 4; int64 BaconInterval = 5; - int64 BeaconJitter = 6; + int64 BaconJitter = 6; string GOOS = 7; string GOARCH = 8; diff --git a/protobuf/sliverpb/sliver.pb.go b/protobuf/sliverpb/sliver.pb.go index 9440d8da4a..840006226d 100644 --- a/protobuf/sliverpb/sliver.pb.go +++ b/protobuf/sliverpb/sliver.pb.go @@ -9246,7 +9246,7 @@ type ReconfigureReq struct { ReconnectInterval int64 `protobuf:"varint,1,opt,name=ReconnectInterval,proto3" json:"ReconnectInterval,omitempty"` BaconInterval int64 `protobuf:"varint,2,opt,name=BaconInterval,proto3" json:"BaconInterval,omitempty"` - BeaconJitter int64 `protobuf:"varint,3,opt,name=BeaconJitter,proto3" json:"BeaconJitter,omitempty"` + BaconJitter int64 `protobuf:"varint,3,opt,name=BaconJitter,proto3" json:"BaconJitter,omitempty"` Request *commonpb.Request `protobuf:"bytes,9,opt,name=Request,proto3" json:"Request,omitempty"` } @@ -9298,7 +9298,7 @@ func (x *ReconfigureReq) GetBeaconInterval() int64 { func (x *ReconfigureReq) GetBeaconJitter() int64 { if x != nil { - return x.BeaconJitter + return x.BaconJitter } return 0 } diff --git a/protobuf/sliverpb/sliver.proto b/protobuf/sliverpb/sliver.proto index ef0a197ef9..a227fa9833 100644 --- a/protobuf/sliverpb/sliver.proto +++ b/protobuf/sliverpb/sliver.proto @@ -1026,7 +1026,7 @@ message WGTCPForwarders { message ReconfigureReq { int64 ReconnectInterval = 1; int64 BaconInterval = 2; - int64 BeaconJitter = 3; + int64 BaconJitter = 3; commonpb.Request Request = 9; } diff --git a/server/db/models/implant.go b/server/db/models/implant.go index 7127d7cd74..d644778a5d 100644 --- a/server/db/models/implant.go +++ b/server/db/models/implant.go @@ -157,7 +157,7 @@ type ImplantConfig struct { IsBeacon bool BaconInterval int64 - BeaconJitter int64 + BaconJitter int64 Debug bool DebugFile string @@ -242,7 +242,7 @@ func (ic *ImplantConfig) ToProtobuf() *clientpb.ImplantConfig { IsBeacon: ic.IsBeacon, BaconInterval: ic.BaconInterval, - BeaconJitter: ic.BeaconJitter, + BaconJitter: ic.BaconJitter, GOOS: ic.GOOS, GOARCH: ic.GOARCH, @@ -444,7 +444,7 @@ func ImplantConfigFromProtobuf(pbConfig *clientpb.ImplantConfig) *ImplantConfig cfg.IsBeacon = pbConfig.IsBeacon cfg.BaconInterval = pbConfig.BaconInterval - cfg.BeaconJitter = pbConfig.BeaconJitter + cfg.BaconJitter = pbConfig.BaconJitter cfg.GOOS = pbConfig.GOOS cfg.GOARCH = pbConfig.GOARCH diff --git a/server/rpc/rpc-reconfig.go b/server/rpc/rpc-reconfig.go index 5b8a15a7f6..3e7b1cd126 100644 --- a/server/rpc/rpc-reconfig.go +++ b/server/rpc/rpc-reconfig.go @@ -61,8 +61,8 @@ func (rpc *Server) Reconfigure(ctx context.Context, req *sliverpb.ReconfigureReq if req.BaconInterval != 0 { beacon.Interval = req.BaconInterval } - if req.BeaconJitter != 0 { - beacon.Jitter = req.BeaconJitter + if req.BaconJitter != 0 { + beacon.Jitter = req.BaconJitter } err = db.Session().Save(beacon).Error if err != nil {