change policy id to json form in RBACFilterFactory

allegro · Dec 13, 2024 · 5ddee5a · 5ddee5a
1 parent 866410f
commit 5ddee5a
Show file tree

Hide file tree

Showing 4 changed files with 219 additions and 193 deletions.
diff --git a/...trol-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/groups/NodeMetadata.kt b/...trol-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/groups/NodeMetadata.kt
@@ -1,5 +1,7 @@
 package pl.allegro.tech.servicemesh.envoycontrol.groups
 
+import com.fasterxml.jackson.core.JsonParser
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.google.protobuf.Duration
 import com.google.protobuf.Struct
 import com.google.protobuf.Value
@@ -810,6 +812,12 @@ data class IncomingEndpoint(
     val oauth: OAuth? = null
 ) : EndpointBase
 
+val mapper = jacksonObjectMapper()
+
+fun IncomingEndpoint.toJson(): String {
+    val jsonString = mapper.writeValueAsString(this)
+    return jsonString
+}
 data class IncomingRateLimitEndpoint(
     val path: String,
     val pathMatchingType: PathMatchingType = PathMatchingType.PATH,

diff --git a/...ro/tech/servicemesh/envoycontrol/snapshot/resource/listeners/filters/RBACFilterFactory.kt b/...ro/tech/servicemesh/envoycontrol/snapshot/resource/listeners/filters/RBACFilterFactory.kt
@@ -19,6 +19,7 @@ import pl.allegro.tech.servicemesh.envoycontrol.groups.Incoming
 import pl.allegro.tech.servicemesh.envoycontrol.groups.IncomingEndpoint
 import pl.allegro.tech.servicemesh.envoycontrol.groups.OAuth
 import pl.allegro.tech.servicemesh.envoycontrol.groups.Role
+import pl.allegro.tech.servicemesh.envoycontrol.groups.toJson
 import pl.allegro.tech.servicemesh.envoycontrol.logger
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.Client
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.GlobalSnapshot
@@ -180,13 +181,13 @@ class RBACFilterFactory(
                 it.endpoint.unlistedClientsPolicy == Incoming.UnlistedPolicy.BLOCKANDLOG ||
                     it.endpoint.oauth?.policy != null
             }
-            .map { (endpoint, policy) -> "$endpoint" to policy }.toMap()
+            .map { (endpoint, policy) -> endpoint.toJson() to policy }.toMap()
 
         val loggedEndpointsPolicies = incomingEndpointsPolicies.asSequence()
             .filter {
                 it.endpoint.unlistedClientsPolicy == Incoming.UnlistedPolicy.LOG && it.endpoint.oauth?.policy == null
             }
-            .map { (endpoint, policy) -> "$endpoint" to policy }.toMap()
+            .map { (endpoint, policy) -> endpoint.toJson() to policy }.toMap()
 
         val allowUnlistedPolicies = unlistedAndLoggedEndpointsPolicies(
             incomingPermissions,