ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-06-18 15:28:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow newlines to be part of environment variables

Browse Source 
We were not allowing newlines previously by virtue of the regex not
allowing them. The docker daemon and supervisor handling code both
support them, so we allow them in the parsing code too.

Change-type: patch
Signed-off-by: Cameron Diver <cameron@balena.io>
This commit is contained in:
Cameron Diver
2019-02-11 14:53:25 +00:00
parent 6bf008cc85
commit 49dbaaba12
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/conversions.ts
View File

@ -4,7 +4,7 @@ import { EnvVarObject } from './types';
export function envArrayToObject(env: string[]): EnvVarObject {
const toPair = (keyVal: string) => {
const m = keyVal.match(/^([^=]+)=(.*)$/);
const m = keyVal.match(/^([^=]+)=([^]*)$/);
if (m == null) {
console.log(
`WARNING: Could not correctly parse env var ${keyVal}. ` +

2
test/15-conversions.spec.coffee
View File

@ -43,9 +43,11 @@ describe 'conversions', ->
'key2=test\ntest',
'key3=test ',
'key4= test '
'key5=test\r\ntest',
])).to.deep.equal({
key1: ' test',
key2: 'test\ntest',
key3: 'test ',
key4: ' test ',
key5: 'test\r\ntest'
})