Skip to content

Commit 7a7fd27

Browse files
authored
setup: Fixed error when passing shell reserved characters to setup databases (#4995)
* Fixed error when passing shell reserved charaters to setup databases script for dbsecret * Moved quote to encrypt method
1 parent 4df8d7a commit 7a7fd27

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

setup/bindir/cloud-setup-databases.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import string
2626
from optparse import OptionParser
2727
import subprocess
2828
import shutil
29+
import shlex
2930
import socket
3031

3132
# squelch mysqldb spurious warnings
@@ -399,7 +400,7 @@ for example:
399400
return 'ENC(%s)'%value
400401

401402
def encryptDBSecretKey():
402-
self.putDbProperty('db.cloud.encrypt.secret', formatEncryptResult(encrypt(self.dbsecretkey)))
403+
self.putDbProperty('db.cloud.encrypt.secret', formatEncryptResult(encrypt(shlex.quote(self.dbsecretkey))))
403404

404405
def encryptDBPassword():
405406
dbPassword = self.getDbProperty('db.cloud.password')

0 commit comments

Comments
 (0)