From 21bc8236b03b44828aac58686678b5b16b7124f6 Mon Sep 17 00:00:00 2001 From: Tianyuan Yu Date: Mon, 12 Oct 2026 22:45:44 -0700 Subject: [PATCH] fix: authorize network-level testbed users --- templates/ndnd-merkle/management-schema.lvs.j2 | 7 ++++++- templates/ndnd-repo/management-schema.lvs.j2 | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/templates/ndnd-merkle/management-schema.lvs.j2 b/templates/ndnd-merkle/management-schema.lvs.j2 index 64f16eb..50742f5 100644 --- a/templates/ndnd-merkle/management-schema.lvs.j2 +++ b/templates/ndnd-merkle/management-schema.lvs.j2 @@ -1,9 +1,14 @@ -// Root -> site -> certified requester; only the local log signs responses. +// Root -> user, or root -> site -> certified requester; only the local log signs responses. #key: "KEY"/_/_/_ #root: {{ ndn_lvs_name(ndnNetwork) }}/#key +// Current NDNCERT names are one user component below the network prefix. +#flat_user: {{ ndn_lvs_name(ndnNetwork) }}/user +#flat_user_key: #flat_user/#key <= #root +#flat_append: {{ ndn_lvs_name(default_prefix + '/ndnd/merkle') }}/"32=append"/#flat_user/_ <= #flat_user_key {% for host, values in hostvars.items() %} {% set site_id = loop.index %} #site_{{ site_id }}: {{ ndn_lvs_name(values.default_prefix) }}/#key <= #root +#flat_user_key: #flat_user/#key <= #site_{{ site_id }} {% for depth in range(1, 6) %} {% set id = site_id ~ '_' ~ depth %} #user_{{ id }}: {{ ndn_lvs_name(values.default_prefix) }}{% for n in range(depth) %}/user{{ n }}{% endfor %} diff --git a/templates/ndnd-repo/management-schema.lvs.j2 b/templates/ndnd-repo/management-schema.lvs.j2 index 54fa298..914a96c 100644 --- a/templates/ndnd-repo/management-schema.lvs.j2 +++ b/templates/ndnd-repo/management-schema.lvs.j2 @@ -1,9 +1,15 @@ -// Root -> site -> user/repo. The configured full root names pin trust anchors. +// Root -> user, or root -> site -> user/repo. The configured full root names pin trust anchors. #key: "KEY"/_/_/_ #root: {{ ndn_lvs_name(ndnNetwork) }}/#key +// Current NDNCERT names are one user component below the network prefix. +#flat_user: {{ ndn_lvs_name(ndnNetwork) }}/user +#flat_user_key: #flat_user/#key <= #root +#flat_command: #flat_user/"32=repo" <= #flat_user_key +#flat_security: #flat_user/"32=repo-security" <= #flat_user_key {% for host, values in hostvars.items() %} {% set site_id = loop.index %} #site_{{ site_id }}: {{ ndn_lvs_name(values.default_prefix) }}/#key <= #root +#flat_user_key: #flat_user/#key <= #site_{{ site_id }} // NDNCERT allows up to five identity components below the site prefix. {% for depth in range(1, 6) %} {% set id = site_id ~ '_' ~ depth %}