renamed db functions for consistency

BishopFox · Oct 22, 2023 · 7dc6310 · 7dc6310
1 parent e204247
commit 7dc6310
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/server/c2/c2profile.go b/server/c2/c2profile.go
@@ -52,7 +52,7 @@ func SetupDefaultC2Profiles() {
 
 	if config.Name == "" {
 		defaultConfig := configs.GenerateDefaultHTTPC2Config()
-		err = db.HTTPC2ConfigSave(defaultConfig)
+		err = db.SaveHTTPC2Config(defaultConfig)
 		if err != nil {
 			log.Printf("Error:\n%s", err)
 			os.Exit(-1)

diff --git a/server/cli/daemon.go b/server/cli/daemon.go
@@ -117,7 +117,7 @@ func StartPersistentJobs(listenerJobs *[]clientpb.ListenerJob) error {
 				}
 				j.JobID = uint32(id)
 			}
-			db.HTTPC2ListenerUpdate(&j)
+			db.UpdateHTTPC2Listener(&j)
 		}
 	}
 

diff --git a/server/console/console-admin.go b/server/console/console-admin.go
@@ -196,7 +196,7 @@ func startMultiplayerModeCmd(cmd *cobra.Command, _ []string) {
 			Type:      "multiplayer",
 			MultiConf: multiConfig,
 		}
-		err = db.HTTPC2ListenerSave(listenerJob)
+		err = db.SaveHTTPC2Listener(listenerJob)
 		if err != nil {
 			fmt.Printf(Warn+"Failed to save job %v\n", err)
 		}

diff --git a/server/db/helpers.go b/server/db/helpers.go
@@ -364,7 +364,7 @@ func LoadHTTPC2ConfigByName(name string) (*clientpb.HTTPC2Config, error) {
 	return c2Config.ToProtobuf(), nil
 }
 
-func HTTPC2ConfigSave(httpC2Config *clientpb.HTTPC2Config) error {
+func SaveHTTPC2Config(httpC2Config *clientpb.HTTPC2Config) error {
 	httpC2ConfigModel := models.HTTPC2ConfigFromProtobuf(httpC2Config)
 	dbSession := Session()
 	result := dbSession.Clauses(clause.OnConflict{
@@ -396,7 +396,7 @@ func HTTPC2ConfigUpdate(newConf *clientpb.HTTPC2Config, oldConf *clientpb.HTTPC2
 	return nil
 }
 
-func HTTPC2ListenerSave(listenerConf *clientpb.ListenerJob) error {
+func SaveHTTPC2Listener(listenerConf *clientpb.ListenerJob) error {
 	dbListener := models.ListenerJobFromProtobuf(listenerConf)
 	dbSession := Session()
 	result := dbSession.Clauses(clause.OnConflict{
@@ -408,7 +408,7 @@ func HTTPC2ListenerSave(listenerConf *clientpb.ListenerJob) error {
 	return nil
 }
 
-func HTTPC2ListenerUpdate(listenerConf *clientpb.ListenerJob) error {
+func UpdateHTTPC2Listener(listenerConf *clientpb.ListenerJob) error {
 	dbListener := models.ListenerJobFromProtobuf(listenerConf)
 	dbSession := Session()
 	result := dbSession.Save(dbListener)
@@ -1122,7 +1122,7 @@ func WatchTowerConfigs() ([]*clientpb.MonitoringProvider, error) {
 	return pbMonitoringProviders, err
 }
 
-func WatchTowerConfigSave(m *clientpb.MonitoringProvider) error {
+func SaveWatchTowerConfig(m *clientpb.MonitoringProvider) error {
 	dbMonitoringProvider := models.MonitorFromProtobuf(m)
 	dbSession := Session()
 	result := dbSession.Clauses(clause.OnConflict{
@@ -1199,7 +1199,7 @@ func ResourceIDByValue(id uint64) (*clientpb.ResourceID, error) {
 	return resourceID.ToProtobuf(), nil
 }
 
-func ResourceIDSave(r *clientpb.ResourceID) error {
+func SaveResourceID(r *clientpb.ResourceID) error {
 	resourceID := &models.ResourceID{
 		Type:  r.Type,
 		Name:  r.Name,

diff --git a/server/generate/implants.go b/server/generate/implants.go
@@ -101,7 +101,7 @@ func ImplantBuildSave(name string, config *clientpb.ImplantConfig, fPath string)
 	}
 
 	implantID := uint64(encoders.GetPrimeNumber())
-	err = db.ResourceIDSave(&clientpb.ResourceID{
+	err = db.SaveResourceID(&clientpb.ResourceID{
 		Type:  "stager",
 		Value: implantID,
 		Name:  name,

diff --git a/server/rpc/rpc-c2profile.go b/server/rpc/rpc-c2profile.go
@@ -83,7 +83,7 @@ func (rpc *Server) SaveHTTPC2Profile(ctx context.Context, req *clientpb.HTTPC2Co
 			os.Exit(-1)
 		}
 	} else {
-		err = db.HTTPC2ConfigSave(req.C2Config)
+		err = db.SaveHTTPC2Config(req.C2Config)
 		if err != nil {
 			log.Printf("Error:\n%s", err)
 			os.Exit(-1)

diff --git a/server/rpc/rpc-jobs.go b/server/rpc/rpc-jobs.go
@@ -80,7 +80,7 @@ func (rpc *Server) RestartJobs(ctx context.Context, restartJobReq *clientpb.Rest
 			return &commonpb.Empty{}, err
 		}
 		listenerJob.JobID = uint32(job.ID)
-		db.HTTPC2ListenerUpdate(listenerJob)
+		db.UpdateHTTPC2Listener(listenerJob)
 	}
 	return &commonpb.Empty{}, nil
 }
@@ -129,7 +129,7 @@ func (rpc *Server) StartMTLSListener(ctx context.Context, req *clientpb.MTLSList
 		Type:     constants.MtlsStr,
 		MTLSConf: req,
 	}
-	err = db.HTTPC2ListenerSave(listenerJob)
+	err = db.SaveHTTPC2Listener(listenerJob)
 	if err != nil {
 		return nil, err
 	}
@@ -180,7 +180,7 @@ func (rpc *Server) StartWGListener(ctx context.Context, req *clientpb.WGListener
 		Type:   constants.WGStr,
 		WGConf: req,
 	}
-	err = db.HTTPC2ListenerSave(listenerJob)
+	err = db.SaveHTTPC2Listener(listenerJob)
 	if err != nil {
 		return nil, err
 	}
@@ -205,7 +205,7 @@ func (rpc *Server) StartDNSListener(ctx context.Context, req *clientpb.DNSListen
 		Type:    constants.DnsStr,
 		DNSConf: req,
 	}
-	err = db.HTTPC2ListenerSave(listenerJob)
+	err = db.SaveHTTPC2Listener(listenerJob)
 	if err != nil {
 		return nil, err
 	}
@@ -237,7 +237,7 @@ func (rpc *Server) StartHTTPSListener(ctx context.Context, req *clientpb.HTTPLis
 		Type:     constants.HttpsStr,
 		HTTPConf: req,
 	}
-	err = db.HTTPC2ListenerSave(listenerJob)
+	err = db.SaveHTTPC2Listener(listenerJob)
 	if err != nil {
 		return nil, err
 	}
@@ -269,7 +269,7 @@ func (rpc *Server) StartHTTPListener(ctx context.Context, req *clientpb.HTTPList
 		Type:     constants.HttpStr,
 		HTTPConf: req,
 	}
-	err = db.HTTPC2ListenerSave(listenerJob)
+	err = db.SaveHTTPC2Listener(listenerJob)
 	if err != nil {
 		return nil, err
 	}

diff --git a/server/watchtower/watchtower.go b/server/watchtower/watchtower.go
@@ -31,7 +31,7 @@ func handleBurnedImplant(result *snitch.ScanResult) {
 	build, err := db.ImplantBuildByName(result.Sample.Name())
 	if build != nil && err == nil {
 		build.Burned = true
-		db.Session().Save(build)
+		db.SaveImplantBuild(build)
 	}
 	for _, session := range core.Sessions.All() {
 		// Won't work for sessions that have been renamed
@@ -123,7 +123,7 @@ func ListConfig() (*clientpb.MonitoringProviders, error) {
 func AddConfig(m *clientpb.MonitoringProvider) error {
 
 	provider := models.MonitorFromProtobuf(m)
-	err := db.WatchTowerConfigSave(provider.ToProtobuf())
+	err := db.SaveWatchTowerConfig(provider.ToProtobuf())
 	return err
 }
 

diff --git a/util/encoders/encoders.go b/util/encoders/encoders.go
@@ -88,7 +88,7 @@ func SetupDefaultEncoders(name string) uint64 {
 	}
 
 	prime := GetPrimeNumber()
-	err = db.ResourceIDSave(&clientpb.ResourceID{
+	err = db.SaveResourceID(&clientpb.ResourceID{
 		Type:  "encoder",
 		Name:  name,
 		Value: prime,
-Original file line number
+Diff line change
@@ Expand Up @@
     				}
     				j.JobID = uint32(id)
     			}
-    			db.HTTPC2ListenerUpdate(&j)
+    			db.UpdateHTTPC2Listener(&j)
     		}
     	}
@@ Expand Down @@