jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Make user repeat the backup encryption password

Browse Source
This commit is contained in:
Johannes Zellner
2020-11-14 11:01:46 +01:00
parent 5ee64c827a
commit 5d2f3d51bf
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/backups.html
+8 -3
View File
@@ -252,7 +252,12 @@
<div class="form-group" ng-class="{ 'has-error': configureBackup.error.password }" ng-show="configureBackup.provider !== 'noop'">
<label class="control-label" for="inputConfigureBackupPassword">{{ 'backups.configureBackupStorage.encryptionPassword' | tr }} <sup><a ng-href="https://docs.cloudron.io/backups/#encryption" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
<p class="small">{{ 'backups.configureBackupStorage.encryptionDescription' | tr }}</p>
<input type="text" class="form-control" name="password" ng-model="configureBackup.password" id="inputConfigureBackupPassword" name="prefix" ng-disabled="configureBackup.busy" placeholder="Passphrase used to encrypt the backups">
<input type="text" class="form-control" name="password" ng-model="configureBackup.password" id="inputConfigureBackupPassword" ng-disabled="configureBackup.busy" placeholder="{{ 'backups.configureBackupStorage.encryptionPasswordPlaceholder' | tr }}">
<div ng-show="configureBackup.password && configureBackup.password !== SECRET_PLACEHOLDER" ng-class="{ 'has-error': (configureBackupForm.password.$dirty && configureBackup.password !== configureBackup.passwordRepeat) }">
<p class="text-small" style="margin-top: 10px;" ng-class="{ 'text-danger': (configureBackupForm.password.$dirty && configureBackup.password !== configureBackup.passwordRepeat) }">{{ 'backups.configureBackupStorage.encryptionPasswordRepeat' | tr }}</p>
<input type="text" class="form-control" name="passwordRepeat" ng-model="configureBackup.passwordRepeat" ng-disabled="configureBackup.busy">
</div>
</div>
<a href="" ng-click="configureBackup.advancedVisible = true" ng-hide="configureBackup.advancedVisible">{{ 'backups.configureBackupStorage.advancedSettings' | tr }}</a>
@@ -302,12 +307,12 @@
</div> <!-- advanced -->
<input class="ng-hide" type="submit" ng-disabled="configureBackupForm.$invalid"/>
<input class="ng-hide" type="submit" ng-disabled="configureBackupForm.$invalid || (configureBackup.password !== SECRET_PLACEHOLDER && configureBackup.password !== configureBackup.passwordRepeat)"/>
</form>
</div>
<div class="modal-footer ">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
<button type="submit" class="btn btn-outline btn-success pull-right" ng-click="configureBackup.submit()" ng-disabled="configureBackupForm.$invalid || configureBackup.busy"><i class="fa fa-circle-notch fa-spin" ng-show="configureBackup.busy"></i><span> {{ 'main.dialog.save' | tr }}</span></button>
<button type="submit" class="btn btn-outline btn-success pull-right" ng-click="configureBackup.submit()" ng-disabled="configureBackupForm.$invalid || configureBackup.busy || (configureBackup.password !== SECRET_PLACEHOLDER && configureBackup.password !== configureBackup.passwordRepeat)"><i class="fa fa-circle-notch fa-spin" ng-show="configureBackup.busy"></i><span> {{ 'main.dialog.save' | tr }}</span></button>
</div>
</div>
</div>
src/views/backups.js
+4
View File
@@ -5,6 +5,8 @@
angular.module('Application').controller('BackupsController', ['$scope', '$location', '$rootScope', '$timeout', 'Client', function ($scope, $location, $rootScope, $timeout, Client) {
Client.onReady(function () { if (!Client.getUserInfo().isAtLeastAdmin) $location.path('/'); });
$scope.SECRET_PLACEHOLDER = SECRET_PLACEHOLDER;
$scope.config = Client.getConfig();
$scope.user = Client.getUserInfo();
$scope.memory = null; // { memory, swap }
@@ -410,6 +412,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
externalDisk: false,
format: 'tgz',
password: '',
passwordRepeat: '',
advancedVisible: false,
memoryTicks: [],
@@ -465,6 +468,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
}
$scope.configureBackup.endpoint = $scope.backupConfig.endpoint;
$scope.configureBackup.password = $scope.backupConfig.password;
$scope.configureBackup.passwordRepeat = '';
$scope.configureBackup.backupFolder = $scope.backupConfig.backupFolder;
$scope.configureBackup.mountPoint = $scope.backupConfig.mountPoint;
$scope.configureBackup.format = $scope.backupConfig.format;