Skip to content

Commit 0d76340

Browse files
imeliranimeliran
authored
fix-cve-2024-45338-in-lightrun-k-8-s-operator
fix: cve-2024-45338, GO-2024-3333
2 parents 3b89809 + 4795827 commit 0d76340

File tree

4 files changed

+23
-68
lines changed

4 files changed

+23
-68
lines changed

‎docs/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -177,15 +177,15 @@ make run
177177
4. Open another terminal tab and deploy simple app to your cluster
178178
```sh
179179
kubectl apply -f ./examples/deployment.yaml
180-
kubectl get deployments app
180+
kubectl get deployments sample-deployment
181181
```
182182

183183
5. Update `lightrun_key`, `pinned_cert_hash` and `serverHostname` in the [CR example file](../examples/lightrunjavaagent.yaml)
184184

185185

186186
6. Create LightrunJavaAgent custom resource
187187
```sh
188-
kubectl apply -f ./config/samples/agents_v1beta_lightrunjavaagent.yaml
188+
kubectl apply -f ./examples/lightrunjavaagent.yaml
189189
```
190190

191191
At this point you will see in the controller logs that it recognized new resource and started to work.

‎examples/operator.yaml

+3-46
Original file line numberDiff line numberDiff line change
@@ -304,30 +304,6 @@ rules:
304304
verbs:
305305
- get
306306
---
307-
# Source: lightrun-k8s-operator/templates/proxy-rbac.yaml
308-
apiVersion: rbac.authorization.k8s.io/v1
309-
kind: ClusterRole
310-
metadata:
311-
name: lightrun-k8s-operator-proxy-role
312-
labels:
313-
helm.sh/chart: lightrun-k8s-operator-0.1.0
314-
app.kubernetes.io/name: lightrun-k8s-operator
315-
app.kubernetes.io/instance: release-name
316-
app.kubernetes.io/managed-by: Helm
317-
rules:
318-
- apiGroups:
319-
- authentication.k8s.io
320-
resources:
321-
- tokenreviews
322-
verbs:
323-
- create
324-
- apiGroups:
325-
- authorization.k8s.io
326-
resources:
327-
- subjectaccessreviews
328-
verbs:
329-
- create
330-
---
331307
# Source: lightrun-k8s-operator/templates/manager-rbac.yaml
332308
apiVersion: rbac.authorization.k8s.io/v1
333309
kind: ClusterRoleBinding
@@ -347,25 +323,6 @@ subjects:
347323
name: 'lightrun-k8s-operator-controller-manager'
348324
namespace: 'lightrun-operator'
349325
---
350-
# Source: lightrun-k8s-operator/templates/proxy-rbac.yaml
351-
apiVersion: rbac.authorization.k8s.io/v1
352-
kind: ClusterRoleBinding
353-
metadata:
354-
name: lightrun-k8s-operator-proxy-rolebinding
355-
labels:
356-
helm.sh/chart: lightrun-k8s-operator-0.1.0
357-
app.kubernetes.io/name: lightrun-k8s-operator
358-
app.kubernetes.io/instance: release-name
359-
app.kubernetes.io/managed-by: Helm
360-
roleRef:
361-
apiGroup: rbac.authorization.k8s.io
362-
kind: ClusterRole
363-
name: 'lightrun-k8s-operator-proxy-role'
364-
subjects:
365-
- kind: ServiceAccount
366-
name: 'lightrun-k8s-operator-controller-manager'
367-
namespace: 'lightrun-operator'
368-
---
369326
# Source: lightrun-k8s-operator/templates/leader-election-rbac.yaml
370327
apiVersion: rbac.authorization.k8s.io/v1
371328
kind: Role
@@ -447,10 +404,10 @@ spec:
447404
app.kubernetes.io/name: lightrun-k8s-operator
448405
app.kubernetes.io/instance: release-name
449406
ports:
450-
- name: https
451-
port: 8443
407+
- name: http
408+
port: 8080
452409
protocol: TCP
453-
targetPort: 8443
410+
targetPort: 8080
454411
---
455412
# Source: lightrun-k8s-operator/templates/deployment.yaml
456413
apiVersion: apps/v1

‎go.mod

+6-6
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ require (
3232
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3333
github.com/golang/protobuf v1.5.3 // indirect
3434
github.com/google/gnostic-models v0.6.8 // indirect
35-
github.com/google/go-cmp v0.5.9 // indirect
35+
github.com/google/go-cmp v0.6.0 // indirect
3636
github.com/google/gofuzz v1.2.0 // indirect
3737
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
3838
github.com/google/uuid v1.3.0 // indirect
@@ -52,13 +52,13 @@ require (
5252
github.com/spf13/pflag v1.0.5 // indirect
5353
go.uber.org/multierr v1.11.0 // indirect
5454
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
55-
golang.org/x/net v0.23.0 // indirect
55+
golang.org/x/net v0.33.0 // indirect
5656
golang.org/x/oauth2 v0.8.0 // indirect
57-
golang.org/x/sys v0.18.0 // indirect
58-
golang.org/x/term v0.18.0 // indirect
59-
golang.org/x/text v0.14.0 // indirect
57+
golang.org/x/sys v0.28.0 // indirect
58+
golang.org/x/term v0.27.0 // indirect
59+
golang.org/x/text v0.21.0 // indirect
6060
golang.org/x/time v0.3.0 // indirect
61-
golang.org/x/tools v0.9.3 // indirect
61+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
6262
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
6363
google.golang.org/appengine v1.6.7 // indirect
6464
google.golang.org/protobuf v1.33.0 // indirect

‎go.sum

+12-14
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu
4545
github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
4646
github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
4747
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
48-
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
49-
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
48+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
49+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
5050
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
5151
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
5252
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -137,17 +137,15 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl
137137
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
138138
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
139139
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
140-
golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
141-
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
142140
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
143141
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
144142
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
145143
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
146144
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
147145
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
148146
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
149-
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
150-
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
147+
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
148+
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
151149
golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
152150
golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
153151
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -163,16 +161,16 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
163161
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
164162
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
165163
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
166-
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
167-
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
164+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
165+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
168166
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
169-
golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
170-
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
167+
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
168+
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
171169
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
172170
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
173171
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
174-
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
175-
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
172+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
173+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
176174
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
177175
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
178176
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -181,8 +179,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
181179
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
182180
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
183181
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
184-
golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
185-
golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
182+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
183+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
186184
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
187185
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
188186
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

0 commit comments

Comments
 (0)