Skip to content

Commit 0b0538e

Browse files
fix: Fix insecure file permissions (#47)
* fix: Fix insecure file permissions * test: Fix a unit test assertion * chore: Use new octal number format in YAML
1 parent 661ba30 commit 0b0538e

File tree

8 files changed

+17
-6
lines changed

8 files changed

+17
-6
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ All notable changes to this project will be documented in this file.
2626
- Add Prometheus labels and annotations to role-group services ([#26]).
2727
- Helm: Allow Pod `priorityClassName` to be configured ([#34]).
2828
- Support log configuration and log aggregation ([#40]).
29+
- Ensure that the permissions of the configuration files are correct ([#47]).
2930

3031
[#10]: https://github.com/stackabletech/opensearch-operator/pull/10
3132
[#17]: https://github.com/stackabletech/opensearch-operator/pull/17
@@ -34,3 +35,4 @@ All notable changes to this project will be documented in this file.
3435
[#34]: https://github.com/stackabletech/opensearch-operator/pull/34
3536
[#38]: https://github.com/stackabletech/opensearch-operator/pull/38
3637
[#40]: https://github.com/stackabletech/opensearch-operator/pull/40
38+
[#47]: https://github.com/stackabletech/opensearch-operator/pull/47

docs/modules/opensearch/examples/getting_started/opensearch.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ spec:
3737
- name: security-config
3838
secret:
3939
secretName: opensearch-security-config
40+
defaultMode: 0o660
4041
- name: tls
4142
ephemeral:
4243
volumeClaimTemplate:

rust/operator-binary/src/controller/build/role_group_builder.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ impl<'a> RoleGroupBuilder<'a> {
260260
Volume {
261261
name: CONFIG_VOLUME_NAME.to_string(),
262262
config_map: Some(ConfigMapVolumeSource {
263+
default_mode: Some(0o660),
263264
name: self.resource_names.role_group_config_map().to_string(),
264265
..Default::default()
265266
}),
@@ -268,6 +269,7 @@ impl<'a> RoleGroupBuilder<'a> {
268269
Volume {
269270
name: LOG_CONFIG_VOLUME_NAME.to_string(),
270271
config_map: Some(ConfigMapVolumeSource {
272+
default_mode: Some(0o660),
271273
name: log_config_volume_config_map.to_string(),
272274
..Default::default()
273275
}),
@@ -1125,12 +1127,14 @@ mod tests {
11251127
"volumes": [
11261128
{
11271129
"configMap": {
1130+
"defaultMode": 0o660,
11281131
"name": "my-opensearch-cluster-nodes-default"
11291132
},
11301133
"name": "config"
11311134
},
11321135
{
11331136
"configMap": {
1137+
"defaultMode": 0o660,
11341138
"name": "my-opensearch-cluster-nodes-default"
11351139
},
11361140
"name": "log-config"

tests/templates/kuttl/external-access/opensearch.yaml.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ spec:
106106
- name: security-config
107107
secret:
108108
secretName: opensearch-security-config
109+
defaultMode: 0o660
109110
- name: tls
110111
ephemeral:
111112
volumeClaimTemplate:

tests/templates/kuttl/ldap/21-install-opensearch.yaml.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ spec:
6363
- name: security-config
6464
secret:
6565
secretName: opensearch-security-config
66+
defaultMode: 0o660
6667
- name: tls
6768
ephemeral:
6869
volumeClaimTemplate:

tests/templates/kuttl/metrics/20-install-opensearch.yaml.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ spec:
6363
- name: security-config
6464
secret:
6565
secretName: opensearch-security-config
66+
defaultMode: 0o660
6667
- name: tls
6768
ephemeral:
6869
volumeClaimTemplate:

tests/templates/kuttl/smoke/10-assert.yaml.j2

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -246,19 +246,19 @@ spec:
246246
terminationGracePeriodSeconds: 120
247247
volumes:
248248
- configMap:
249-
defaultMode: 420
249+
defaultMode: 0o660
250250
name: opensearch-nodes-cluster-manager
251251
name: config
252252
- configMap:
253-
defaultMode: 420
253+
defaultMode: 0o660
254254
name: opensearch-nodes-cluster-manager
255255
name: log-config
256256
- emptyDir:
257257
sizeLimit: 30Mi
258258
name: log
259259
- name: security-config
260260
secret:
261-
defaultMode: 420
261+
defaultMode: 0o660
262262
secretName: opensearch-security-config
263263
- ephemeral:
264264
volumeClaimTemplate:
@@ -558,19 +558,19 @@ spec:
558558
terminationGracePeriodSeconds: 120
559559
volumes:
560560
- configMap:
561-
defaultMode: 420
561+
defaultMode: 0o660
562562
name: opensearch-nodes-data
563563
name: config
564564
- configMap:
565-
defaultMode: 420
565+
defaultMode: 0o660
566566
name: opensearch-nodes-data
567567
name: log-config
568568
- emptyDir:
569569
sizeLimit: 30Mi
570570
name: log
571571
- name: security-config
572572
secret:
573-
defaultMode: 420
573+
defaultMode: 0o660
574574
secretName: opensearch-security-config
575575
- ephemeral:
576576
volumeClaimTemplate:

tests/templates/kuttl/smoke/10-install-opensearch.yaml.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ spec:
101101
- name: security-config
102102
secret:
103103
secretName: opensearch-security-config
104+
defaultMode: 0o660
104105
- name: tls
105106
ephemeral:
106107
volumeClaimTemplate:

0 commit comments

Comments
 (0)