Skip to content

Commit 036322d

Browse files
usmannasirusmannasir
committed
bug fix: backup engine
1 parent 02038b2 commit 036322d

File tree

2 files changed

+48
-37
lines changed

2 files changed

+48
-37
lines changed

‎plogical/backupUtilities.py‎

Lines changed: 48 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -106,48 +106,65 @@ def prepareBackupMeta(backupDomain, backupName, tempStoragePath, backupPath):
106106
dbuser = DBUsers.objects.get(user=items.dbUser)
107107
userToTry = items.dbUser
108108
except:
109-
dbusers = DBUsers.objects.all().filter(user=items.dbUser)
110-
userToTry = items.dbUser
111-
for it in dbusers:
112-
dbuser = it
113-
break
114-
115-
userToTry = mysqlUtilities.mysqlUtilities.fetchuser(items.dbUser)
116-
117109
try:
118-
dbuser = DBUsers.objects.get(user=userToTry)
119-
except:
120-
dbusers = DBUsers.objects.all().filter(user=userToTry)
110+
dbusers = DBUsers.objects.all().filter(user=items.dbUser)
111+
userToTry = items.dbUser
121112
for it in dbusers:
122113
dbuser = it
123114
break
124115

116+
userToTry = mysqlUtilities.mysqlUtilities.fetchuser(items.dbUser)
117+
118+
try:
119+
dbuser = DBUsers.objects.get(user=userToTry)
120+
except:
121+
try:
122+
dbusers = DBUsers.objects.all().filter(user=userToTry)
123+
for it in dbusers:
124+
dbuser = it
125+
break
126+
except BaseException, msg:
127+
logging.CyberCPLogFileWriter.writeToFile(
128+
'While creating backup for %s, we failed to backup database %s. Error message: %s' % (
129+
backupDomain, items.dbName, str(msg)))
130+
continue
131+
except BaseException, msg:
132+
logging.CyberCPLogFileWriter.writeToFile(
133+
'While creating backup for %s, we failed to backup database %s. Error message: %s' % (
134+
backupDomain, items.dbName, str(msg)))
135+
continue
136+
125137

126138

127139
databaseXML = Element('database')
128140

129141
child = SubElement(databaseXML, 'dbName')
130-
child.text = items.dbName
142+
child.text = str(items.dbName)
131143
child = SubElement(databaseXML, 'dbUser')
132-
child.text = userToTry
144+
child.text = str(userToTry)
133145
child = SubElement(databaseXML, 'password')
134-
child.text = dbuser.password
146+
child.text = str(dbuser.password)
135147

136148
databasesXML.append(databaseXML)
137149

138150
metaFileXML.append(databasesXML)
139151

140152
## Get Aliases
141153

142-
aliasesXML = Element('Aliases')
154+
try:
155+
156+
aliasesXML = Element('Aliases')
143157

144-
aliases = backupUtilities.getAliases(backupDomain)
158+
aliases = backupUtilities.getAliases(backupDomain)
145159

146-
for items in aliases:
147-
child = SubElement(aliasesXML, 'alias')
148-
child.text = items
160+
for items in aliases:
161+
child = SubElement(aliasesXML, 'alias')
162+
child.text = items
149163

150-
metaFileXML.append(aliasesXML)
164+
metaFileXML.append(aliasesXML)
165+
166+
except BaseException, msg:
167+
logging.CyberCPLogFileWriter.statusWriter(status, '%s. [167:prepMeta]' % (str(msg)))
151168

152169
## Finish Alias
153170

@@ -208,6 +225,8 @@ def prettify(elem):
208225
reparsed = minidom.parseString(rough_string)
209226
return reparsed.toprettyxml(indent=" ")
210227

228+
229+
211230
## /home/example.com/backup/backup-example.com-02.13.2018_10-24-52/meta.xml -- metaPath
212231

213232
metaPath = '/tmp/%s' % (str(randint(1000, 9999)))
@@ -225,7 +244,7 @@ def prettify(elem):
225244
size=0, status=1)
226245
newBackup.save()
227246

228-
logging.CyberCPLogFileWriter.statusWriter(status, 'Meta data us ready..')
247+
logging.CyberCPLogFileWriter.statusWriter(status, 'Meta data is ready..')
229248

230249
return 1,'None', metaPath
231250

@@ -362,7 +381,7 @@ def BackupRoot(tempStoragePath, backupName, backupPath, metaPath=None):
362381

363382
if os.path.islink(status) or os.path.islink(tempStoragePath or os.path.islink(backupPath)) or os.path.islink(metaPath):
364383
logging.CyberCPLogFileWriter.writeToFile('symlinked.')
365-
logging.CyberCPLogFileWriter.statusWriter(status, 'Symlink attack. [5009]')
384+
logging.CyberCPLogFileWriter.statusWriter(status, 'Symlink attack. [365][5009]')
366385
return 0
367386

368387
## backup email accounts
@@ -572,7 +591,7 @@ def startRestore(backupName, dir):
572591
logging.CyberCPLogFileWriter.writeToFile('%s. [555:startRestore]' % (str(msg)))
573592

574593
else:
575-
logging.CyberCPLogFileWriter.statusWriter(status, "Error Message: " + result[1] + ". Not able to create Account, Databases and DNS Records, aborting. [5009]")
594+
logging.CyberCPLogFileWriter.statusWriter(status, "Error Message: " + result[1] + ". Not able to create Account, Databases and DNS Records, aborting. [575][5009]")
576595
return 0
577596

578597
########### Creating child/sub/addon/parked domains
@@ -632,11 +651,11 @@ def startRestore(backupName, dir):
632651

633652
continue
634653
else:
635-
logging.CyberCPLogFileWriter.statusWriter(status, "Error Message: " + retValues[1] + ". Not able to create child domains, aborting. [5009]")
654+
logging.CyberCPLogFileWriter.statusWriter(status, "Error Message: " + retValues[1] + ". Not able to create child domains, aborting. [635][5009]")
636655
return 0
637656
except BaseException, msg:
638657
status = open(os.path.join(completPath,'status'), "w")
639-
status.write("Error Message: " + str(msg) +". Not able to create child domains, aborting. [5009]")
658+
status.write("Error Message: " + str(msg) +". Not able to create child domains, aborting. [638][5009]")
640659
status.close()
641660
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [startRestore]")
642661
return 0
@@ -668,7 +687,7 @@ def startRestore(backupName, dir):
668687
raise BaseException(result[1])
669688

670689
except BaseException, msg:
671-
logging.CyberCPLogFileWriter.statusWriter(status, "Error Message: " + str(msg) +". Not able to create email accounts, aborting. [5009]")
690+
logging.CyberCPLogFileWriter.statusWriter(status, "Error Message: " + str(msg) +". Not able to create email accounts, aborting. [671][5009]")
672691
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [startRestore]")
673692
return 0
674693

@@ -733,7 +752,7 @@ def startRestore(backupName, dir):
733752

734753
except BaseException, msg:
735754
status = os.path.join(completPath, 'status')
736-
logging.CyberCPLogFileWriter.statusWriter(status, str(msg) + " [5009]")
755+
logging.CyberCPLogFileWriter.statusWriter(status, str(msg) + " [736][5009]")
737756
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [startRestore]")
738757

739758
@staticmethod
@@ -1081,7 +1100,7 @@ def submitBackupCreation(tempStoragePath, backupName, backupPath, backupDomain):
10811100

10821101

10831102
if result[0] == 0:
1084-
logging.CyberCPLogFileWriter.statusWriter(status, str(result[1]) + ' [5009]')
1103+
logging.CyberCPLogFileWriter.statusWriter(status, str(result[1]) + ' [1084][5009]')
10851104
return 0
10861105

10871106
command = 'chown %s:%s %s' % (website.externalApp, website.externalApp, status)
@@ -1162,7 +1181,7 @@ def cancelBackupCreation(backupCancellationDomain,fileName):
11621181
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [cancelBackupCreation]")
11631182

11641183
status = open(backupPath + 'status', "w")
1165-
status.write("Aborted manually. [5009]")
1184+
status.write("Aborted manually. [1165][5009]")
11661185
status.close()
11671186
except BaseException,msg:
11681187
logging.CyberCPLogFileWriter.writeToFile(

‎plogical/test.py‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +0,0 @@
1-
import OpenSSL
2-
from datetime import datetime
3-
filePath = '/etc/letsencrypt/live/%s/fullchain.pem' % ('hello.com')
4-
x509 = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM,
5-
open(filePath, 'r').read())
6-
expireData = x509.get_notAfter().decode('ascii')
7-
finalDate = datetime.strptime(expireData, '%Y%m%d%H%M%SZ')
8-
print x509.get_issuer().get_components()[1][1]

0 commit comments

Comments
 (0)