fix!(backup): denying backup upload for non-encrypted firewalls (#1455)

Author: Tbaile

packages/ns-api/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ns-api
-PKG_VERSION:=3.4.1
+PKG_VERSION:=3.4.2
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/ns-api-$(PKG_VERSION)

packages/ns-api/files/ns.backup

@@ -170,6 +170,8 @@ elif cmd == 'call':
             print(json.dumps(utils.generic_error(f'remote list failed')))
 
     elif action == 'registered-backup':
+        if os.path.exists(PASSPHRASE_PATH):
+            print(utils.validation_error('passphrase', 'missing'))
         try:
             # create backup
             file_name = create_backup()

packages/ns-plug/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ns-plug
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/ns-plug-$(PKG_VERSION)

packages/ns-plug/files/send-backup

@@ -21,11 +21,12 @@ function send {
         # send encrypted backup
         gpg --batch -c --yes --passphrase-file $PASSPHRASE $BACKUP
         remote-backup upload "$BACKUP.gpg"
+        mv $MD5 $MD5_LAST
     else
-        remote-backup upload "$BACKUP"
+        # password not set, abort upload
+        exit 4
     fi
     rm -f "$BACKUP" "$BACKUP.gpg"
-    mv $MD5 $MD5_LAST
     exit $?
 }