From e52a3063700fb64d6188b8076e2e60da2fe5547a Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Tue, 22 Feb 2022 16:34:53 +0100
Subject: [PATCH] Make sure we require an encryption password if encryption is
 set to true for importing app backups

---
 src/views/app.html | 2 +-
 src/views/app.js   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/app.html b/src/views/app.html
index e329f85e0..79cafa9d2 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -364,7 +364,7 @@
 
           <div class="form-group" ng-class="{ 'has-error': importBackup.error.password }">
             <label class="control-label" for="inputImportBackupPassword">{{ '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>
-            <input type="text" class="form-control" ng-model="importBackup.password" id="inputImportBackupPassword" ng-disabled="importBackup.busy" placeholder="Passphrase used to encrypt the backups">
+            <input type="text" class="form-control" ng-model="importBackup.password" id="inputImportBackupPassword" ng-disabled="importBackup.busy" ng-required="importBackup.encrypted" placeholder="Passphrase used to encrypt the backups">
           </div>
 
           <input class="ng-hide" type="submit" ng-disabled="importBackupForm.$invalid"/>
diff --git a/src/views/app.js b/src/views/app.js
index 05343c02c..72c150481 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -1249,6 +1249,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         backupId: '',
         password: '',
         mountOptions: {},
+        encrypted: false, // helps with ng-required when backupConfig is read from file
 
         clearForm: function () {
             // $scope.importBackup.provider = ''; // do not clear since we call this function on provider change