Skip to content

Commit f39c8fc

Browse files
author
Istiak Ferdous
committed
follow PEP 8 style guide
1 parent 633aa05 commit f39c8fc

13 files changed

Lines changed: 187 additions & 194 deletions

File tree

‎ApachController/BackupUtil.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import smtplib
22
import time
33
import argparse
4-
import subprocess, shlex
4+
import subprocess
5+
import shlex
56
import os
67

8+
79
class BackupUtil:
810

911
@staticmethod
@@ -53,8 +55,6 @@ def MoveAllBackups():
5355
subprocess.call(command, shell=True)
5456

5557

56-
57-
5858
def main():
5959

6060
parser = argparse.ArgumentParser(description='CyberPanel Backup tool.')
@@ -70,4 +70,4 @@ def main():
7070

7171

7272
if __name__ == "__main__":
73-
main()
73+
main()

‎api/views.py‎

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
from userManagment.views import submitUserDeletion as duc
2424
# Create your views here.
2525

26+
2627
@csrf_exempt
2728
def verifyConn(request):
2829
try:
@@ -53,6 +54,7 @@ def verifyConn(request):
5354
json_data = json.dumps(data_ret)
5455
return HttpResponse(json_data)
5556

57+
5658
@csrf_exempt
5759
def createWebsite(request):
5860
data = json.loads(request.body)
@@ -68,6 +70,7 @@ def createWebsite(request):
6870
wm = WebsiteManager()
6971
return wm.createWebsiteAPI(json.loads(request.body))
7072

73+
7174
@csrf_exempt
7275
def getPackagesListAPI(request):
7376
data = json.loads(request.body)
@@ -82,10 +85,11 @@ def getPackagesListAPI(request):
8285
pm = PackagesManager()
8386
return pm.listPackagesAPI(data)
8487
else:
85-
data_ret = {"status": 0,'error_message': "Could not authorize access to API"}
88+
data_ret = {"status": 0, 'error_message': "Could not authorize access to API"}
8689
json_data = json.dumps(data_ret)
8790
return HttpResponse(json_data)
8891

92+
8993
@csrf_exempt
9094
def getUserInfo(request):
9195
try:
@@ -132,6 +136,7 @@ def getUserInfo(request):
132136
json_data = json.dumps(data_ret)
133137
return HttpResponse(json_data)
134138

139+
135140
@csrf_exempt
136141
def changeUserPassAPI(request):
137142
try:
@@ -160,7 +165,6 @@ def changeUserPassAPI(request):
160165
json_data = json.dumps(data_ret)
161166
return HttpResponse(json_data)
162167

163-
164168
websiteOwn = Administrator.objects.get(userName=websiteOwner)
165169
websiteOwn.password = hashPassword.hash_password(ownerPassword)
166170
websiteOwn.save()
@@ -174,6 +178,7 @@ def changeUserPassAPI(request):
174178
json_data = json.dumps(data_ret)
175179
return HttpResponse(json_data)
176180

181+
177182
@csrf_exempt
178183
def submitUserDeletion(request):
179184
try:
@@ -205,6 +210,7 @@ def submitUserDeletion(request):
205210
json_data = json.dumps(data_ret)
206211
return HttpResponse(json_data)
207212

213+
208214
@csrf_exempt
209215
def changePackageAPI(request):
210216
try:
@@ -232,7 +238,6 @@ def changePackageAPI(request):
232238
json_data = json.dumps(data_ret)
233239
return HttpResponse(json_data)
234240

235-
236241
website = Websites.objects.get(domain=websiteName)
237242
pack = Package.objects.get(packageName=packageName)
238243

@@ -248,6 +253,7 @@ def changePackageAPI(request):
248253
json_data = json.dumps(data_ret)
249254
return HttpResponse(json_data)
250255

256+
251257
@csrf_exempt
252258
def deleteWebsite(request):
253259
try:
@@ -293,6 +299,7 @@ def deleteWebsite(request):
293299
json_data = json.dumps(data_ret)
294300
return HttpResponse(json_data)
295301

302+
296303
@csrf_exempt
297304
def submitWebsiteStatus(request):
298305
try:
@@ -324,6 +331,7 @@ def submitWebsiteStatus(request):
324331
json_data = json.dumps(data_ret)
325332
return HttpResponse(json_data)
326333

334+
327335
@csrf_exempt
328336
def loginAPI(request):
329337
try:
@@ -348,6 +356,7 @@ def loginAPI(request):
348356
json_data = json.dumps(data)
349357
return HttpResponse(json_data)
350358

359+
351360
@csrf_exempt
352361
def fetchSSHkey(request):
353362
try:
@@ -365,32 +374,33 @@ def fetchSSHkey(request):
365374

366375
if hashPassword.check_password(admin.password, password):
367376

368-
pubKey = os.path.join("/root",".ssh",'cyberpanel.pub')
377+
pubKey = os.path.join("/root", ".ssh", 'cyberpanel.pub')
369378
execPath = "cat " + pubKey
370379
data = ProcessUtilities.outputExecutioner(execPath)
371380

372381
data_ret = {
373382
'status': 1,
374383
'pubKeyStatus': 1,
375384
'error_message': "None",
376-
'pubKey':data
385+
'pubKey': data
377386
}
378387
json_data = json.dumps(data_ret)
379388
return HttpResponse(json_data)
380389
else:
381390
data_ret = {
382-
'status' : 0,
391+
'status': 0,
383392
'pubKeyStatus': 0,
384393
'error_message': "Could not authorize access to API."
385394
}
386395
json_data = json.dumps(data_ret)
387396
return HttpResponse(json_data)
388397

389398
except BaseException as msg:
390-
data = {'status' : 0, 'pubKeyStatus': 0,'error_message': str(msg)}
399+
data = {'status': 0, 'pubKeyStatus': 0, 'error_message': str(msg)}
391400
json_data = json.dumps(data)
392401
return HttpResponse(json_data)
393402

403+
394404
@csrf_exempt
395405
def remoteTransfer(request):
396406
try:
@@ -400,7 +410,6 @@ def remoteTransfer(request):
400410
username = data['username']
401411
password = data['password']
402412

403-
404413
admin = Administrator.objects.get(userName=username)
405414

406415
if admin.api == 0:
@@ -418,7 +427,7 @@ def remoteTransfer(request):
418427

419428
mailUtilities.checkHome()
420429
path = "/home/cyberpanel/accounts-" + str(randint(1000, 9999))
421-
writeToFile = open(path,'w')
430+
writeToFile = open(path, 'w')
422431

423432
for items in accountsToTransfer:
424433
writeToFile.writelines(items + "\n")
@@ -439,10 +448,11 @@ def remoteTransfer(request):
439448
return HttpResponse(json_data)
440449

441450
except BaseException as msg:
442-
data = {'transferStatus': 0,'error_message': str(msg)}
451+
data = {'transferStatus': 0, 'error_message': str(msg)}
443452
json_data = json.dumps(data)
444453
return HttpResponse(json_data)
445454

455+
446456
@csrf_exempt
447457
def fetchAccountsFromRemoteServer(request):
448458
try:
@@ -489,10 +499,11 @@ def fetchAccountsFromRemoteServer(request):
489499
return HttpResponse(json_data)
490500

491501
except BaseException as msg:
492-
data = {'fetchStatus': 0,'error_message': str(msg)}
502+
data = {'fetchStatus': 0, 'error_message': str(msg)}
493503
json_data = json.dumps(data)
494504
return HttpResponse(json_data)
495505

506+
496507
@csrf_exempt
497508
def FetchRemoteTransferStatus(request):
498509
try:
@@ -511,10 +522,9 @@ def FetchRemoteTransferStatus(request):
511522
dir = "/home/backup/transfer-"+str(data['dir'])+"/backup_log"
512523

513524
try:
514-
command = "cat "+ dir
525+
command = f"cat {dir}"
515526
status = ProcessUtilities.outputExecutioner(command)
516527

517-
518528
if hashPassword.check_password(admin.password, password):
519529

520530
final_json = json.dumps({'fetchStatus': 1, 'error_message': "None", "status": status})
@@ -527,13 +537,12 @@ def FetchRemoteTransferStatus(request):
527537
final_json = json.dumps({'fetchStatus': 1, 'error_message': "None", "status": "Just started.."})
528538
return HttpResponse(final_json)
529539

530-
531-
532540
except BaseException as msg:
533-
data = {'fetchStatus': 0,'error_message': str(msg)}
541+
data = {'fetchStatus': 0, 'error_message': str(msg)}
534542
json_data = json.dumps(data)
535543
return HttpResponse(json_data)
536544

545+
537546
@csrf_exempt
538547
def cancelRemoteTransfer(request):
539548
try:
@@ -551,8 +560,6 @@ def cancelRemoteTransfer(request):
551560

552561
dir = "/home/backup/transfer-"+str(data['dir'])
553562

554-
555-
556563
if hashPassword.check_password(admin.password, password):
557564

558565
path = dir + "/pid"
@@ -575,12 +582,12 @@ def cancelRemoteTransfer(request):
575582
json_data = json.dumps(data_ret)
576583
return HttpResponse(json_data)
577584

578-
579585
except BaseException as msg:
580586
data = {'cancelStatus': 1, 'error_message': str(msg)}
581587
json_data = json.dumps(data)
582588
return HttpResponse(json_data)
583589

590+
584591
@csrf_exempt
585592
def cyberPanelVersion(request):
586593
try:
@@ -591,7 +598,6 @@ def cyberPanelVersion(request):
591598
adminUser = data['username']
592599
adminPass = data['password']
593600

594-
595601
admin = Administrator.objects.get(userName=adminUser)
596602

597603
if admin.api == 0:
@@ -606,8 +612,8 @@ def cyberPanelVersion(request):
606612
data_ret = {
607613
"getVersion": 1,
608614
'error_message': "none",
609-
'currentVersion':Version.currentVersion,
610-
'build':Version.build
615+
'currentVersion': Version.currentVersion,
616+
'build': Version.build
611617
}
612618

613619
json_data = json.dumps(data_ret)
@@ -628,6 +634,7 @@ def cyberPanelVersion(request):
628634
json_data = json.dumps(data_ret)
629635
return HttpResponse(json_data)
630636

637+
631638
@csrf_exempt
632639
def runAWSBackups(request):
633640
try:
@@ -641,6 +648,7 @@ def runAWSBackups(request):
641648
except BaseException as msg:
642649
logging.writeToFile(str(msg) + ' [API.runAWSBackups]')
643650

651+
644652
@csrf_exempt
645653
def submitUserCreation(request):
646654
try:
@@ -672,6 +680,7 @@ def submitUserCreation(request):
672680
json_data = json.dumps(data_ret)
673681
return HttpResponse(json_data)
674682

683+
675684
@csrf_exempt
676685
def addFirewallRule(request):
677686
try:
@@ -705,6 +714,7 @@ def addFirewallRule(request):
705714
json_data = json.dumps(data_ret)
706715
return HttpResponse(json_data)
707716

717+
708718
@csrf_exempt
709719
def deleteFirewallRule(request):
710720
try:

0 commit comments

Comments
 (0)