diff --git a/hscontrol/policy/v2/testdata/acl_results/acl-dup-src-dst.hujson b/hscontrol/policy/v2/testdata/acl_results/acl-dup-src-dst.hujson index 61f7be889..38f451e15 100644 --- a/hscontrol/policy/v2/testdata/acl_results/acl-dup-src-dst.hujson +++ b/hscontrol/policy/v2/testdata/acl_results/acl-dup-src-dst.hujson @@ -1070,18 +1070,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "1648644086846487": { + "UserProfiles": {"1648644086846487": { "ID": 1648644086846487, "LoginName": "beedrill.tail78f774.ts.net", "DisplayName": "beedrill" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" }, "4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", @@ -5229,18 +5221,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "1934836799940716": { + "UserProfiles": {"1934836799940716": { "ID": 1934836799940716, "LoginName": "kakuna.tail78f774.ts.net", "DisplayName": "kakuna" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" }, "4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", @@ -7174,11 +7158,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { + "UserProfiles": {"3982058329734709": { "ID": 3982058329734709, "LoginName": "freya@example.com", "DisplayName": "freya" @@ -8144,15 +8124,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { + "UserProfiles": {"4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" diff --git a/hscontrol/policy/v2/testdata/acl_results/acl-dxp-dup-ports.hujson b/hscontrol/policy/v2/testdata/acl_results/acl-dxp-dup-ports.hujson index 4ed112a5d..130603aaa 100644 --- a/hscontrol/policy/v2/testdata/acl_results/acl-dxp-dup-ports.hujson +++ b/hscontrol/policy/v2/testdata/acl_results/acl-dxp-dup-ports.hujson @@ -1100,18 +1100,6 @@ "ID": 3002375348967683, "LoginName": "beedrill.tail78f774.ts.net", "DisplayName": "beedrill" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} } }, "blastoise": {"netmap": { @@ -2884,22 +2872,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { + "UserProfiles": {"4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "charmander": {"netmap": { "Cached": false, @@ -5558,19 +5534,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { + "UserProfiles": {"4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", "DisplayName": "thor" @@ -6454,23 +6418,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "5500796412630324": { + "UserProfiles": {"5500796412630324": { "ID": 5500796412630324, "LoginName": "kakuna.tail78f774.ts.net", "DisplayName": "kakuna" @@ -9132,23 +9080,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "7679017195430128": { + "UserProfiles": {"7679017195430128": { "ID": 7679017195430128, "LoginName": "raticate.tail78f774.ts.net", "DisplayName": "raticate" @@ -10032,23 +9964,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "4619042260808745": { + "UserProfiles": {"4619042260808745": { "ID": 4619042260808745, "LoginName": "rattata.tail78f774.ts.net", "DisplayName": "rattata" @@ -12710,22 +12626,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { + "UserProfiles": {"3982058329734709": { "ID": 3982058329734709, "LoginName": "freya@example.com", "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "weedle": {"netmap": { "Cached": false, @@ -13640,18 +13544,6 @@ "ID": 3102010822405838, "LoginName": "weedle.tail78f774.ts.net", "DisplayName": "weedle" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}} } diff --git a/hscontrol/policy/v2/testdata/acl_results/acl-n02.hujson b/hscontrol/policy/v2/testdata/acl_results/acl-n02.hujson index 015079162..5f1d87573 100644 --- a/hscontrol/policy/v2/testdata/acl_results/acl-n02.hujson +++ b/hscontrol/policy/v2/testdata/acl_results/acl-n02.hujson @@ -971,26 +971,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "1648644086846487": { + "UserProfiles": {"1648644086846487": { "ID": 1648644086846487, "LoginName": "beedrill.tail78f774.ts.net", "DisplayName": "beedrill" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "bulbasaur": {"netmap": { "Cached": false, @@ -1873,22 +1857,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { + "UserProfiles": {"4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "charmander": {"netmap": { "Cached": false, @@ -3658,19 +3630,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { + "UserProfiles": {"4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", "DisplayName": "thor" @@ -4554,26 +4514,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "1934836799940716": { + "UserProfiles": {"1934836799940716": { "ID": 1934836799940716, "LoginName": "kakuna.tail78f774.ts.net", "DisplayName": "kakuna" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "squirtle": {"netmap": { "Cached": false, @@ -6343,22 +6287,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { + "UserProfiles": {"3982058329734709": { "ID": 3982058329734709, "LoginName": "freya@example.com", "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "weedle": {"netmap": { "Cached": false, @@ -7239,23 +7171,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "8552661408847021": { + "UserProfiles": {"8552661408847021": { "ID": 8552661408847021, "LoginName": "weedle.tail78f774.ts.net", "DisplayName": "weedle" diff --git a/hscontrol/policy/v2/testdata/acl_results/acl-self-plus-dsts.hujson b/hscontrol/policy/v2/testdata/acl_results/acl-self-plus-dsts.hujson index aecf17f76..95a470dcc 100644 --- a/hscontrol/policy/v2/testdata/acl_results/acl-self-plus-dsts.hujson +++ b/hscontrol/policy/v2/testdata/acl_results/acl-self-plus-dsts.hujson @@ -1101,11 +1101,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "1648644086846487": { + "UserProfiles": {"1648644086846487": { "ID": 1648644086846487, "LoginName": "beedrill.tail78f774.ts.net", "DisplayName": "beedrill" @@ -4081,10 +4077,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" }, "4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", @@ -5092,11 +5084,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "1934836799940716": { + "UserProfiles": {"1934836799940716": { "ID": 1934836799940716, "LoginName": "kakuna.tail78f774.ts.net", "DisplayName": "kakuna" @@ -6998,10 +6986,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} } }, "weedle": {"netmap": { @@ -7883,23 +7867,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "8552661408847021": { + "UserProfiles": {"8552661408847021": { "ID": 8552661408847021, "LoginName": "weedle.tail78f774.ts.net", "DisplayName": "weedle" diff --git a/hscontrol/policy/v2/testdata/grant_results/grant-dxp-dup-dst.hujson b/hscontrol/policy/v2/testdata/grant_results/grant-dxp-dup-dst.hujson index 1b4791058..9c16ebbc6 100644 --- a/hscontrol/policy/v2/testdata/grant_results/grant-dxp-dup-dst.hujson +++ b/hscontrol/policy/v2/testdata/grant_results/grant-dxp-dup-dst.hujson @@ -1096,18 +1096,6 @@ "ID": 3002375348967683, "LoginName": "beedrill.tail78f774.ts.net", "DisplayName": "beedrill" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "whois": {"100.64.0.14": {"Node": { @@ -2941,22 +2929,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { + "UserProfiles": {"4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "charmander": {"netmap": { "Cached": false, @@ -5615,19 +5591,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { + "UserProfiles": {"4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", "DisplayName": "thor" @@ -6511,23 +6475,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "5500796412630324": { + "UserProfiles": {"5500796412630324": { "ID": 5500796412630324, "LoginName": "kakuna.tail78f774.ts.net", "DisplayName": "kakuna" @@ -9189,23 +9137,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "7679017195430128": { + "UserProfiles": {"7679017195430128": { "ID": 7679017195430128, "LoginName": "raticate.tail78f774.ts.net", "DisplayName": "raticate" @@ -10089,23 +10021,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "4619042260808745": { + "UserProfiles": {"4619042260808745": { "ID": 4619042260808745, "LoginName": "rattata.tail78f774.ts.net", "DisplayName": "rattata" @@ -12767,22 +12683,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { + "UserProfiles": {"3982058329734709": { "ID": 3982058329734709, "LoginName": "freya@example.com", "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "weedle": {"netmap": { "Cached": false, @@ -13697,18 +13601,6 @@ "ID": 3102010822405838, "LoginName": "weedle.tail78f774.ts.net", "DisplayName": "weedle" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "whois": {"100.64.0.16": {"Node": { "ID": 3002375348967683, diff --git a/hscontrol/policy/v2/testdata/grant_results/grant-dxp-dup-ports.hujson b/hscontrol/policy/v2/testdata/grant_results/grant-dxp-dup-ports.hujson index b5f75e83d..987daaedd 100644 --- a/hscontrol/policy/v2/testdata/grant_results/grant-dxp-dup-ports.hujson +++ b/hscontrol/policy/v2/testdata/grant_results/grant-dxp-dup-ports.hujson @@ -1116,18 +1116,6 @@ "ID": 3002375348967683, "LoginName": "beedrill.tail78f774.ts.net", "DisplayName": "beedrill" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "whois": {"100.64.0.14": {"Node": { @@ -2961,22 +2949,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { + "UserProfiles": {"4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "charmander": {"netmap": { "Cached": false, @@ -5635,19 +5611,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { + "UserProfiles": {"4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", "DisplayName": "thor" @@ -6531,23 +6495,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "5500796412630324": { + "UserProfiles": {"5500796412630324": { "ID": 5500796412630324, "LoginName": "kakuna.tail78f774.ts.net", "DisplayName": "kakuna" @@ -9209,23 +9157,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "7679017195430128": { + "UserProfiles": {"7679017195430128": { "ID": 7679017195430128, "LoginName": "raticate.tail78f774.ts.net", "DisplayName": "raticate" @@ -10109,23 +10041,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "4619042260808745": { + "UserProfiles": {"4619042260808745": { "ID": 4619042260808745, "LoginName": "rattata.tail78f774.ts.net", "DisplayName": "rattata" @@ -12787,22 +12703,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { + "UserProfiles": {"3982058329734709": { "ID": 3982058329734709, "LoginName": "freya@example.com", "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "weedle": {"netmap": { "Cached": false, @@ -13717,18 +13621,6 @@ "ID": 3102010822405838, "LoginName": "weedle.tail78f774.ts.net", "DisplayName": "weedle" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "whois": {"100.64.0.16": {"Node": { "ID": 3002375348967683, diff --git a/hscontrol/policy/v2/testdata/grant_results/grant-dxp-overlap-ranges.hujson b/hscontrol/policy/v2/testdata/grant_results/grant-dxp-overlap-ranges.hujson index 19668c819..c03577a2c 100644 --- a/hscontrol/policy/v2/testdata/grant_results/grant-dxp-overlap-ranges.hujson +++ b/hscontrol/policy/v2/testdata/grant_results/grant-dxp-overlap-ranges.hujson @@ -1100,18 +1100,6 @@ "ID": 3002375348967683, "LoginName": "beedrill.tail78f774.ts.net", "DisplayName": "beedrill" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "whois": {"100.64.0.14": {"Node": { @@ -2945,22 +2933,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { + "UserProfiles": {"4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "charmander": {"netmap": { "Cached": false, @@ -5619,19 +5595,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { + "UserProfiles": {"4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", "DisplayName": "thor" @@ -6515,23 +6479,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "5500796412630324": { + "UserProfiles": {"5500796412630324": { "ID": 5500796412630324, "LoginName": "kakuna.tail78f774.ts.net", "DisplayName": "kakuna" @@ -9193,23 +9141,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "7679017195430128": { + "UserProfiles": {"7679017195430128": { "ID": 7679017195430128, "LoginName": "raticate.tail78f774.ts.net", "DisplayName": "raticate" @@ -10093,23 +10025,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "4619042260808745": { + "UserProfiles": {"4619042260808745": { "ID": 4619042260808745, "LoginName": "rattata.tail78f774.ts.net", "DisplayName": "rattata" @@ -12771,22 +12687,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { + "UserProfiles": {"3982058329734709": { "ID": 3982058329734709, "LoginName": "freya@example.com", "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "weedle": {"netmap": { "Cached": false, @@ -13701,18 +13605,6 @@ "ID": 3102010822405838, "LoginName": "weedle.tail78f774.ts.net", "DisplayName": "weedle" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "whois": {"100.64.0.16": {"Node": { "ID": 3002375348967683, diff --git a/hscontrol/policy/v2/testdata/grant_results/grant-dxp-wildcard-and-port.hujson b/hscontrol/policy/v2/testdata/grant_results/grant-dxp-wildcard-and-port.hujson index 75aecd208..63fa98cb9 100644 --- a/hscontrol/policy/v2/testdata/grant_results/grant-dxp-wildcard-and-port.hujson +++ b/hscontrol/policy/v2/testdata/grant_results/grant-dxp-wildcard-and-port.hujson @@ -1088,18 +1088,6 @@ "ID": 3002375348967683, "LoginName": "beedrill.tail78f774.ts.net", "DisplayName": "beedrill" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "whois": {"100.64.0.14": {"Node": { @@ -2933,22 +2921,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { + "UserProfiles": {"4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "charmander": {"netmap": { "Cached": false, @@ -6491,23 +6467,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "5500796412630324": { + "UserProfiles": {"5500796412630324": { "ID": 5500796412630324, "LoginName": "kakuna.tail78f774.ts.net", "DisplayName": "kakuna" @@ -9169,23 +9129,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "7679017195430128": { + "UserProfiles": {"7679017195430128": { "ID": 7679017195430128, "LoginName": "raticate.tail78f774.ts.net", "DisplayName": "raticate" @@ -10069,23 +10013,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "4619042260808745": { + "UserProfiles": {"4619042260808745": { "ID": 4619042260808745, "LoginName": "rattata.tail78f774.ts.net", "DisplayName": "rattata" @@ -12747,22 +12675,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { + "UserProfiles": {"3982058329734709": { "ID": 3982058329734709, "LoginName": "freya@example.com", "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "weedle": {"netmap": { "Cached": false, @@ -13677,18 +13593,6 @@ "ID": 3102010822405838, "LoginName": "weedle.tail78f774.ts.net", "DisplayName": "weedle" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "whois": {"100.64.0.16": {"Node": { "ID": 3002375348967683, diff --git a/hscontrol/policy/v2/testdata/grant_results/grant-dxp-wildcard-dst.hujson b/hscontrol/policy/v2/testdata/grant_results/grant-dxp-wildcard-dst.hujson index c3d79362d..d74e4f7d5 100644 --- a/hscontrol/policy/v2/testdata/grant_results/grant-dxp-wildcard-dst.hujson +++ b/hscontrol/policy/v2/testdata/grant_results/grant-dxp-wildcard-dst.hujson @@ -1084,18 +1084,6 @@ "ID": 3002375348967683, "LoginName": "beedrill.tail78f774.ts.net", "DisplayName": "beedrill" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "whois": {"100.64.0.14": {"Node": { @@ -3113,18 +3101,10 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" }, "4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "whois": {"100.64.0.14": {"Node": { @@ -6152,14 +6132,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", @@ -7167,18 +7139,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }, "5500796412630324": { "ID": 5500796412630324, "LoginName": "kakuna.tail78f774.ts.net", @@ -10210,18 +10170,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }, "7679017195430128": { "ID": 7679017195430128, "LoginName": "raticate.tail78f774.ts.net", @@ -11229,18 +11177,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }, "4619042260808745": { "ID": 4619042260808745, "LoginName": "rattata.tail78f774.ts.net", @@ -14276,14 +14212,6 @@ "ID": 3982058329734709, "LoginName": "freya@example.com", "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "whois": {"100.64.0.14": {"Node": { diff --git a/hscontrol/policy/v2/testdata/grant_results/via-grant-v63.hujson b/hscontrol/policy/v2/testdata/grant_results/via-grant-v63.hujson index 31cceb051..0b5c105bb 100644 --- a/hscontrol/policy/v2/testdata/grant_results/via-grant-v63.hujson +++ b/hscontrol/policy/v2/testdata/grant_results/via-grant-v63.hujson @@ -1035,26 +1035,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3002375348967683": { + "UserProfiles": {"3002375348967683": { "ID": 3002375348967683, "LoginName": "beedrill.tail78f774.ts.net", "DisplayName": "beedrill" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "blastoise": { "packet_filter_rules": [{"SrcIPs": ["100.64.0.14", "fd7a:115c:a1e0::e"], "DstPorts": [ @@ -2974,22 +2958,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { + "UserProfiles": {"4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "charmander": {"netmap": { "Cached": false, @@ -5649,19 +5621,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { + "UserProfiles": {"4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", "DisplayName": "thor" @@ -6545,23 +6505,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "5500796412630324": { + "UserProfiles": {"5500796412630324": { "ID": 5500796412630324, "LoginName": "kakuna.tail78f774.ts.net", "DisplayName": "kakuna" @@ -9223,23 +9167,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "7679017195430128": { + "UserProfiles": {"7679017195430128": { "ID": 7679017195430128, "LoginName": "raticate.tail78f774.ts.net", "DisplayName": "raticate" @@ -10123,23 +10051,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "4619042260808745": { + "UserProfiles": {"4619042260808745": { "ID": 4619042260808745, "LoginName": "rattata.tail78f774.ts.net", "DisplayName": "rattata" @@ -12949,22 +12861,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { + "UserProfiles": {"3982058329734709": { "ID": 3982058329734709, "LoginName": "freya@example.com", "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "weedle": {"netmap": { "Cached": false, @@ -13906,18 +13806,6 @@ "ID": 3102010822405838, "LoginName": "weedle.tail78f774.ts.net", "DisplayName": "weedle" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "whois": {"100.64.0.13": {"Node": { "ID": 7357451232354462, diff --git a/hscontrol/policy/v2/testdata/grant_results/via-grant-v66.hujson b/hscontrol/policy/v2/testdata/grant_results/via-grant-v66.hujson index ffa805d36..925b6d7d8 100644 --- a/hscontrol/policy/v2/testdata/grant_results/via-grant-v66.hujson +++ b/hscontrol/policy/v2/testdata/grant_results/via-grant-v66.hujson @@ -1090,18 +1090,6 @@ "ID": 3002375348967683, "LoginName": "beedrill.tail78f774.ts.net", "DisplayName": "beedrill" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "whois": {"100.64.0.14": {"Node": { @@ -3044,22 +3032,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { + "UserProfiles": {"4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "charmander": {"netmap": { "Cached": false, @@ -5775,14 +5751,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", @@ -6789,23 +6757,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "5500796412630324": { + "UserProfiles": {"5500796412630324": { "ID": 5500796412630324, "LoginName": "kakuna.tail78f774.ts.net", "DisplayName": "kakuna" @@ -9467,23 +9419,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "7679017195430128": { + "UserProfiles": {"7679017195430128": { "ID": 7679017195430128, "LoginName": "raticate.tail78f774.ts.net", "DisplayName": "raticate" @@ -10367,23 +10303,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "4619042260808745": { + "UserProfiles": {"4619042260808745": { "ID": 4619042260808745, "LoginName": "rattata.tail78f774.ts.net", "DisplayName": "rattata" @@ -13153,22 +13073,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { + "UserProfiles": {"3982058329734709": { "ID": 3982058329734709, "LoginName": "freya@example.com", "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "weedle": {"netmap": { "Cached": false, @@ -14083,18 +13991,6 @@ "ID": 3102010822405838, "LoginName": "weedle.tail78f774.ts.net", "DisplayName": "weedle" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "whois": {"100.64.0.16": {"Node": { "ID": 3002375348967683, diff --git a/hscontrol/policy/v2/testdata/grant_results/via-grant-v67.hujson b/hscontrol/policy/v2/testdata/grant_results/via-grant-v67.hujson index 26dd3035b..53d4fec8b 100644 --- a/hscontrol/policy/v2/testdata/grant_results/via-grant-v67.hujson +++ b/hscontrol/policy/v2/testdata/grant_results/via-grant-v67.hujson @@ -1091,18 +1091,6 @@ "ID": 3002375348967683, "LoginName": "beedrill.tail78f774.ts.net", "DisplayName": "beedrill" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "whois": {"100.64.0.14": {"Node": { @@ -2937,22 +2925,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { + "UserProfiles": {"4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "charmander": {"netmap": { "Cached": false, @@ -5611,19 +5587,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { + "UserProfiles": {"4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", "DisplayName": "thor" @@ -6507,23 +6471,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "5500796412630324": { + "UserProfiles": {"5500796412630324": { "ID": 5500796412630324, "LoginName": "kakuna.tail78f774.ts.net", "DisplayName": "kakuna" @@ -9185,23 +9133,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "7679017195430128": { + "UserProfiles": {"7679017195430128": { "ID": 7679017195430128, "LoginName": "raticate.tail78f774.ts.net", "DisplayName": "raticate" @@ -10085,23 +10017,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "4619042260808745": { + "UserProfiles": {"4619042260808745": { "ID": 4619042260808745, "LoginName": "rattata.tail78f774.ts.net", "DisplayName": "rattata" @@ -12763,22 +12679,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { + "UserProfiles": {"3982058329734709": { "ID": 3982058329734709, "LoginName": "freya@example.com", "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "weedle": {"netmap": { "Cached": false, @@ -13693,18 +13597,6 @@ "ID": 3102010822405838, "LoginName": "weedle.tail78f774.ts.net", "DisplayName": "weedle" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "whois": {"100.64.0.16": {"Node": { "ID": 3002375348967683, diff --git a/hscontrol/policy/v2/testdata/routes_results/routes-m1-wildcard-src-multi-range.hujson b/hscontrol/policy/v2/testdata/routes_results/routes-m1-wildcard-src-multi-range.hujson index be7454cd0..8b4c91824 100644 --- a/hscontrol/policy/v2/testdata/routes_results/routes-m1-wildcard-src-multi-range.hujson +++ b/hscontrol/policy/v2/testdata/routes_results/routes-m1-wildcard-src-multi-range.hujson @@ -1098,10 +1098,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "m-odin2": {"packet_filter_rules": [{ "SrcIPs": ["100.64.0.4", "fd7a:115c:a1e0::4"], @@ -2094,10 +2090,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "m-thor": {"packet_filter_rules": [{ "SrcIPs": ["100.64.0.4", "fd7a:115c:a1e0::4"], @@ -3058,10 +3050,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", diff --git a/hscontrol/policy/v2/testdata/routes_results/routes-m2-member-partial-subnet.hujson b/hscontrol/policy/v2/testdata/routes_results/routes-m2-member-partial-subnet.hujson index 0335ee840..46d319349 100644 --- a/hscontrol/policy/v2/testdata/routes_results/routes-m2-member-partial-subnet.hujson +++ b/hscontrol/policy/v2/testdata/routes_results/routes-m2-member-partial-subnet.hujson @@ -1104,10 +1104,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "m-odin2": {"packet_filter_rules": [{ "SrcIPs": ["100.64.0.4", "fd7a:115c:a1e0::4"], @@ -2101,10 +2097,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "m-thor": {"packet_filter_rules": [{ "SrcIPs": ["100.64.0.4", "fd7a:115c:a1e0::4"], @@ -3066,10 +3058,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", @@ -7204,14 +7192,6 @@ "ID": 3530479444222049, "LoginName": "srv.tail78f774.ts.net", "DisplayName": "srv" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}} } diff --git a/hscontrol/policy/v2/testdata/routes_results/routes-m3-subnet-route-as-src.hujson b/hscontrol/policy/v2/testdata/routes_results/routes-m3-subnet-route-as-src.hujson index 600be3b24..fca165c9d 100644 --- a/hscontrol/policy/v2/testdata/routes_results/routes-m3-subnet-route-as-src.hujson +++ b/hscontrol/policy/v2/testdata/routes_results/routes-m3-subnet-route-as-src.hujson @@ -1073,10 +1073,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "m-odin2": {"packet_filter_rules": [{ @@ -2044,10 +2040,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "m-thor": {"packet_filter_rules": [{ @@ -2983,10 +2975,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", @@ -7048,14 +7036,6 @@ "ID": 3530479444222049, "LoginName": "srv.tail78f774.ts.net", "DisplayName": "srv" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }} } diff --git a/hscontrol/policy/v2/testdata/routes_results/routes-m4-member-self.hujson b/hscontrol/policy/v2/testdata/routes_results/routes-m4-member-self.hujson index 40a4c4416..723382515 100644 --- a/hscontrol/policy/v2/testdata/routes_results/routes-m4-member-self.hujson +++ b/hscontrol/policy/v2/testdata/routes_results/routes-m4-member-self.hujson @@ -1105,10 +1105,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "m-odin2": {"packet_filter_rules": [{ "SrcIPs": ["100.64.0.1", "100.64.0.2", "fd7a:115c:a1e0::1", "fd7a:115c:a1e0::2"], @@ -2103,10 +2099,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "m-thor": { "packet_filter_rules": [{"SrcIPs": ["100.64.0.3", "fd7a:115c:a1e0::3"], "DstPorts": [ @@ -3068,10 +3060,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", @@ -7089,14 +7077,6 @@ "ID": 3530479444222049, "LoginName": "srv.tail78f774.ts.net", "DisplayName": "srv" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}} } diff --git a/hscontrol/policy/v2/testdata/routes_results/routes-m6-subnet-to-subnet-multi-route.hujson b/hscontrol/policy/v2/testdata/routes_results/routes-m6-subnet-to-subnet-multi-route.hujson index f93987a97..05469bc62 100644 --- a/hscontrol/policy/v2/testdata/routes_results/routes-m6-subnet-to-subnet-multi-route.hujson +++ b/hscontrol/policy/v2/testdata/routes_results/routes-m6-subnet-to-subnet-multi-route.hujson @@ -1072,10 +1072,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "m-odin2": {"packet_filter_rules": [{ "SrcIPs": ["100.64.0.4", "fd7a:115c:a1e0::4"], @@ -2042,10 +2038,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "m-thor": {"packet_filter_rules": [{ "SrcIPs": ["100.64.0.4", "fd7a:115c:a1e0::4"], @@ -2980,10 +2972,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", @@ -7013,14 +7001,6 @@ "ID": 3530479444222049, "LoginName": "srv.tail78f774.ts.net", "DisplayName": "srv" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}} } diff --git a/hscontrol/policy/v2/testdata/users_results/users-bare-at-dst.hujson b/hscontrol/policy/v2/testdata/users_results/users-bare-at-dst.hujson index 6d568f080..ec736f06f 100644 --- a/hscontrol/policy/v2/testdata/users_results/users-bare-at-dst.hujson +++ b/hscontrol/policy/v2/testdata/users_results/users-bare-at-dst.hujson @@ -974,23 +974,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "595996273316687": { + "UserProfiles": {"595996273316687": { "ID": 595996273316687, "LoginName": "client.tail78f774.ts.net", "DisplayName": "client" @@ -2763,19 +2747,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { + "UserProfiles": {"4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", "DisplayName": "thor" @@ -3659,26 +3631,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "1817829895087832": { + "UserProfiles": {"1817829895087832": { "ID": 1817829895087832, "LoginName": "prod.tail78f774.ts.net", "DisplayName": "prod" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "router": {"netmap": { "Cached": false, @@ -5448,26 +5404,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "338543803640054": { + "UserProfiles": {"338543803640054": { "ID": 338543803640054, "LoginName": "server.tail78f774.ts.net", "DisplayName": "server" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "user-tid": {"netmap": { "Cached": false, @@ -6350,22 +6290,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { + "UserProfiles": {"4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "venusaur": {"netmap": { "Cached": false, @@ -7246,22 +7174,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { + "UserProfiles": {"3982058329734709": { "ID": 3982058329734709, "LoginName": "freya@example.com", "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}} } diff --git a/hscontrol/policy/v2/testdata/users_results/users-bare-at-group.hujson b/hscontrol/policy/v2/testdata/users_results/users-bare-at-group.hujson index 503b4369e..5c95517ff 100644 --- a/hscontrol/policy/v2/testdata/users_results/users-bare-at-group.hujson +++ b/hscontrol/policy/v2/testdata/users_results/users-bare-at-group.hujson @@ -975,23 +975,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "595996273316687": { + "UserProfiles": {"595996273316687": { "ID": 595996273316687, "LoginName": "client.tail78f774.ts.net", "DisplayName": "client" @@ -2764,19 +2748,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { + "UserProfiles": {"4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", "DisplayName": "thor" @@ -3660,26 +3632,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "1817829895087832": { + "UserProfiles": {"1817829895087832": { "ID": 1817829895087832, "LoginName": "prod.tail78f774.ts.net", "DisplayName": "prod" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "router": {"netmap": { "Cached": false, @@ -5449,26 +5405,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "338543803640054": { + "UserProfiles": {"338543803640054": { "ID": 338543803640054, "LoginName": "server.tail78f774.ts.net", "DisplayName": "server" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "user-tid": {"netmap": { "Cached": false, @@ -6351,22 +6291,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { + "UserProfiles": {"4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "venusaur": {"netmap": { "Cached": false, @@ -7247,22 +7175,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { + "UserProfiles": {"3982058329734709": { "ID": 3982058329734709, "LoginName": "freya@example.com", "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}} } diff --git a/hscontrol/policy/v2/testdata/users_results/users-bare-at-nodeattrs.hujson b/hscontrol/policy/v2/testdata/users_results/users-bare-at-nodeattrs.hujson index 8c93fce28..038de9dff 100644 --- a/hscontrol/policy/v2/testdata/users_results/users-bare-at-nodeattrs.hujson +++ b/hscontrol/policy/v2/testdata/users_results/users-bare-at-nodeattrs.hujson @@ -981,23 +981,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "595996273316687": { + "UserProfiles": {"595996273316687": { "ID": 595996273316687, "LoginName": "client.tail78f774.ts.net", "DisplayName": "client" @@ -2770,19 +2754,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { + "UserProfiles": {"4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", "DisplayName": "thor" @@ -3666,26 +3638,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "1817829895087832": { + "UserProfiles": {"1817829895087832": { "ID": 1817829895087832, "LoginName": "prod.tail78f774.ts.net", "DisplayName": "prod" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "router": {"netmap": { "Cached": false, @@ -5508,26 +5464,14 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "338543803640054": { + "UserProfiles": {"338543803640054": { "ID": 338543803640054, "LoginName": "server.tail78f774.ts.net", "DisplayName": "server" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" }, "4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} } }, "user-tid": {"netmap": { @@ -6441,18 +6385,10 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" }, "4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "venusaur": {"netmap": { "Cached": false, @@ -7333,22 +7269,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { + "UserProfiles": {"3982058329734709": { "ID": 3982058329734709, "LoginName": "freya@example.com", "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}} } diff --git a/hscontrol/policy/v2/testdata/users_results/users-bare-at-src.hujson b/hscontrol/policy/v2/testdata/users_results/users-bare-at-src.hujson index 4da381986..f74c0ff99 100644 --- a/hscontrol/policy/v2/testdata/users_results/users-bare-at-src.hujson +++ b/hscontrol/policy/v2/testdata/users_results/users-bare-at-src.hujson @@ -974,23 +974,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "595996273316687": { + "UserProfiles": {"595996273316687": { "ID": 595996273316687, "LoginName": "client.tail78f774.ts.net", "DisplayName": "client" @@ -2763,19 +2747,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { + "UserProfiles": {"4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", "DisplayName": "thor" @@ -3659,26 +3631,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "1817829895087832": { + "UserProfiles": {"1817829895087832": { "ID": 1817829895087832, "LoginName": "prod.tail78f774.ts.net", "DisplayName": "prod" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "router": {"netmap": { "Cached": false, @@ -5448,26 +5404,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "338543803640054": { + "UserProfiles": {"338543803640054": { "ID": 338543803640054, "LoginName": "server.tail78f774.ts.net", "DisplayName": "server" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "user-tid": {"netmap": { "Cached": false, @@ -6350,22 +6290,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { + "UserProfiles": {"4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "venusaur": {"netmap": { "Cached": false, diff --git a/hscontrol/policy/v2/testdata/users_results/users-bare-at-tagowner.hujson b/hscontrol/policy/v2/testdata/users_results/users-bare-at-tagowner.hujson index e5e8dcc41..d36cf75d3 100644 --- a/hscontrol/policy/v2/testdata/users_results/users-bare-at-tagowner.hujson +++ b/hscontrol/policy/v2/testdata/users_results/users-bare-at-tagowner.hujson @@ -978,23 +978,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "595996273316687": { + "UserProfiles": {"595996273316687": { "ID": 595996273316687, "LoginName": "client.tail78f774.ts.net", "DisplayName": "client" @@ -2767,19 +2751,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { + "UserProfiles": {"4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", "DisplayName": "thor" @@ -3663,26 +3635,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "1817829895087832": { + "UserProfiles": {"1817829895087832": { "ID": 1817829895087832, "LoginName": "prod.tail78f774.ts.net", "DisplayName": "prod" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "router": {"netmap": { "Cached": false, @@ -5505,26 +5461,14 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "338543803640054": { + "UserProfiles": {"338543803640054": { "ID": 338543803640054, "LoginName": "server.tail78f774.ts.net", "DisplayName": "server" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" }, "4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} } }, "user-tid": {"netmap": { @@ -6438,18 +6382,10 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" }, "4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "venusaur": {"netmap": { "Cached": false, @@ -7330,22 +7266,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { + "UserProfiles": {"3982058329734709": { "ID": 3982058329734709, "LoginName": "freya@example.com", "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}} } diff --git a/hscontrol/policy/v2/testdata/users_results/users-short-name.hujson b/hscontrol/policy/v2/testdata/users_results/users-short-name.hujson index ca35081e3..14c043960 100644 --- a/hscontrol/policy/v2/testdata/users_results/users-short-name.hujson +++ b/hscontrol/policy/v2/testdata/users_results/users-short-name.hujson @@ -974,23 +974,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "595996273316687": { + "UserProfiles": {"595996273316687": { "ID": 595996273316687, "LoginName": "client.tail78f774.ts.net", "DisplayName": "client" @@ -2763,19 +2747,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { + "UserProfiles": {"4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", "DisplayName": "thor" @@ -3659,26 +3631,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "1817829895087832": { + "UserProfiles": {"1817829895087832": { "ID": 1817829895087832, "LoginName": "prod.tail78f774.ts.net", "DisplayName": "prod" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "router": {"netmap": { "Cached": false, @@ -5448,26 +5404,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "338543803640054": { + "UserProfiles": {"338543803640054": { "ID": 338543803640054, "LoginName": "server.tail78f774.ts.net", "DisplayName": "server" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "user-tid": {"netmap": { "Cached": false, @@ -6350,22 +6290,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { + "UserProfiles": {"4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "venusaur": {"netmap": { "Cached": false, @@ -7246,22 +7174,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { + "UserProfiles": {"3982058329734709": { "ID": 3982058329734709, "LoginName": "freya@example.com", "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}} } diff --git a/hscontrol/policy/v2/testdata/users_results/users-unknown-direct.hujson b/hscontrol/policy/v2/testdata/users_results/users-unknown-direct.hujson index ef02116c6..2ec49dac7 100644 --- a/hscontrol/policy/v2/testdata/users_results/users-unknown-direct.hujson +++ b/hscontrol/policy/v2/testdata/users_results/users-unknown-direct.hujson @@ -984,23 +984,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" - }, "595996273316687": { + "UserProfiles": {"595996273316687": { "ID": 595996273316687, "LoginName": "client.tail78f774.ts.net", "DisplayName": "client" @@ -2773,19 +2757,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { + "UserProfiles": {"4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", "DisplayName": "thor" @@ -3669,26 +3641,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "1817829895087832": { + "UserProfiles": {"1817829895087832": { "ID": 1817829895087832, "LoginName": "prod.tail78f774.ts.net", "DisplayName": "prod" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "router": {"netmap": { "Cached": false, @@ -5458,26 +5414,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "338543803640054": { + "UserProfiles": {"338543803640054": { "ID": 338543803640054, "LoginName": "server.tail78f774.ts.net", "DisplayName": "server" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "user-tid": {"netmap": { "Cached": false, @@ -6360,22 +6300,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { + "UserProfiles": {"4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}, "venusaur": {"netmap": { "Cached": false, @@ -7256,22 +7184,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { + "UserProfiles": {"3982058329734709": { "ID": 3982058329734709, "LoginName": "freya@example.com", "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}} } diff --git a/hscontrol/policy/v2/testdata/users_results/users-unknown-member.hujson b/hscontrol/policy/v2/testdata/users_results/users-unknown-member.hujson index efccdacf2..fb9dca0a6 100644 --- a/hscontrol/policy/v2/testdata/users_results/users-unknown-member.hujson +++ b/hscontrol/policy/v2/testdata/users_results/users-unknown-member.hujson @@ -1021,22 +1021,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { + "UserProfiles": {"4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }, "595996273316687": { "ID": 595996273316687, "LoginName": "client.tail78f774.ts.net", @@ -2810,19 +2798,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { + "UserProfiles": {"4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", "DisplayName": "thor" @@ -7432,22 +7408,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { + "UserProfiles": {"3982058329734709": { "ID": 3982058329734709, "LoginName": "freya@example.com", "DisplayName": "freya" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }}} } diff --git a/hscontrol/servertest/testdata/steps/ephemeral-lifecycle.hujson b/hscontrol/servertest/testdata/steps/ephemeral-lifecycle.hujson index 951d694bd..8dfde675a 100644 --- a/hscontrol/servertest/testdata/steps/ephemeral-lifecycle.hujson +++ b/hscontrol/servertest/testdata/steps/ephemeral-lifecycle.hujson @@ -6399,10 +6399,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "8483199338957783": { "ID": 8483199338957783, "LoginName": "observer.tail78f774.ts.net", diff --git a/hscontrol/servertest/testdata/steps/hidden-peers.hujson b/hscontrol/servertest/testdata/steps/hidden-peers.hujson index 5e1d89414..f4c9d0183 100644 --- a/hscontrol/servertest/testdata/steps/hidden-peers.hujson +++ b/hscontrol/servertest/testdata/steps/hidden-peers.hujson @@ -6585,11 +6585,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { + "UserProfiles": {"4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", "DisplayName": "thor" @@ -6746,10 +6742,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "backend_state": "Running"}}, "frames": {"observer": [{"offset_ms": 0, "response": { @@ -6892,11 +6884,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4538565228176803": { + "UserProfiles": {"4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", "DisplayName": "thor" @@ -7023,10 +7011,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "backend_state": "Running"}}, "frames": { diff --git a/hscontrol/servertest/testdata/steps/identity.hujson b/hscontrol/servertest/testdata/steps/identity.hujson index 98bb493cc..4592aa0c3 100644 --- a/hscontrol/servertest/testdata/steps/identity.hujson +++ b/hscontrol/servertest/testdata/steps/identity.hujson @@ -1027,15 +1027,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "5627281689581307": { + "UserProfiles": {"5627281689581307": { "ID": 5627281689581307, "LoginName": "obs.tail78f774.ts.net", "DisplayName": "obs" @@ -5611,10 +5603,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "5627281689581307": { "ID": 5627281689581307, "LoginName": "obs.tail78f774.ts.net", @@ -6628,11 +6616,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "5627281689581307": { + "UserProfiles": {"5627281689581307": { "ID": 5627281689581307, "LoginName": "obs.tail78f774.ts.net", "DisplayName": "obs" diff --git a/hscontrol/servertest/testdata/steps/map-delivery.hujson b/hscontrol/servertest/testdata/steps/map-delivery.hujson index 6050ab268..6c650db95 100644 --- a/hscontrol/servertest/testdata/steps/map-delivery.hujson +++ b/hscontrol/servertest/testdata/steps/map-delivery.hujson @@ -12183,11 +12183,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "1725268417370232": { + "UserProfiles": {"1725268417370232": { "ID": 1725268417370232, "LoginName": "db1.tail78f774.ts.net", "DisplayName": "db1" @@ -15432,11 +15428,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "1725268417370232": { + "UserProfiles": {"1725268417370232": { "ID": 1725268417370232, "LoginName": "db1.tail78f774.ts.net", "DisplayName": "db1" @@ -34146,10 +34138,6 @@ "ID": 169562425833569, "LoginName": "svc.tail78f774.ts.net", "DisplayName": "svc" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }} }, "backend_state": "Running"} }, @@ -34885,10 +34873,6 @@ "ID": 169562425833569, "LoginName": "svc.tail78f774.ts.net", "DisplayName": "svc" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }} }, "backend_state": "Running"} }, @@ -37046,11 +37030,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "4778931629105895": { + "UserProfiles": {"4778931629105895": { "ID": 4778931629105895, "LoginName": "appc.tail78f774.ts.net", "DisplayName": "appc" @@ -37158,11 +37138,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "4156223528223174": { + "UserProfiles": {"4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" @@ -37237,11 +37213,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "1725268417370232": { + "UserProfiles": {"1725268417370232": { "ID": 1725268417370232, "LoginName": "db1.tail78f774.ts.net", "DisplayName": "db1" @@ -37348,11 +37320,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "4156223528223174": { + "UserProfiles": {"4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" @@ -37437,10 +37405,6 @@ "ID": 1714016727135796, "LoginName": "router.tail78f774.ts.net", "DisplayName": "router" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }} }, "backend_state": "Running"}, "sshd": {"netmap": { "Cached": false, @@ -37587,18 +37551,10 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "169562425833569": { + "UserProfiles": {"169562425833569": { "ID": 169562425833569, "LoginName": "svc.tail78f774.ts.net", "DisplayName": "svc" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }} }, "backend_state": "Running"}}, "frames": { diff --git a/hscontrol/servertest/testdata/steps/policy-generation.hujson b/hscontrol/servertest/testdata/steps/policy-generation.hujson index cfa5fa0fd..c3d7295ed 100644 --- a/hscontrol/servertest/testdata/steps/policy-generation.hujson +++ b/hscontrol/servertest/testdata/steps/policy-generation.hujson @@ -16261,10 +16261,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "ssh_rules": [{ "principals": [{"nodeIP": "100.122.74.40"}, {"nodeIP": "fd7a:115c:a1e0::7d28:4a29"}], @@ -16662,10 +16658,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "backend_state": "Running"}, "rt-plain": {"packet_filter_rules": [{ "SrcIPs": [ @@ -16882,10 +16874,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "backend_state": "Running"}, "srv": {"packet_filter_rules": [{"SrcIPs": [ "100.100.187.71", @@ -17138,10 +17126,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "ssh_rules": [{"principals": [ {"nodeIP": "100.100.187.71"}, @@ -17849,11 +17833,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "3982058329734709": { + "UserProfiles": {"3982058329734709": { "ID": 3982058329734709, "LoginName": "freya@example.com", "DisplayName": "freya" @@ -18176,10 +18156,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "ssh_rules": [{ "principals": [{"nodeIP": "100.122.74.40"}, {"nodeIP": "fd7a:115c:a1e0::7d28:4a29"}], @@ -18461,18 +18437,10 @@ "ID": 3000953077253870, "LoginName": "rt-b.tail78f774.ts.net", "DisplayName": "rt-b" - }, "3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" }, "4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "backend_state": "Running"}, "rt-plain": {"packet_filter_rules": [{ "SrcIPs": ["100.122.74.40", "fd7a:115c:a1e0::7d28:4a29"], @@ -18609,11 +18577,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"3982058329734709": { - "ID": 3982058329734709, - "LoginName": "freya@example.com", - "DisplayName": "freya" - }, "4044323459478186": { + "UserProfiles": {"4044323459478186": { "ID": 4044323459478186, "LoginName": "rt-plain.tail78f774.ts.net", "DisplayName": "rt-plain" @@ -18621,10 +18585,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "backend_state": "Running"}, "srv": {"packet_filter_rules": [{ "SrcIPs": ["100.122.74.40", "fd7a:115c:a1e0::7d28:4a29"], diff --git a/hscontrol/servertest/testdata/steps/reauth-foreign.hujson b/hscontrol/servertest/testdata/steps/reauth-foreign.hujson index 5c1a8ba93..297645034 100644 --- a/hscontrol/servertest/testdata/steps/reauth-foreign.hujson +++ b/hscontrol/servertest/testdata/steps/reauth-foreign.hujson @@ -1022,11 +1022,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "5627281689581307": { + "UserProfiles": {"5627281689581307": { "ID": 5627281689581307, "LoginName": "obs.tail78f774.ts.net", "DisplayName": "obs" @@ -8544,11 +8540,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "5627281689581307": { + "UserProfiles": {"5627281689581307": { "ID": 5627281689581307, "LoginName": "obs.tail78f774.ts.net", "DisplayName": "obs" @@ -11023,11 +11015,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "5627281689581307": { + "UserProfiles": {"5627281689581307": { "ID": 5627281689581307, "LoginName": "obs.tail78f774.ts.net", "DisplayName": "obs" diff --git a/hscontrol/servertest/testdata/steps/reauth-owner.hujson b/hscontrol/servertest/testdata/steps/reauth-owner.hujson index 4616125d5..c10183202 100644 --- a/hscontrol/servertest/testdata/steps/reauth-owner.hujson +++ b/hscontrol/servertest/testdata/steps/reauth-owner.hujson @@ -996,11 +996,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "5627281689581307": { + "UserProfiles": {"5627281689581307": { "ID": 5627281689581307, "LoginName": "obs.tail78f774.ts.net", "DisplayName": "obs" @@ -3779,10 +3775,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "5627281689581307": { "ID": 5627281689581307, "LoginName": "obs.tail78f774.ts.net", @@ -4300,10 +4292,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "5627281689581307": { "ID": 5627281689581307, "LoginName": "obs.tail78f774.ts.net", @@ -4837,10 +4825,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "5627281689581307": { "ID": 5627281689581307, "LoginName": "obs.tail78f774.ts.net", @@ -5879,10 +5863,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "5627281689581307": { "ID": 5627281689581307, "LoginName": "obs.tail78f774.ts.net", @@ -6428,11 +6408,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "4156223528223174": { + "UserProfiles": {"4156223528223174": { "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" diff --git a/hscontrol/servertest/testdata/steps/reauth.hujson b/hscontrol/servertest/testdata/steps/reauth.hujson index 0ffd2ff71..ff8dbbd3b 100644 --- a/hscontrol/servertest/testdata/steps/reauth.hujson +++ b/hscontrol/servertest/testdata/steps/reauth.hujson @@ -3479,11 +3479,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "5627281689581307": { + "UserProfiles": {"5627281689581307": { "ID": 5627281689581307, "LoginName": "obs.tail78f774.ts.net", "DisplayName": "obs" diff --git a/hscontrol/servertest/testdata/steps/route-announce.hujson b/hscontrol/servertest/testdata/steps/route-announce.hujson index 39b6b1b06..8d146c743 100644 --- a/hscontrol/servertest/testdata/steps/route-announce.hujson +++ b/hscontrol/servertest/testdata/steps/route-announce.hujson @@ -1032,10 +1032,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", @@ -4867,10 +4863,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "backend_state": "Running" @@ -5289,10 +5281,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", @@ -5872,10 +5860,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "backend_state": "Running" @@ -7508,10 +7492,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", @@ -8091,10 +8071,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "backend_state": "Running" @@ -8484,10 +8460,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", @@ -9067,10 +9039,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "backend_state": "Running" @@ -9380,10 +9348,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", @@ -9967,10 +9931,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "backend_state": "Running" @@ -10279,10 +10239,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", @@ -10862,10 +10818,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "backend_state": "Running" @@ -11149,10 +11101,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", @@ -11732,10 +11680,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "backend_state": "Running" @@ -12127,10 +12071,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", @@ -12720,10 +12660,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "backend_state": "Running" @@ -12914,10 +12850,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", @@ -13507,10 +13439,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "backend_state": "Running" @@ -13902,10 +13830,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", @@ -14495,10 +14419,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "backend_state": "Running" @@ -14830,10 +14750,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", @@ -15413,10 +15329,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "backend_state": "Running" @@ -15593,10 +15505,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", @@ -16176,10 +16084,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "backend_state": "Running" @@ -16561,10 +16465,6 @@ "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" }, "4538565228176803": { "ID": 4538565228176803, "LoginName": "thor@example.org", @@ -17144,10 +17044,6 @@ "ID": 4156223528223174, "LoginName": "odin@example.com", "DisplayName": "odin" - }, "4538565228176803": { - "ID": 4538565228176803, - "LoginName": "thor@example.org", - "DisplayName": "thor" }} }, "backend_state": "Running" diff --git a/hscontrol/servertest/testdata/steps/tag-owner-chain.hujson b/hscontrol/servertest/testdata/steps/tag-owner-chain.hujson index 1ea6c0b90..f3f2cf137 100644 --- a/hscontrol/servertest/testdata/steps/tag-owner-chain.hujson +++ b/hscontrol/servertest/testdata/steps/tag-owner-chain.hujson @@ -1031,15 +1031,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "4156223528223174": { - "ID": 4156223528223174, - "LoginName": "odin@example.com", - "DisplayName": "odin" - }, "5627281689581307": { + "UserProfiles": {"5627281689581307": { "ID": 5627281689581307, "LoginName": "obs.tail78f774.ts.net", "DisplayName": "obs" @@ -2555,11 +2547,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "5627281689581307": { + "UserProfiles": {"5627281689581307": { "ID": 5627281689581307, "LoginName": "obs.tail78f774.ts.net", "DisplayName": "obs" @@ -2922,11 +2910,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "5627281689581307": { + "UserProfiles": {"5627281689581307": { "ID": 5627281689581307, "LoginName": "obs.tail78f774.ts.net", "DisplayName": "obs" @@ -5160,11 +5144,7 @@ "TKAHead": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Domain": "odin@example.com", "DomainAuditLogID": "", - "UserProfiles": {"1260082990019555": { - "ID": 1260082990019555, - "LoginName": "tagged-devices", - "DisplayName": "Tagged Devices" - }, "5627281689581307": { + "UserProfiles": {"5627281689581307": { "ID": 5627281689581307, "LoginName": "obs.tail78f774.ts.net", "DisplayName": "obs" diff --git a/hscontrol/types/testcapture/testcapture.go b/hscontrol/types/testcapture/testcapture.go index 5e715b50a..e6577fd47 100644 --- a/hscontrol/types/testcapture/testcapture.go +++ b/hscontrol/types/testcapture/testcapture.go @@ -326,7 +326,9 @@ type Node struct { PacketFilterMatches []filtertype.Match `json:"packet_filter_matches,omitempty"` // Netmap is the full netmap as observed by the local tailscaled. - // NEVER trimmed. Consumers extract whatever fields they need. + // NEVER trimmed, with one exception: UserProfiles holds only what its + // node and peers use, as a client keeps every profile it was ever sent. + // Consumers extract whatever fields they need. // // IMPORTANT: the capture tool captures this by waiting for the IPN bus to // settle on a fresh delta-triggered notification, NOT by reading