(fix) Fix collabora regex and secContext, move validation docs to per app (#1078)

* Better regex on collabora

* bump collabora

* Move per-app validation to per-app docs

* Update valid_chars and allowPrivEsc on collabora

* revert bump
This commit is contained in:
Stavros Kois
2021-10-02 11:30:07 +02:00
committed by GitHub
parent 48c6245fa7
commit 6eaca24761
6 changed files with 63 additions and 52 deletions
@@ -81,11 +81,11 @@ questions:
- "definitions/timezone"
- variable: domain
label: "Domain(s) using collabora"
description: 'Use backslash "\" before dots ".". Use pipe "|" to separate multiple domains'
description: 'Use pipe "|" to separate multiple domains'
schema:
type: string
default: 'nextcloud\.domain\.tld|othernextcloud\.domain\.tld'
valid_chars: '^([a-z]{1,}\\{1}\.{1}[a-z]{1,}\\{1}\.{1}[a-z]{1,}\|{0,1})*$'
default: 'nextcloud.domain.tld|othernextcloud.domain.tld'
valid_chars: '^([a-z]{1,}\.[a-z]{1,}\.[a-z]{1,})((\|[a-z]{1,}\.[a-z]{1,}\.[a-z]{1,}))*$'
required: true
- variable: username
label: "Username for WebUI"
@@ -123,8 +123,8 @@ questions:
description: "When this environment variable is set (is not “”), then its value will be used as server name in /etc/loolwsd/loolwsd.xml. Without this, CODE is not delivering a correct host for the websocket connection in case of a proxy in front of it."
schema:
type: string
default: 'collabora\.domain\.tld'
valid_chars: '^[a-z]{1,}\\{1}\.{1}[a-z]{1,}\\{1}\.{1}[a-z]{1,}$'
default: 'collabora.domain.tld'
valid_chars: '^([a-z]{1,}\.[a-z]{1,}\.[a-z]{1,})$'
# Include{containerConfig}
- variable: service
@@ -484,7 +484,7 @@ questions:
label: "Allow Privilege Escalation"
schema:
type: boolean
default: false
default: true
- variable: runAsNonRoot
label: "runAsNonRoot"
schema:
@@ -5,6 +5,7 @@ image:
securityContext:
readOnlyRootFilesystem: false
allowPrivilegeEscalation: true
runAsNonRoot: false
podSecurityContext:
+13
View File
@@ -0,0 +1,13 @@
# Input Validation
__`LATITUDE`__ and __`LONGITUDE`__
Accepted formats are:
- Float (eg. `24.2028`)
Regex used to match this: `^[0-9]{1,}\.{1}[0-9]{1,}$`
You can try live [here](https://regex101.com/r/xsLGWN/1)
---
_If you find a field that you think it needs validation, please open an issue on github_
@@ -0,0 +1,30 @@
# Input Validation
__`Domain(s) using collabora`__
Accepted formats are:
- Single domain (eg. `cloud.mydomain.com`)
- Multiple domains (eg. `cloud.mydomain.com|nextcloud.mydomain.com`) - Each domain is separated with `|`
Regex used to match those: `^([a-z]{1,}\.[a-z]{1,}\.[a-z]{1,})((\|[a-z]{1,}\.[a-z]{1,}\.[a-z]{1,}))*$`
You can try live [here](https://regex101.com/r/AQFh2g/1)
__`Server Name`__
Accepted formats are:
- Single domain (eg. `collabora.mydomain.com`)
Regex used to match this: `^([a-z]{1,}\.[a-z]{1,}\.[a-z]{1,})$`
You can try live [here](https://regex101.com/r/xCjpW7/1)
__`Password for WebUI`__
Accepted formats are:
- Letters, Numbers, Symbols, Minimum 8 characters (eg. `dg523$*a`) - It accepts `a-z`, `A-Z`, `0-9` and `!@#$%^&*?`
Regex used to match those: `[a-zA-Z0-9!@#$%^&*?]{8,}`
You can try live [here](https://regex101.com/r/ef3V88/1)
---
_If you find a field that you think it needs validation, please open an issue on github_
+13
View File
@@ -0,0 +1,13 @@
# Input Validation
__`APP_KEY`__
Accepted formats are:
- Letters, Numbers, Symbols, Exactly 32 characters (eg. `!oqVA9o2@br#$6vAyk8LLrDm54X5EtjD`) - It accepts `a-z`, `A-Z`, `0-9` and `!@#$%^&*?`
You can try live [here](https://regex101.com/r/OR879w/1)
Regex used to match this: `[a-zA-Z0-9!@#$%^&*?]{32}`
---
_If you find a field that you think it needs validation, please open an issue on github_
-46
View File
@@ -31,52 +31,6 @@ Regex uesd to match those: `^(?!^0(e[0-9]|[EPTGMK]i?|)$)([0-9]+)(|[EPTGMK]i?|e[0
You can try live [here](https://regex101.com/r/LyDc6u/1)
More detailed info can be found [here](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-memory)
### Per app validation
---
#### Appdaemon
__`LATITUDE`__ and __`LONGITUDE`__
Accepted formats are:
- Float (eg. `24.2028`)
Regex used to match this: `^[0-9]{1,}\.{1}[0-9]{1,}$`
You can try live [here](https://regex101.com/r/xsLGWN/1)
#### Collabora
__`Domain(s) using collabora`__
Accepted formats are:
- Single domain (eg. `cloud\.mydomain\.com`) - Each `.` has to be escaped with `\`
- Multiple domains (eg. `cloud\.mydomain\.com|nextcloud\.mydomain\.com`) - Each `.` has to be escaped with `\` and each domain is separated with `|`
Regex used to match those: `^([a-z]{1,}\\{1}\.{1}[a-z]{1,}\\{1}\.{1}[a-z]{1,}\|{0,1})*$`
You can try live [here](https://regex101.com/r/LK02xa/1)
__`Password for WebUI`__
Accepted formats are:
- Letters, Numbers, Symbols, Minimum 8 characters (eg. `dg523$*a`) - It accepts `a-z`, `A-Z`, `0-9` and `!@#$%^&*?`
Regex used to match those: `[a-zA-Z0-9!@#$%^&*?]{8,}`
You can try live [here](https://regex101.com/r/ef3V88/1)
#### Fireflyiii
__`APP_KEY`__
Accepted formats are:
- Letters, Numbers, Symbols, Exactly 32 characters (eg. `!oqVA9o2@br#$6vAyk8LLrDm54X5EtjD`) - It accepts `a-z`, `A-Z`, `0-9` and `!@#$%^&*?`
You can try live [here](https://regex101.com/r/OR879w/1)
Regex used to match this: `[a-zA-Z0-9!@#$%^&*?]{32}`
---
_If you find a field that you think it needs validation, please open an issue on github_