2020-10-08 15:52:09 +00:00
|
|
|
{{#if (gt @lines.length 0)}}
|
|
|
|
|
<svg
|
|
|
|
|
{{did-insert this.getIconPositions}}
|
|
|
|
|
{{did-update this.getIconPositions @lines}}
|
|
|
|
|
viewBox={{concat @view.x ' ' @view.y ' ' @view.width ' ' @view.height}}
|
|
|
|
|
preserveAspectRatio="none"
|
|
|
|
|
>
|
|
|
|
|
<defs>
|
2021-01-05 10:05:59 +00:00
|
|
|
<marker
|
|
|
|
|
id={{concat this.guid '-allow-dot'}}
|
|
|
|
|
class="allow-dot"
|
|
|
|
|
viewBox="-2 -2 15 15"
|
|
|
|
|
refX="6"
|
|
|
|
|
refY="6"
|
|
|
|
|
markerWidth="6"
|
|
|
|
|
markerHeight="6"
|
|
|
|
|
>
|
2020-10-08 15:52:09 +00:00
|
|
|
<circle
|
|
|
|
|
cx="6"
|
|
|
|
|
cy="6"
|
|
|
|
|
r="6"
|
|
|
|
|
/>
|
|
|
|
|
</marker>
|
2021-01-05 10:05:59 +00:00
|
|
|
<marker
|
|
|
|
|
id={{concat this.guid '-allow-arrow'}}
|
|
|
|
|
class="allow-arrow"
|
|
|
|
|
viewBox="-1 -1 12 12"
|
|
|
|
|
refX="5"
|
|
|
|
|
refY="5"
|
|
|
|
|
markerWidth="6" markerHeight="6"
|
|
|
|
|
orient="auto-start-reverse"
|
|
|
|
|
>
|
2020-10-08 15:52:09 +00:00
|
|
|
<polygon points="0 0 10 5 0 10" />
|
|
|
|
|
</marker>
|
2021-01-05 10:05:59 +00:00
|
|
|
<marker
|
|
|
|
|
id={{concat this.guid '-deny-dot'}}
|
|
|
|
|
class="deny-dot"
|
|
|
|
|
viewBox="-2 -2 15 15"
|
|
|
|
|
refX="6"
|
|
|
|
|
refY="6"
|
|
|
|
|
markerWidth="6"
|
|
|
|
|
markerHeight="6"
|
|
|
|
|
>
|
2020-10-08 15:52:09 +00:00
|
|
|
<circle
|
|
|
|
|
cx="6"
|
|
|
|
|
cy="6"
|
|
|
|
|
r="6"
|
|
|
|
|
/>
|
|
|
|
|
</marker>
|
2021-01-05 10:05:59 +00:00
|
|
|
<marker
|
|
|
|
|
id={{concat this.guid '-deny-arrow'}}
|
|
|
|
|
class="deny-arrow"
|
|
|
|
|
viewBox="-1 -1 12 12"
|
|
|
|
|
refX="5"
|
|
|
|
|
refY="5"
|
|
|
|
|
markerWidth="6"
|
|
|
|
|
markerHeight="6"
|
|
|
|
|
orient="auto-start-reverse"
|
|
|
|
|
>
|
2020-10-08 15:52:09 +00:00
|
|
|
<polygon points="0 0 10 5 0 10" />
|
|
|
|
|
</marker>
|
|
|
|
|
</defs>
|
|
|
|
|
{{#each @lines as |line|}}
|
|
|
|
|
{{#if (eq line.permission 'deny')}}
|
|
|
|
|
<path
|
2021-01-05 10:05:59 +00:00
|
|
|
id={{concat this.guid line.id}}
|
2020-10-08 15:52:09 +00:00
|
|
|
d={{svg-curve line.dest src=line.src}}
|
2021-01-05 10:05:59 +00:00
|
|
|
marker-start={{concat 'url(#' this.guid '-deny-dot)'}}
|
|
|
|
|
marker-end={{concat 'url(#' this.guid '-deny-arrow)'}}
|
2020-10-08 15:52:09 +00:00
|
|
|
data-permission={{line.permission}}
|
|
|
|
|
/>
|
|
|
|
|
{{else}}
|
|
|
|
|
<path
|
2021-01-05 10:05:59 +00:00
|
|
|
id={{concat this.guid line.id}}
|
2020-10-08 15:52:09 +00:00
|
|
|
d={{svg-curve line.dest src=line.src}}
|
2021-01-05 10:05:59 +00:00
|
|
|
marker-start={{concat 'url(#' this.guid '-allow-dot)'}}
|
|
|
|
|
marker-end={{concat 'url(#' this.guid '-allow-arrow)'}}
|
2020-10-08 15:52:09 +00:00
|
|
|
data-permission={{line.permission}}
|
|
|
|
|
/>
|
|
|
|
|
{{/if}}
|
|
|
|
|
{{/each}}
|
|
|
|
|
</svg>
|
|
|
|
|
{{/if}}
|
|
|
|
|
|
ui: Ensure we check intention service prefix permissions for per service (#11409)
Port of: Ensure we check intention service prefix permissions for per service (#11270)
Previously, when showing some action buttons for 'per service intentions' we used a global 'can I do something with any intention' permission to decide whether to show a certain button or not. If a user has a token that does not have 'global' intention permissions, but does have intention permissions on one or more specific services (for example via service / service_prefix), this meant that we did not show them certain buttons required to create/edit the intentions for this specific service.
This PR adds that extra permissions check so we now check the intentions permissions per service instead of using the 'global' "can I edit intentions" question/request.
**Notes:**
- If a HTML button is `disabled` this means tippy.js doesn't adopt the
popover properly and subsequently hide it from the user, so aswell as
just disabling the button so you can't active the popover, we also don't
even put the popover on the page
- If `ability.item` or `ability.item.Resources` are empty then assume no access
**We don't try to disable service > right hand side intention actions here**
Whether you can create intentions for a service depends on the
_destination_ of the intention you would like to create. For the
topology view going from the LHS to the center, this is straightforwards
as we only need to know the permissions for the central service, as when
you are going from the LHS to the center, the center is the
_destination_.
When going from the center to the RHS the _destination[s]_ are on the
RHS. This means we need to know the permissions for potentially 1000s of
services all in one go in order to know when to show a button or not.
We can't realistically discover the permissions for service > RHS
services as we'd have either make a HTTP request per right hand service,
or potentially make an incredibly large POST request for all the
potentially 1000s of services on the right hand side (more preferable to
1000s of HTTP requests).
Therefore for the moment at least we keep the old functionality (thin client)
for the middle to RHS here. If you do go to click on the button and you
don't have permissions to update the intention you will still not be
able to update it, only you won't know this until you click the button
(at which point you'll get a UI visible 403 error)
Note: We reversed the conditional here between 1.10 and 1.11
So this make 100% sense that the port is different here to 1.11
2021-11-04 12:10:28 +00:00
|
|
|
{{#let (not (can 'update intention for service' item=@service.Service)) as |disabled|}}
|
2020-11-12 15:40:15 +00:00
|
|
|
{{#each @items as |item|}}
|
2021-11-05 17:46:41 +00:00
|
|
|
{{#if (and (not-eq item.Datacenter '') (or (not item.Intention.Allowed) item.Intention.HasPermissions))}}
|
2020-12-02 09:43:34 +00:00
|
|
|
<TopologyMetrics::Popover
|
|
|
|
|
@type={{if item.Intention.HasPermissions 'l7' 'deny'}}
|
2021-01-05 10:05:59 +00:00
|
|
|
@position={{find-by 'id' (concat this.guid item.Namespace item.Name) this.iconPositions}}
|
2020-12-02 09:43:34 +00:00
|
|
|
@item={{item}}
|
ui: Ensure we check intention service prefix permissions for per service (#11409)
Port of: Ensure we check intention service prefix permissions for per service (#11270)
Previously, when showing some action buttons for 'per service intentions' we used a global 'can I do something with any intention' permission to decide whether to show a certain button or not. If a user has a token that does not have 'global' intention permissions, but does have intention permissions on one or more specific services (for example via service / service_prefix), this meant that we did not show them certain buttons required to create/edit the intentions for this specific service.
This PR adds that extra permissions check so we now check the intentions permissions per service instead of using the 'global' "can I edit intentions" question/request.
**Notes:**
- If a HTML button is `disabled` this means tippy.js doesn't adopt the
popover properly and subsequently hide it from the user, so aswell as
just disabling the button so you can't active the popover, we also don't
even put the popover on the page
- If `ability.item` or `ability.item.Resources` are empty then assume no access
**We don't try to disable service > right hand side intention actions here**
Whether you can create intentions for a service depends on the
_destination_ of the intention you would like to create. For the
topology view going from the LHS to the center, this is straightforwards
as we only need to know the permissions for the central service, as when
you are going from the LHS to the center, the center is the
_destination_.
When going from the center to the RHS the _destination[s]_ are on the
RHS. This means we need to know the permissions for potentially 1000s of
services all in one go in order to know when to show a button or not.
We can't realistically discover the permissions for service > RHS
services as we'd have either make a HTTP request per right hand service,
or potentially make an incredibly large POST request for all the
potentially 1000s of services on the right hand side (more preferable to
1000s of HTTP requests).
Therefore for the moment at least we keep the old functionality (thin client)
for the middle to RHS here. If you do go to click on the button and you
don't have permissions to update the intention you will still not be
able to update it, only you won't know this until you click the button
(at which point you'll get a UI visible 403 error)
Note: We reversed the conditional here between 1.10 and 1.11
So this make 100% sense that the port is different here to 1.11
2021-11-04 12:10:28 +00:00
|
|
|
@disabled={{disabled}}
|
2020-12-02 09:43:34 +00:00
|
|
|
@oncreate={{action @oncreate item @service}}
|
|
|
|
|
/>
|
2022-02-16 21:51:54 +00:00
|
|
|
{{else if (and (not-eq item.Datacenter '') item.Intention.Allowed (not item.TransparentProxy) (not item.ConnectNative) (eq item.Source 'specific-intention'))}}
|
2021-04-12 18:57:56 +00:00
|
|
|
<TopologyMetrics::Popover
|
2021-04-14 22:52:41 +00:00
|
|
|
@type='not-defined'
|
2021-04-28 14:31:14 +00:00
|
|
|
@service={{@service}}
|
2021-04-12 18:57:56 +00:00
|
|
|
@position={{find-by 'id' (concat this.guid item.Namespace item.Name) this.iconPositions}}
|
|
|
|
|
@item={{item}}
|
ui: Ensure we check intention service prefix permissions for per service (#11409)
Port of: Ensure we check intention service prefix permissions for per service (#11270)
Previously, when showing some action buttons for 'per service intentions' we used a global 'can I do something with any intention' permission to decide whether to show a certain button or not. If a user has a token that does not have 'global' intention permissions, but does have intention permissions on one or more specific services (for example via service / service_prefix), this meant that we did not show them certain buttons required to create/edit the intentions for this specific service.
This PR adds that extra permissions check so we now check the intentions permissions per service instead of using the 'global' "can I edit intentions" question/request.
**Notes:**
- If a HTML button is `disabled` this means tippy.js doesn't adopt the
popover properly and subsequently hide it from the user, so aswell as
just disabling the button so you can't active the popover, we also don't
even put the popover on the page
- If `ability.item` or `ability.item.Resources` are empty then assume no access
**We don't try to disable service > right hand side intention actions here**
Whether you can create intentions for a service depends on the
_destination_ of the intention you would like to create. For the
topology view going from the LHS to the center, this is straightforwards
as we only need to know the permissions for the central service, as when
you are going from the LHS to the center, the center is the
_destination_.
When going from the center to the RHS the _destination[s]_ are on the
RHS. This means we need to know the permissions for potentially 1000s of
services all in one go in order to know when to show a button or not.
We can't realistically discover the permissions for service > RHS
services as we'd have either make a HTTP request per right hand service,
or potentially make an incredibly large POST request for all the
potentially 1000s of services on the right hand side (more preferable to
1000s of HTTP requests).
Therefore for the moment at least we keep the old functionality (thin client)
for the middle to RHS here. If you do go to click on the button and you
don't have permissions to update the intention you will still not be
able to update it, only you won't know this until you click the button
(at which point you'll get a UI visible 403 error)
Note: We reversed the conditional here between 1.10 and 1.11
So this make 100% sense that the port is different here to 1.11
2021-11-04 12:10:28 +00:00
|
|
|
@disabled={{disabled}}
|
2021-04-12 18:57:56 +00:00
|
|
|
@oncreate={{action @oncreate item @service}}
|
|
|
|
|
/>
|
2020-12-02 09:43:34 +00:00
|
|
|
{{/if}}
|
2020-11-12 15:40:15 +00:00
|
|
|
{{/each}}
|
ui: Ensure we check intention service prefix permissions for per service (#11409)
Port of: Ensure we check intention service prefix permissions for per service (#11270)
Previously, when showing some action buttons for 'per service intentions' we used a global 'can I do something with any intention' permission to decide whether to show a certain button or not. If a user has a token that does not have 'global' intention permissions, but does have intention permissions on one or more specific services (for example via service / service_prefix), this meant that we did not show them certain buttons required to create/edit the intentions for this specific service.
This PR adds that extra permissions check so we now check the intentions permissions per service instead of using the 'global' "can I edit intentions" question/request.
**Notes:**
- If a HTML button is `disabled` this means tippy.js doesn't adopt the
popover properly and subsequently hide it from the user, so aswell as
just disabling the button so you can't active the popover, we also don't
even put the popover on the page
- If `ability.item` or `ability.item.Resources` are empty then assume no access
**We don't try to disable service > right hand side intention actions here**
Whether you can create intentions for a service depends on the
_destination_ of the intention you would like to create. For the
topology view going from the LHS to the center, this is straightforwards
as we only need to know the permissions for the central service, as when
you are going from the LHS to the center, the center is the
_destination_.
When going from the center to the RHS the _destination[s]_ are on the
RHS. This means we need to know the permissions for potentially 1000s of
services all in one go in order to know when to show a button or not.
We can't realistically discover the permissions for service > RHS
services as we'd have either make a HTTP request per right hand service,
or potentially make an incredibly large POST request for all the
potentially 1000s of services on the right hand side (more preferable to
1000s of HTTP requests).
Therefore for the moment at least we keep the old functionality (thin client)
for the middle to RHS here. If you do go to click on the button and you
don't have permissions to update the intention you will still not be
able to update it, only you won't know this until you click the button
(at which point you'll get a UI visible 403 error)
Note: We reversed the conditional here between 1.10 and 1.11
So this make 100% sense that the port is different here to 1.11
2021-11-04 12:10:28 +00:00
|
|
|
{{/let}}
|
2020-10-08 15:52:09 +00:00
|
|
|
|