From f7298ef767e64fbd5154152beb8fe09cc92ba0e0 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 25 Jul 2016 17:12:16 -0700
Subject: [PATCH] add packing of IP perms, small cleanup in packing

---
 .../src/DomainServerSettingsManager.cpp          | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 341275fe13..d5bc732c13 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -354,16 +354,14 @@ void DomainServerSettingsManager::packPermissionsForMap(QString mapName,
                                                         NodePermissionsMap& permissionsRows,
                                                         QString keyPath) {
     // find (or create) the "security" section of the settings map
-    QVariant* security = valueForKeyPath(_configMap.getUserConfig(), "security");
-    if (!security || !security->canConvert(QMetaType::QVariantMap)) {
-        security = valueForKeyPath(_configMap.getUserConfig(), "security", true);
+    QVariant* security = valueForKeyPath(_configMap.getUserConfig(), "security", true);
+    if (!security->canConvert(QMetaType::QVariantMap)) {
         (*security) = QVariantMap();
     }
 
     // find (or create) whichever subsection of "security" we are packing
-    QVariant* permissions = valueForKeyPath(_configMap.getUserConfig(), keyPath);
-    if (!permissions || !permissions->canConvert(QMetaType::QVariantList)) {
-        permissions = valueForKeyPath(_configMap.getUserConfig(), keyPath, true);
+    QVariant* permissions = valueForKeyPath(_configMap.getUserConfig(), keyPath, true);
+    if (!permissions->canConvert(QMetaType::QVariantList)) {
         (*permissions) = QVariantList();
     }
 
@@ -420,6 +418,12 @@ void DomainServerSettingsManager::packPermissions() {
     // save settings for specific users
     packPermissionsForMap("permissions", _agentPermissions, AGENT_PERMISSIONS_KEYPATH);
 
+    // save settings for IP addresses
+    packPermissionsForMap("permissions", _ipPermissions, IP_PERMISSIONS_KEYPATH);
+
+    // save settings for IP address blacklist
+    packPermissionsForMap("permissions", _ipForbiddens, IP_FORBIDDENS_KEYPATH);
+
     // save settings for groups
     packPermissionsForMap("permissions", _groupPermissions, GROUP_PERMISSIONS_KEYPATH);