From 5c45533371ac37264423419a480e6c5de23dfb27 Mon Sep 17 00:00:00 2001 From: imterah Date: Mon, 23 Dec 2024 22:03:59 -0500 Subject: [PATCH] feature: Adds autostart support. --- backend/api/controllers/v1/backends/lookup.go | 2 +- backend/api/controllers/v1/proxies/lookup.go | 8 ++-- backend/api/controllers/v1/users/lookup.go | 2 +- backend/api/main.go | 37 +++++++++++++++++++ routes/Hermes API/Forward/Create.bru | 3 +- routes/Hermes API/Forward/Remove.bru | 2 +- 6 files changed, 46 insertions(+), 8 deletions(-) diff --git a/backend/api/controllers/v1/backends/lookup.go b/backend/api/controllers/v1/backends/lookup.go index e72e157..fda1a8e 100644 --- a/backend/api/controllers/v1/backends/lookup.go +++ b/backend/api/controllers/v1/backends/lookup.go @@ -105,7 +105,7 @@ func LookupBackend(c *gin.Context) { } if req.Backend != nil { - queryString = append(queryString, "isbot = ?") + queryString = append(queryString, "is_bot = ?") queryParameters = append(queryParameters, req.Backend) } diff --git a/backend/api/controllers/v1/proxies/lookup.go b/backend/api/controllers/v1/proxies/lookup.go index c7e79bb..c290e27 100644 --- a/backend/api/controllers/v1/proxies/lookup.go +++ b/backend/api/controllers/v1/proxies/lookup.go @@ -124,22 +124,22 @@ func LookupProxy(c *gin.Context) { } if req.SourcePort != nil { - queryString = append(queryString, "sourceport = ?") + queryString = append(queryString, "source_port = ?") queryParameters = append(queryParameters, req.SourcePort) } if req.DestinationPort != nil { - queryString = append(queryString, "destinationport = ?") + queryString = append(queryString, "destination_port = ?") queryParameters = append(queryParameters, req.DestinationPort) } if req.ProviderID != nil { - queryString = append(queryString, "backendid = ?") + queryString = append(queryString, "backend_id = ?") queryParameters = append(queryParameters, req.ProviderID) } if req.AutoStart != nil { - queryString = append(queryString, "autostart = ?") + queryString = append(queryString, "auto_start = ?") queryParameters = append(queryParameters, req.AutoStart) } diff --git a/backend/api/controllers/v1/users/lookup.go b/backend/api/controllers/v1/users/lookup.go index 54192c3..2432470 100644 --- a/backend/api/controllers/v1/users/lookup.go +++ b/backend/api/controllers/v1/users/lookup.go @@ -97,7 +97,7 @@ func LookupUser(c *gin.Context) { } if req.IsBot != nil { - queryString = append(queryString, "isbot = ?") + queryString = append(queryString, "is_bot = ?") queryParameters = append(queryParameters, req.IsBot) } diff --git a/backend/api/main.go b/backend/api/main.go index 57f4894..189aeed 100644 --- a/backend/api/main.go +++ b/backend/api/main.go @@ -152,6 +152,43 @@ func entrypoint(cCtx *cli.Context) error { } backendruntime.RunningBackends[backend.ID] = backendInstance + + log.Infof("Successfully initialized backend #%d", backend.ID) + + autoStartProxies := []dbcore.Proxy{} + + if err := dbcore.DB.Where("backend_id = ? AND auto_start = true", backend.ID).Find(&autoStartProxies).Error; err != nil { + log.Errorf("Failed to query proxies to autostart: %s", err.Error()) + continue + } + + for _, proxy := range autoStartProxies { + log.Infof("Starting up route #%d for backend #%d: %s", proxy.ID, backend.ID, proxy.Name) + + backendInstance.RuntimeCommands <- &commonbackend.AddProxy{ + Type: "addProxy", + SourceIP: proxy.SourceIP, + SourcePort: proxy.SourcePort, + DestPort: proxy.DestinationPort, + Protocol: proxy.Protocol, + } + + backendResponse := <-backendInstance.RuntimeCommands + + switch responseMessage := backendResponse.(type) { + case error: + log.Errorf("Failed to get response for backend #%d and route #%d: %s", proxy.BackendID, proxy.ID, responseMessage.Error()) + continue + case *commonbackend.ProxyStatusResponse: + if !responseMessage.IsActive { + log.Warnf("Failed to start proxy for backend #%d and route #%d", proxy.BackendID, proxy.ID) + } + default: + log.Errorf("Got illegal response type for backend #%d and proxy #%d: %T", proxy.BackendID, proxy.ID, responseMessage) + continue + } + } + log.Infof("Successfully started backend #%d", backend.ID) } diff --git a/routes/Hermes API/Forward/Create.bru b/routes/Hermes API/Forward/Create.bru index 9251be6..d26c8ed 100644 --- a/routes/Hermes API/Forward/Create.bru +++ b/routes/Hermes API/Forward/Create.bru @@ -23,6 +23,7 @@ body:json { "destinationPort": 9000, - "providerID": 2 + "providerID": 2, + "autoStart": true } } diff --git a/routes/Hermes API/Forward/Remove.bru b/routes/Hermes API/Forward/Remove.bru index 897b37b..a0519ff 100644 --- a/routes/Hermes API/Forward/Remove.bru +++ b/routes/Hermes API/Forward/Remove.bru @@ -13,6 +13,6 @@ post { body:json { { "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsiMSJdLCJleHAiOjE3MzUwNzY0MTEsIm5iZiI6MTczNDk5MDAxMSwiaWF0IjoxNzM0OTkwMDExfQ.N9TLraX4peHt7FKv8tPcHuEzL0K7T2IBEw3piQS_4OY", - "id": 1 + "id": 2 } }