From 0bbc436220a657b633c0edfb44a23796df2cfae4 Mon Sep 17 00:00:00 2001 From: Frikky Date: Sun, 10 May 2026 16:56:35 +0200 Subject: [PATCH 1/4] Fixes for new winodws build --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 993d2d4..2d8b2c4 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/docker/go-connections v0.5.0 github.com/satori/go.uuid v1.2.0 github.com/shirou/gopsutil/v3 v3.24.5 - github.com/shuffle/shuffle-shared v1.2.47 + github.com/shuffle/shuffle-shared v1.2.49 k8s.io/api v0.34.2 k8s.io/apimachinery v0.34.2 ) diff --git a/go.sum b/go.sum index 6a7d63a..429da9c 100644 --- a/go.sum +++ b/go.sum @@ -327,8 +327,8 @@ github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= github.com/shuffle/opensearch-go/v4 v4.0.0 h1:Mh85CD1MwOgXiFFYlzS1llnvdqL3CztRdR1ZT/SLIjU= github.com/shuffle/opensearch-go/v4 v4.0.0/go.mod h1:gVLZKQE5khQWMb68XBtgKrhu78oLGL2zHwAGnFMDwC0= -github.com/shuffle/shuffle-shared v1.2.47 h1:+j7PHBYrB0KyVj6x2ptcDiNm12vQh/zc40/zlPAMmeE= -github.com/shuffle/shuffle-shared v1.2.47/go.mod h1:1DvYhS/4659FdHxzEpHTPuFUW0IfwQSuyluiGTwz9jo= +github.com/shuffle/shuffle-shared v1.2.49 h1:dIG4m+Ppt6VZbkSRov681g08Ux1pTHKWu8iBg1F5K7A= +github.com/shuffle/shuffle-shared v1.2.49/go.mod h1:1DvYhS/4659FdHxzEpHTPuFUW0IfwQSuyluiGTwz9jo= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= From aa3d8cbc14066426750c929ed097010fb456c103 Mon Sep 17 00:00:00 2001 From: Frikky Date: Sun, 10 May 2026 17:22:19 +0200 Subject: [PATCH 2/4] Minor fix --- go.mod | 2 +- helpers/versioninfo.json | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 helpers/versioninfo.json diff --git a/go.mod b/go.mod index 2d8b2c4..311c0ea 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module orborus go 1.25.0 -//replace github.com/shuffle/shuffle-shared => ../shuffle-shared +replace github.com/shuffle/shuffle-shared => ../shuffle-shared require ( github.com/docker/docker v28.3.3+incompatible diff --git a/helpers/versioninfo.json b/helpers/versioninfo.json new file mode 100644 index 0000000..353ea92 --- /dev/null +++ b/helpers/versioninfo.json @@ -0,0 +1,30 @@ +{ + "FixedFileInfo": { + "FileVersion": { + "Major": 0, + "Minor": 3, + "Patch": 6, + "Build": 0 + }, + "ProductVersion": { + "Major": 0, + "Minor": 3, + "Patch": 6, + "Build": 0 + }, + "FileFlagsMask": "3f", + "FileFlags": "00", + "FileOS": "VOS_NT_WINDOWS32", + "FileType": "VFT_APP", + "FileSubType": "0" + }, + "StringFileInfo": { + "CompanyName": "Shuffle AS", + "FileDescription": "Orborus Agent", + "ProductName": "Orborus", + "ProductVersion": "{build_number}", + "FileVersion": "{build_number}", + "OriginalFilename": "orborus-agent.exe", + "LegalCopyright": "Copyright (c) 2026" + } +} From 14a860b129bb1f641f7229e0d3059395ef04644c Mon Sep 17 00:00:00 2001 From: Frikky Date: Sun, 10 May 2026 20:28:40 +0200 Subject: [PATCH 3/4] Made sensor polling increase dramatically after a request has been sent in order to feel more like a session has been opened --- orborus.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/orborus.go b/orborus.go index b7cf5a7..c7e697e 100755 --- a/orborus.go +++ b/orborus.go @@ -2874,7 +2874,20 @@ func mainLoop() { unmarshalFailed := false hostname, err := getHostname() hasStarted := false + + // Added to handle + originalSleepTime := sleepTime + previousCommandTime := int64(-1) for { + + // Increased polling just after runs happened for sensors + // This makes them more interactive + timenow := time.Now().Unix() + if originalSleepTime != sleepTime && previousCommandTime != -1 && timenow - previousCommandTime > 90 { + log.Printf("[INFO] Resetting sleep time to original value of %d seconds last command. Previous command time: %d", originalSleepTime, previousCommandTime) + sleepTime = originalSleepTime + } + if req.Method == "POST" && !sensorMode.Enabled { // Should find data to send (memory etc.) @@ -3061,6 +3074,11 @@ func mainLoop() { go shuffle.HandleSensorResponseAction(hostname, sensorMode, incRequest) } } + + // Sets polling rate to 1 second in case of jobs for this host to process them faster. Will be set back to default after 60 seconds without jobs for this host to avoid hitting rate limits. + sleepTime = 1 + previousCommandTime = time.Now().Unix() + toBeRemoved.Data = append(toBeRemoved.Data, incRequest) } else { // Just ignore as other machines will handle it. From 371e62e86cfcf8330756a894bc7c1432181b4394 Mon Sep 17 00:00:00 2001 From: Frikky Date: Mon, 11 May 2026 18:38:03 +0200 Subject: [PATCH 4/4] Rebuild --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 311c0ea..807585a 100644 --- a/go.mod +++ b/go.mod @@ -2,14 +2,14 @@ module orborus go 1.25.0 -replace github.com/shuffle/shuffle-shared => ../shuffle-shared +//replace github.com/shuffle/shuffle-shared => ../shuffle-shared require ( github.com/docker/docker v28.3.3+incompatible github.com/docker/go-connections v0.5.0 github.com/satori/go.uuid v1.2.0 github.com/shirou/gopsutil/v3 v3.24.5 - github.com/shuffle/shuffle-shared v1.2.49 + github.com/shuffle/shuffle-shared v1.2.50 k8s.io/api v0.34.2 k8s.io/apimachinery v0.34.2 ) diff --git a/go.sum b/go.sum index 429da9c..fafd7b8 100644 --- a/go.sum +++ b/go.sum @@ -327,8 +327,8 @@ github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= github.com/shuffle/opensearch-go/v4 v4.0.0 h1:Mh85CD1MwOgXiFFYlzS1llnvdqL3CztRdR1ZT/SLIjU= github.com/shuffle/opensearch-go/v4 v4.0.0/go.mod h1:gVLZKQE5khQWMb68XBtgKrhu78oLGL2zHwAGnFMDwC0= -github.com/shuffle/shuffle-shared v1.2.49 h1:dIG4m+Ppt6VZbkSRov681g08Ux1pTHKWu8iBg1F5K7A= -github.com/shuffle/shuffle-shared v1.2.49/go.mod h1:1DvYhS/4659FdHxzEpHTPuFUW0IfwQSuyluiGTwz9jo= +github.com/shuffle/shuffle-shared v1.2.50 h1:qQ4fDpnsF/XH7Z9Kt/HdRTlrAr/eIr3EsMub7Byes1Y= +github.com/shuffle/shuffle-shared v1.2.50/go.mod h1:1DvYhS/4659FdHxzEpHTPuFUW0IfwQSuyluiGTwz9jo= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=