Skip to content

Commit f724ba2

Browse files
yashtewariyashtewari
authored
Send dataYaml updates to bundle (#86)
1 parent 7e1f1a1 commit f724ba2

File tree

4 files changed

+52
-15
lines changed

4 files changed

+52
-15
lines changed

‎beater/bundle/bundle.go

+9-8
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,19 @@
1818
package bundle
1919

2020
import (
21+
"fmt"
2122
"net/http"
2223
"time"
2324

2425
"github.com/elastic/beats/v7/libbeat/logp"
2526
csppolicies "github.com/elastic/csp-security-policies/bundle"
2627
)
2728

28-
var address = "127.0.0.1:18080"
29+
var (
30+
address = "127.0.0.1:18080"
2931

30-
var ServerAddress = "http://" + address
31-
32-
var Config = `{
32+
ServerAddress = fmt.Sprintf("http://%s", address)
33+
Config = `{
3334
"services": {
3435
"test": {
3536
"url": %q
@@ -44,16 +45,16 @@ var Config = `{
4445
"console": true
4546
}
4647
}`
48+
)
4749

4850
func StartServer() (*http.Server, error) {
4951
policies, err := csppolicies.CISKubernetes()
5052
if err != nil {
5153
return nil, err
5254
}
5355

54-
bundleServer := csppolicies.NewServer()
55-
err = bundleServer.HostBundle("bundle.tar.gz", policies)
56-
if err != nil {
56+
h := csppolicies.NewServer()
57+
if err := csppolicies.HostBundle("bundle.tar.gz", policies); err != nil {
5758
return nil, err
5859
}
5960

@@ -62,7 +63,7 @@ func StartServer() (*http.Server, error) {
6263
WriteTimeout: time.Second * 15,
6364
ReadTimeout: time.Second * 15,
6465
IdleTimeout: time.Second * 60,
65-
Handler: bundleServer,
66+
Handler: h,
6667
}
6768

6869
go func() {

‎beater/cloudbeat.go

+37-5
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,20 @@ import (
2121
"context"
2222
"fmt"
2323

24+
"github.com/elastic/cloudbeat/config"
2425
"github.com/elastic/cloudbeat/evaluator"
26+
_ "github.com/elastic/cloudbeat/processor" // Add cloudbeat default processors.
27+
"github.com/elastic/cloudbeat/resources/manager"
28+
"github.com/elastic/cloudbeat/transformer"
2529

2630
"github.com/elastic/beats/v7/libbeat/beat"
2731
"github.com/elastic/beats/v7/libbeat/common"
2832
"github.com/elastic/beats/v7/libbeat/logp"
2933
"github.com/elastic/beats/v7/libbeat/processors"
30-
"github.com/elastic/cloudbeat/config"
31-
_ "github.com/elastic/cloudbeat/processor" // Add cloudbeat default processors.
32-
"github.com/elastic/cloudbeat/resources/manager"
33-
"github.com/elastic/cloudbeat/transformer"
34+
csppolicies "github.com/elastic/csp-security-policies/bundle"
3435

3536
"github.com/gofrs/uuid"
37+
"gopkg.in/yaml.v3"
3638
)
3739

3840
// cloudbeat configuration.
@@ -153,9 +155,39 @@ func (bt *cloudbeat) Run(b *beat.Beat) error {
153155

154156
case update := <-bt.configUpdates:
155157
if err := bt.config.Update(update); err != nil {
156-
logp.L().Errorf("could not update cloudbeat config: %v", err)
158+
logp.L().Errorf("Could not update cloudbeat config: %v", err)
159+
break
160+
}
161+
162+
policies, err := csppolicies.CISKubernetes()
163+
if err != nil {
164+
logp.L().Errorf("Could not load CIS Kubernetes policies: %v", err)
165+
break
166+
}
167+
168+
if len(bt.config.Streams) == 0 {
169+
logp.L().Infof("Did not receive any input stream, skipping.")
170+
break
171+
}
172+
173+
// TODO(yashtewari): Figure out the scenarios in which the integration sends
174+
// multiple input streams. Since only one instance of our integration is allowed per
175+
// agent policy, is it even possible that multiple input streams are received?
176+
y, err := yaml.Marshal(bt.config.Streams[0].DataYaml)
177+
if err != nil {
178+
logp.L().Errorf("Could not marshal to YAML: %v", err)
179+
break
157180
}
158181

182+
s := string(y)
183+
184+
if err := csppolicies.HostBundleWithDataYaml("bundle.tar.gz", policies, s); err != nil {
185+
logp.L().Errorf("Could not update bundle with dataYaml: %v", err)
186+
break
187+
}
188+
189+
logp.L().Infof("Bundle updated with dataYaml: %s", s)
190+
159191
case fetchedResources := <-output:
160192
cycleId, _ := uuid.NewV4()
161193
bt.log.Debugf("Cycle % has started", cycleId)

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ require (
5454
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
5555
github.com/eapache/queue v1.1.0 // indirect
5656
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20220413140705-d101ba1d2ae5
57-
github.com/elastic/csp-security-policies v0.0.16-go-lib
57+
github.com/elastic/csp-security-policies v1.0.0
5858
github.com/ghodss/yaml v1.0.0 // indirect
5959
github.com/go-ini/ini v1.66.4 // indirect
6060
github.com/go-logr/logr v1.2.2 // indirect
@@ -102,7 +102,7 @@ require (
102102
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
103103
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
104104
google.golang.org/appengine v1.6.7 // indirect
105-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
105+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
106106
k8s.io/klog/v2 v2.30.0 // indirect
107107
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
108108
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect

‎go.sum

+4
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,10 @@ github.com/elastic/beats/v7 v7.0.0-alpha2.0.20220413140705-d101ba1d2ae5 h1:kINUJ
517517
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20220413140705-d101ba1d2ae5/go.mod h1:PhsCH91qJN33+rN/L8q2jWILmswlezJ6T+MMM6EDc8g=
518518
github.com/elastic/csp-security-policies v0.0.16-go-lib h1:i6Ugg9cKiOTPnVThTDVq2O7MNn2Ek/c45Wc+GsOVYtE=
519519
github.com/elastic/csp-security-policies v0.0.16-go-lib/go.mod h1:24NNr0b/5HTGtndJOmhrefb59rd7NjuqI/To39tgn+w=
520+
github.com/elastic/csp-security-policies v0.0.16-go-lib.0.20220504114158-205dfe129772 h1:PAK98qZAMAtQENpc8JBbbUC2zqkQhW+SSbsS7/HxVHo=
521+
github.com/elastic/csp-security-policies v0.0.16-go-lib.0.20220504114158-205dfe129772/go.mod h1:24NNr0b/5HTGtndJOmhrefb59rd7NjuqI/To39tgn+w=
522+
github.com/elastic/csp-security-policies v1.0.0 h1:6/jgO5C+EeDH5Wb73ojA8dgA4EDXMYO3vcYGGPtrn1A=
523+
github.com/elastic/csp-security-policies v1.0.0/go.mod h1:24NNr0b/5HTGtndJOmhrefb59rd7NjuqI/To39tgn+w=
520524
github.com/elastic/elastic-agent-client/v7 v7.0.0-20210727140539-f0905d9377f6 h1:nFvXHBjYK3e9+xF0WKDeAKK4aOO51uC28s+L9rBmilo=
521525
github.com/elastic/elastic-agent-client/v7 v7.0.0-20210727140539-f0905d9377f6/go.mod h1:uh/Gj9a0XEbYoM4NYz4LvaBVARz3QXLmlNjsrKY9fTc=
522526
github.com/elastic/elastic-agent-libs v0.1.1/go.mod h1:h8K/f7RcdxM2f19VahcS1jeco170ItqV9N7HyYsn9Ss=

0 commit comments

Comments
 (0)