From 6836b09f8740d9c43a7e3cb4e2efaf8aaa6a3da8 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 25 Jul 2016 15:36:12 -0700
Subject: [PATCH] add sections to DS security for IP/Subnet

---
 .../resources/describe-settings.json          | 142 ++++++++++++++++++
 1 file changed, 142 insertions(+)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 7600aefc09..6081a603f3 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -638,6 +638,148 @@
             }
           ]
         },
+        {
+          "name": "ip_permissions",
+          "type": "table",
+          "caption": "Permissions for Users from IP Addresses or Subnets",
+          "can_add_new_rows": true,
+          "groups": [
+            {
+              "label": "IP/Subnet",
+              "span": 1
+            },
+            {
+              "label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide IP Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users from specific IPs can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users from specific IPs can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users from specific IPs can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users from specific IPs can create new entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users from specific IPs can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether users from specific IPs can connect even if the domain has reached or exceeded its maximum allowed agents.</li></ul><p>Permissions granted to a specific user will derive from the matching IP address or subnet that is most specific. IP/Subnet permissions override group permissions. IP/Subnet permissions are only granted if the user does not have their own row in the users section.</p>'>?</a>",
+              "span": 6
+            }
+          ],
+
+          "columns": [
+            {
+              "name": "permissions_id",
+              "label": "IP/Subnet"
+            },
+            {
+              "name": "group_id",
+              "label": "Group ID",
+              "readonly": true,
+              "hidden": true
+            },
+            {
+              "name": "id_can_connect",
+              "label": "Connect",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
+            {
+              "name": "id_can_adjust_locks",
+              "label": "Lock / Unlock",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
+            {
+              "name": "id_can_rez",
+              "label": "Rez",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
+            {
+              "name": "id_can_rez_tmp",
+              "label": "Rez Temporary",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
+            {
+              "name": "id_can_write_to_asset_server",
+              "label": "Write Assets",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
+            {
+              "name": "id_can_connect_past_max_capacity",
+              "label": "Ignore Max Capacity",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            }
+          ]
+        },
+        {
+          "name": "ip_forbidden",
+          "type": "table",
+          "caption": "Permissions denied to Users from IP addresses or Subnets",
+          "can_add_new_rows": true,
+          "groups": [
+            {
+              "label": "IP/Subnet",
+              "span": 1
+            },
+            {
+              "label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide IP Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users from specific IPs can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users from specific IPs can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users from specific IPs can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users from specific IPs can create new entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users from specific IPs can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether users from specific IPs can connect even if the domain has reached or exceeded its maximum allowed agents.</li></ul><p>Permissions denied to a specific user will derive from the matching IP address or subnet that is most specific. IP/Subnet permission denials override group permission denials. IP/Subnet permission denials are only applied if the user does not have their own row in the users section.</p>'>?</a>",
+              "span": 6
+            }
+          ],
+
+          "columns": [
+            {
+              "name": "permissions_id",
+              "label": "IP/Subnet"
+            },
+            {
+              "name": "group_id",
+              "label": "Group ID",
+              "readonly": true,
+              "hidden": true
+            },
+            {
+              "name": "id_can_connect",
+              "label": "Connect",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
+            {
+              "name": "id_can_adjust_locks",
+              "label": "Lock / Unlock",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
+            {
+              "name": "id_can_rez",
+              "label": "Rez",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
+            {
+              "name": "id_can_rez_tmp",
+              "label": "Rez Temporary",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
+            {
+              "name": "id_can_write_to_asset_server",
+              "label": "Write Assets",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
+            {
+              "name": "id_can_connect_past_max_capacity",
+              "label": "Ignore Max Capacity",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            }
+          ]
+        },
         {
           "name": "permissions",
           "type": "table",