From 127c921f585582ddaaeec4ea3026d6c89ff500fc Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Wed, 11 Mar 2020 15:00:20 +0500 Subject: [PATCH] bug fixes to git manager --- .../websiteFunctions/websiteFunctions.js | 115 ++++++++ .../templates/websiteFunctions/manageGIT.html | 278 +++++++++++++++++- websiteFunctions/urls.py | 2 + websiteFunctions/views.py | 16 + websiteFunctions/website.py | 160 +++++++++- 5 files changed, 557 insertions(+), 14 deletions(-) diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js index 0ea33fe52..0ff02878e 100755 --- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js +++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js @@ -5830,9 +5830,12 @@ app.controller('manageGIT', function ($scope, $http, $timeout, $window) { $scope.remote = response.data.remote; $scope.remoteResult = response.data.remoteResult; $scope.totalCommits = response.data.totalCommits; + $scope.home = response.data.home; } else { $scope.gitTracking = false; $scope.gitEnable = true; + $scope.home = response.data.home; + $scope.deploymentKey = response.data.deploymentKey; } } else { new PNotify({ @@ -6256,6 +6259,118 @@ app.controller('manageGIT', function ($scope, $http, $timeout, $window) { } }; + $scope.attachRepoGIT = function () { + $scope.cyberpanelLoading = false; + $scope.commandStatus = ""; + $scope.statusBox = false; + + url = "/websites/attachRepoGIT"; + + + var data = { + domain: $("#domain").text(), + folder: $scope.folder, + gitHost: $scope.gitHost, + gitUsername: $scope.gitUsername, + gitReponame: $scope.gitReponame, + overrideData: $scope.overrideData + }; + + var config = { + headers: { + 'X-CSRFToken': getCookie('csrftoken') + } + }; + + $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas); + + function ListInitialDatas(response) { + $scope.cyberpanelLoading = true; + + if (response.data.status === 1) { + new PNotify({ + title: 'Success', + text: 'Changes applied.', + type: 'success' + }); + $scope.commandStatus = response.data.commandStatus; + $scope.fetchFolderDetails(); + } else { + new PNotify({ + title: 'Operation Failed!', + text: response.data.error_message, + type: 'error' + }); + $scope.commandStatus = response.data.commandStatus; + } + + + } + + function cantLoadInitialDatas(response) { + $scope.cyberpanelLoading = false; + new PNotify({ + title: 'Operation Failed!', + text: 'Could not connect to server, please refresh this page.', + type: 'error' + }); + + + } + }; + + $scope.removeTracking = function () { + + $scope.cyberpanelLoading = false; + + url = "/websites/removeTracking"; + + + var data = { + domain: $("#domain").text(), + folder: $scope.folder + }; + + var config = { + headers: { + 'X-CSRFToken': getCookie('csrftoken') + } + }; + + $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas); + + function ListInitialDatas(response) { + $scope.cyberpanelLoading = true; + if (response.data.status === 1) { + new PNotify({ + title: 'Success', + text: 'Changes applied.', + type: 'success' + }); + $scope.fetchFolderDetails(); + } else { + new PNotify({ + title: 'Operation Failed!', + text: response.data.error_message, + type: 'error' + }); + } + + + } + + function cantLoadInitialDatas(response) { + $scope.cyberpanelLoading = true; + new PNotify({ + title: 'Operation Failed!', + text: 'Could not connect to server, please refresh this page.', + type: 'error' + }); + + + } + }; + function getCreationStatus() { url = "/websites/installWordpressStatus"; diff --git a/websiteFunctions/templates/websiteFunctions/manageGIT.html b/websiteFunctions/templates/websiteFunctions/manageGIT.html index 34111da12..9e95fadfe 100755 --- a/websiteFunctions/templates/websiteFunctions/manageGIT.html +++ b/websiteFunctions/templates/websiteFunctions/manageGIT.html @@ -40,7 +40,231 @@ Init Repo + + + +
+ + + + Attach Existing Repo + + + + Create New Branch @@ -83,9 +307,10 @@
+

{% trans "Remove Git Tracking?" %}

+
+
+ +
+
+ +
+
+ +
+
+ + +
+
+ + @@ -290,7 +554,7 @@
diff --git a/websiteFunctions/urls.py b/websiteFunctions/urls.py index 2dd1d4708..35966d5a9 100755 --- a/websiteFunctions/urls.py +++ b/websiteFunctions/urls.py @@ -128,6 +128,8 @@ urlpatterns = [ url(r'^commitChanges$', views.commitChanges, name='commitChanges'), url(r'^gitPull$', views.gitPull, name='gitPull'), url(r'^gitPush$', views.gitPush, name='gitPush'), + url(r'^attachRepoGIT$', views.attachRepoGIT, name='attachRepoGIT'), + url(r'^removeTracking$', views.removeTracking, name='removeTracking'), ## Catch all for domains diff --git a/websiteFunctions/views.py b/websiteFunctions/views.py index d993a8f72..c9a620d4f 100755 --- a/websiteFunctions/views.py +++ b/websiteFunctions/views.py @@ -787,5 +787,21 @@ def gitPush(request): userID = request.session['userID'] wm = WebsiteManager() return wm.gitPush(userID, json.loads(request.body)) + except KeyError: + return redirect(loadLoginPage) + +def attachRepoGIT(request): + try: + userID = request.session['userID'] + wm = WebsiteManager() + return wm.attachRepoGIT(userID, json.loads(request.body)) + except KeyError: + return redirect(loadLoginPage) + +def removeTracking(request): + try: + userID = request.session['userID'] + wm = WebsiteManager() + return wm.removeTracking(userID, json.loads(request.body)) except KeyError: return redirect(loadLoginPage) \ No newline at end of file diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py index 80f1345bc..9666e6850 100755 --- a/websiteFunctions/website.py +++ b/websiteFunctions/website.py @@ -2880,7 +2880,7 @@ StrictHostKeyChecking no website = Websites.objects.get(domain=self.domain) - folders = ['/home/%s' % (self.domain), '/home/vmail/%s' % (self.domain)] + folders = ['/home/%s/public_html' % (self.domain), '/home/vmail/%s' % (self.domain)] databases = website.databases_set.all() @@ -2894,7 +2894,7 @@ StrictHostKeyChecking no return HttpResponse(str(msg)) def folderCheck(self): - domainPath = '/home/%s' % (self.domain) + domainPath = '/home/%s/public_html' % (self.domain) vmailPath = '/home/vmail/%s' % (self.domain) if self.folder == domainPath: @@ -2940,7 +2940,22 @@ StrictHostKeyChecking no command = 'ls -la %s' % (gitPath) if ProcessUtilities.outputExecutioner(command).find('No such file or directory') > -1: - data_ret = {'status': 1, 'repo': 0} + + command = 'cat /home/%s/.ssh/%s.pub' % (self.domain, website.externalApp) + deploymentKey = ProcessUtilities.outputExecutioner(command, website.externalApp) + + if deploymentKey.find('No such file or directory') > -1: + command = "ssh-keygen -f /home/%s/.ssh/%s -t rsa -N ''" % (self.domain, website.externalApp) + ProcessUtilities.executioner(command, website.externalApp) + + command = 'cat /home/%s/.ssh/%s.pub' % (self.domain, website.externalApp) + deploymentKey = ProcessUtilities.outputExecutioner(command, website.externalApp) + + home = 0 + if self.folder == '/home/%s/public_html' % (self.domain): + home = 1 + + data_ret = {'status': 1, 'repo': 0, 'deploymentKey': deploymentKey, 'home': home} json_data = json.dumps(data_ret) return HttpResponse(json_data) else: @@ -3000,8 +3015,14 @@ StrictHostKeyChecking no if totalCommits.find('fatal') > -1: totalCommits = '0' + ## Check if home + + home = 0 + if self.folder == '/home/%s' % (self.domain): + home = 1 + data_ret = {'status': 1, 'repo': 1, 'finalBranches': branches, 'deploymentKey': deploymentKey, - 'remote': remote, 'remoteResult': remoteResult, 'totalCommits': totalCommits} + 'remote': remote, 'remoteResult': remoteResult, 'totalCommits': totalCommits, 'home': home} json_data = json.dumps(data_ret) return HttpResponse(json_data) @@ -3170,7 +3191,7 @@ StrictHostKeyChecking no ## Check if remote exists - command = 'git -C %s checkout -b %s' % (self.folder, self.newBranchName) + command = 'git -C %s checkout -b "%s"' % (self.folder, self.newBranchName) commandStatus = ProcessUtilities.outputExecutioner(command) if commandStatus.find(self.newBranchName) > -1: @@ -3212,7 +3233,7 @@ StrictHostKeyChecking no command = 'git -C %s add -A' % (self.folder) ProcessUtilities.outputExecutioner(command) - command = 'git -C %s commit -m %s' % (self.folder, self.commitMessage) + command = 'git -C %s commit -m "%s"' % (self.folder, self.commitMessage) commandStatus = ProcessUtilities.outputExecutioner(command) if commandStatus.find('nothing to commit') == -1: @@ -3249,6 +3270,14 @@ StrictHostKeyChecking no else: return ACLManager.loadErrorJson() + ### set default ssh key + + externalApp = Websites.objects.get(domain=self.domain).externalApp + + command = 'git -C %s config --local core.sshCommand "ssh -i /home/%s/.ssh/%s"' % ( + self.folder, self.domain, externalApp) + ProcessUtilities.executioner(command) + ## Check if remote exists command = 'git -C %s pull' % (self.folder) @@ -3288,9 +3317,27 @@ StrictHostKeyChecking no else: return ACLManager.loadErrorJson() - command = 'git -C %s push -u origin master' % (self.folder) + ### set default ssh key + + externalApp = Websites.objects.get(domain=self.domain).externalApp + + command = 'git -C %s config --local core.sshCommand "ssh -i /home/%s/.ssh/%s"' % ( + self.folder, self.domain, externalApp) + ProcessUtilities.executioner(command) + + ## + + command = 'git -C %s push' % (self.folder) commandStatus = ProcessUtilities.outputExecutioner(command) + if commandStatus.find('has no upstream branch') > -1: + command = 'git -C %s rev-parse --abbrev-ref HEAD' % (self.folder) + currentBranch = ProcessUtilities.outputExecutioner(command).rstrip('\n') + + command = 'git -C %s push --set-upstream origin %s' % (self.folder, currentBranch) + commandStatus = ProcessUtilities.outputExecutioner(command) + + if commandStatus.find('Everything up-to-date') == -1 and commandStatus.find('rejected') == -1: data_ret = {'status': 1, 'commandStatus': commandStatus} json_data = json.dumps(data_ret) @@ -3304,3 +3351,102 @@ StrictHostKeyChecking no data_ret = {'status': 0, 'error_message': str(msg)} json_data = json.dumps(data_ret) return HttpResponse(json_data) + + def attachRepoGIT(self, userID=None, data=None): + try: + + currentACL = ACLManager.loadedACL(userID) + admin = Administrator.objects.get(pk=userID) + + self.domain = data['domain'] + self.folder = data['folder'] + self.gitHost = data['gitHost'] + self.gitUsername = data['gitUsername'] + self.gitReponame = data['gitReponame'] + try: + self.overrideData = data['overrideData'] + except: + self.overrideData = False + + + if ACLManager.checkOwnership(self.domain, admin, currentACL) == 1: + pass + else: + return ACLManager.loadErrorJson('status', 0) + + if self.folderCheck(): + pass + else: + return ACLManager.loadErrorJson() + + + if self.overrideData: + command = 'rm -rf %s' % (self.folder) + ProcessUtilities.executioner(command) + + ## Set defauly key + + externalApp = Websites.objects.get(domain=self.domain).externalApp + + command = 'git config --global core.sshCommand "ssh -i /home/%s/.ssh/%s"' % (self.domain, externalApp) + ProcessUtilities.executioner(command) + + ## + + command = 'git clone git@%s:%s/%s.git %s' % (self.gitHost, self.gitUsername, self.gitReponame, self.folder) + commandStatus = ProcessUtilities.outputExecutioner(command) + + if commandStatus.find('already exists') == -1 and commandStatus.find('Permission denied') == -1: + + command = 'git config --global --unset core.sshCommand' + ProcessUtilities.executioner(command) + + data_ret = {'status': 1, 'commandStatus': commandStatus} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) + + else: + + command = 'git config --global --unset core.sshCommand' + ProcessUtilities.executioner(command) + + data_ret = {'status': 0, 'error_message': 'Failed to clone.', 'commandStatus': commandStatus} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) + + except BaseException as msg: + data_ret = {'status': 0, 'error_message': str(msg)} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) + + def removeTracking(self, userID=None, data=None): + try: + + currentACL = ACLManager.loadedACL(userID) + admin = Administrator.objects.get(pk=userID) + + self.domain = data['domain'] + self.folder = data['folder'] + + + if ACLManager.checkOwnership(self.domain, admin, currentACL) == 1: + pass + else: + return ACLManager.loadErrorJson('status', 0) + + if self.folderCheck(): + pass + else: + return ACLManager.loadErrorJson() + + command = 'rm -rf %s/.git' % (self.folder) + ProcessUtilities.executioner(command) + + data_ret = {'status': 1} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) + + except BaseException as msg: + data_ret = {'status': 0, 'error_message': str(msg)} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) \ No newline at end of file