Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Normalize path #405

Merged
merged 4 commits into from
Dec 22, 2023
Merged

Normalize path #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
16c4f91
normalize path
Ferdudas97 Dec 22, 2023
e883a8e
only merge
Ferdudas97 Dec 22, 2023
efd92f8
Revert "block some status endpoints (#403)"
Ferdudas97 Dec 22, 2023
d7927cb
Merge remote-tracking branch 'origin/master' into normalize_path
Ferdudas97 Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...e/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/SnapshotProperties.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@ class AdminRouteProperties {
class StatusRouteProperties {
var enabled = false
var endpoints: MutableList<EndpointMatch> = mutableListOf()
var blockedStatusEndpoints: MutableList<EndpointMatch> = mutableListOf()
var createVirtualCluster = false
}

Expand Down
1 change: 0 additions & 1 deletion ...vicemesh/envoycontrol/snapshot/resource/listeners/filters/HttpConnectionManagerFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ class HttpConnectionManagerFactory(
.setUseRemoteAddress(BoolValue.newBuilder().setValue(listenersConfig.useRemoteAddress).build())
.setDelayedCloseTimeout(Duration.newBuilder().setSeconds(0).build())
.setCommonHttpProtocolOptions(httpProtocolOptions)
.setNormalizePath(BoolValue.newBuilder().setValue(true).build())
.setMergeSlashes(true)
.setCodecType(HttpConnectionManager.CodecType.AUTO)
.setHttpProtocolOptions(ingressHttp1ProtocolOptions(group.serviceName))
Expand Down
16 changes: 2 additions & 14 deletions ...ro/tech/servicemesh/envoycontrol/snapshot/resource/listeners/filters/RBACFilterFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,22 +275,13 @@ class RBACFilterFactory(

private fun createStatusRoutePolicy(statusRouteProperties: StatusRouteProperties): Map<String, Policy.Builder> {
return if (statusRouteProperties.enabled) {
val notRules = statusRouteProperties.blockedStatusEndpoints.map {
rBACFilterPermissions.createPathPermission(
path = it.path,
matchingType = it.matchingType
).build()
}
val permissions = statusRouteProperties.endpoints
.map {
val permission = rBACFilterPermissions.createPathPermission(
rBACFilterPermissions.createPathPermission(
path = it.path,
matchingType = it.matchingType
)
notRules.forEach { permission.setNotRule(it) }
permission.build()
).build()
}

val policy = Policy.newBuilder()
.addPrincipals(anyPrincipal)
.addPermissions(anyOf(permissions))
Expand Down Expand Up @@ -377,18 +368,15 @@ class RBACFilterFactory(
principal
)
)

OAuth.Policy.STRICT -> mergePrincipals(
listOf(
strictPolicyPrincipal,
principal
)
)

OAuth.Policy.ALLOW_MISSING_OR_FAILED -> {
principal
}

null -> {
principal
}
Expand Down
Loading