apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

setup: pass password in quotes for cloudstack-setup-databases (#5025)

Browse Source 
Fixes issue of passing password and management secret key with special
characters.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2021-05-18 22:09:14 +05:30 committed by GitHub
parent 06454ff92e
commit 65672b77fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
setup/bindir/cloud-setup-databases.in
View File

@ -26,7 +26,6 @@ import string
from optparse import OptionParser
import subprocess
import shutil
import shlex
import socket
# squelch mysqldb spurious warnings
@ -147,7 +146,7 @@ class DBDeployer(object):
try:
mysqlCmds = [mysqlPath, '--user=%s'%kwargs['user'], '--host=%s'%kwargs['host'], '--port=%s'%kwargs['port']]
if 'passwd' in kwargs:
mysqlCmds.append('--password=%s'%kwargs['passwd'])
mysqlCmds.append('--password=\'%s\''%kwargs['passwd'])
open(self.tmpMysqlFile, 'w').write(text)
mysqlCmds.append('<')
mysqlCmds.append(self.tmpMysqlFile)
@ -389,7 +388,7 @@ for example:
def processEncryptionStuff(self):
def encrypt(input):
cmd = ['java','-Djava.security.egd=file:/dev/urandom','-classpath','"' + self.encryptionJarPath + '"','org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI', 'encrypt.sh', 'input=%s'%input, 'password=%s'%self.mgmtsecretkey,'verbose=false']
cmd = ['java','-Djava.security.egd=file:/dev/urandom','-classpath','"' + self.encryptionJarPath + '"','org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI', 'encrypt.sh', 'input=\'%s\''%input, 'password=\'%s\''%self.mgmtsecretkey,'verbose=false']
return str(runCmd(cmd)).strip('\r\n')
def saveMgmtServerSecretKey():
@ -400,7 +399,7 @@ for example:
return 'ENC(%s)'%value
def encryptDBSecretKey():
self.putDbProperty('db.cloud.encrypt.secret', formatEncryptResult(encrypt(shlex.quote(self.dbsecretkey))))
self.putDbProperty('db.cloud.encrypt.secret', formatEncryptResult(encrypt(self.dbsecretkey)))
def encryptDBPassword():
dbPassword = self.getDbProperty('db.cloud.password')