Skip to content

Commit 1fcb5f9

Browse files
awgnawgn
committed
Cargo fmt.
Signed-off-by: Nicola Bonelli <nicola.bonelli@huawei-partners.com>
1 parent a5af520 commit 1fcb5f9

File tree

4 files changed

+55
-25
lines changed

4 files changed

+55
-25
lines changed

‎orion-configuration/src/config/network_filters/http_connection_manager/http_filters/http_rbac.rs‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,10 @@ impl HttpRbac {
8686
Action::Deny => enforced_policy.is_none(),
8787
};
8888

89-
debug!("HttpRbac: rule is enforced by {enforced_policy:?} with action: {:?} -> permitted {permitted}", self.action);
89+
debug!(
90+
"HttpRbac: rule is enforced by {enforced_policy:?} with action: {:?} -> permitted {permitted}",
91+
self.action
92+
);
9093
(permitted, enforced_policy)
9194
}
9295
}
@@ -118,7 +121,8 @@ mod rbac_tests {
118121
let permission = Permission::Any;
119122
let principal = Principal::Any;
120123
let policy = Policy { permissions: vec![permission], principals: vec![principal] };
121-
let rbac_rule = HttpRbac { action: Action::Allow, policies: vec![("my-id".into(), policy)].into_iter().collect() };
124+
let rbac_rule =
125+
HttpRbac { action: Action::Allow, policies: vec![("my-id".into(), policy)].into_iter().collect() };
122126
let (permitted, rule) = rbac_rule.is_permitted(&create_host_request("blah.com"));
123127
assert!(permitted);
124128
assert_eq!(rule, Some("my-id".into()));
@@ -129,7 +133,8 @@ mod rbac_tests {
129133
let permission = Permission::Header(create_host_matcher(host));
130134
let principal = Principal::Any;
131135
let policy = Policy { permissions: vec![permission], principals: vec![principal] };
132-
let rbac_rule = HttpRbac { action: Action::Allow, policies: vec![("my-id".into(), policy)].into_iter().collect() };
136+
let rbac_rule =
137+
HttpRbac { action: Action::Allow, policies: vec![("my-id".into(), policy)].into_iter().collect() };
133138
let (permitted, rule) = rbac_rule.is_permitted(&create_host_request(host));
134139
assert!(permitted);
135140
assert_eq!(rule, Some("my-id".into()));
@@ -142,7 +147,8 @@ mod rbac_tests {
142147
let permission2 = Permission::Any;
143148
let principal = Principal::Any;
144149
let policy = Policy { permissions: vec![permission1, permission2], principals: vec![principal] };
145-
let rbac_rule = HttpRbac { action: Action::Allow, policies: vec![("my-id".into(), policy)].into_iter().collect() };
150+
let rbac_rule =
151+
HttpRbac { action: Action::Allow, policies: vec![("my-id".into(), policy)].into_iter().collect() };
146152
let (permitted, rule) = rbac_rule.is_permitted(&create_host_request(host));
147153
assert!(permitted);
148154
assert_eq!(rule, Some("my-id".into()));
@@ -154,7 +160,8 @@ mod rbac_tests {
154160
let permission = Permission::Header(create_host_matcher(host));
155161
let principal = Principal::Header(create_host_matcher(host));
156162
let policy = Policy { permissions: vec![permission], principals: vec![principal] };
157-
let rbac_rule = HttpRbac { action: Action::Allow, policies: vec![("my-id".into(), policy)].into_iter().collect() };
163+
let rbac_rule =
164+
HttpRbac { action: Action::Allow, policies: vec![("my-id".into(), policy)].into_iter().collect() };
158165
let (permitted, rule) = rbac_rule.is_permitted(&create_host_request(host));
159166
assert!(permitted);
160167
assert_eq!(rule, Some("my-id".into()));
@@ -166,7 +173,8 @@ mod rbac_tests {
166173
let permission = Permission::Any;
167174
let principal = Principal::Any;
168175
let policy = Policy { permissions: vec![permission], principals: vec![principal] };
169-
let rbac_rule = HttpRbac { action: Action::Deny, policies: vec![("my-id".into(), policy)].into_iter().collect() };
176+
let rbac_rule =
177+
HttpRbac { action: Action::Deny, policies: vec![("my-id".into(), policy)].into_iter().collect() };
170178
let (permitted, rule) = rbac_rule.is_permitted(&create_host_request(host));
171179
assert!(!permitted);
172180
assert_eq!(rule, Some("my-id".into()));
@@ -178,7 +186,8 @@ mod rbac_tests {
178186
let permission = Permission::Header(create_host_matcher(host));
179187
let principal = Principal::Any;
180188
let policy = Policy { permissions: vec![permission], principals: vec![principal] };
181-
let rbac_rule = HttpRbac { action: Action::Deny, policies: vec![("my-id".into(), policy)].into_iter().collect() };
189+
let rbac_rule =
190+
HttpRbac { action: Action::Deny, policies: vec![("my-id".into(), policy)].into_iter().collect() };
182191
let (permitted, rule) = rbac_rule.is_permitted(&create_host_request(host));
183192
assert!(!permitted);
184193
assert_eq!(rule, Some("my-id".into()));
@@ -190,7 +199,8 @@ mod rbac_tests {
190199
let permission = Permission::Header(create_host_matcher(host));
191200
let principal = Principal::Header(create_host_matcher(host));
192201
let policy = Policy { permissions: vec![permission], principals: vec![principal] };
193-
let rbac_rule = HttpRbac { action: Action::Deny, policies: vec![("my-id".into(), policy)].into_iter().collect() };
202+
let rbac_rule =
203+
HttpRbac { action: Action::Deny, policies: vec![("my-id".into(), policy)].into_iter().collect() };
194204
let (permitted, rule) = rbac_rule.is_permitted(&create_host_request(host));
195205
assert!(!permitted);
196206
assert_eq!(rule, Some("my-id".into()));

‎orion-configuration/src/config/network_filters/network_rbac.rs‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,10 @@ impl NetworkRbac {
112112
Action::Deny => enforced_policy.is_none(),
113113
};
114114

115-
debug!("NetworkRbac: rule is enforced by {enforced_policy:?} with action: {:?} -> permitted {permitted}", self.action);
115+
debug!(
116+
"NetworkRbac: rule is enforced by {enforced_policy:?} with action: {:?} -> permitted {permitted}",
117+
self.action
118+
);
116119
(permitted, enforced_policy)
117120
}
118121
}
@@ -141,8 +144,10 @@ mod tests {
141144
let permission = Permission::Any;
142145
let principal = Principal::Any;
143146
let policy = Policy { permissions: vec![permission], principals: vec![principal] };
144-
let rbac_rule = NetworkRbac { action: Action::Allow, policies: vec![("my-id".into(), policy)].into_iter().collect() };
145-
let (permitted, rule) = rbac_rule.is_permitted(&create_network_context("127.0.0.1", 8000, "127.0.0.1", 9000, None));
147+
let rbac_rule =
148+
NetworkRbac { action: Action::Allow, policies: vec![("my-id".into(), policy)].into_iter().collect() };
149+
let (permitted, rule) =
150+
rbac_rule.is_permitted(&create_network_context("127.0.0.1", 8000, "127.0.0.1", 9000, None));
146151
assert!(permitted);
147152
assert_eq!(rule, Some("my-id".into()));
148153
}
@@ -151,8 +156,10 @@ mod tests {
151156
let permission = Permission::DestinationIp("127.0.0.0/24".parse().unwrap());
152157
let principal = Principal::Any;
153158
let policy = Policy { permissions: vec![permission], principals: vec![principal] };
154-
let rbac_rule = NetworkRbac { action: Action::Allow, policies: vec![("my-id".into(), policy)].into_iter().collect() };
155-
let (permitted, rule) = rbac_rule.is_permitted(&create_network_context("127.0.0.1", 8000, "127.0.0.1", 9000, None));
159+
let rbac_rule =
160+
NetworkRbac { action: Action::Allow, policies: vec![("my-id".into(), policy)].into_iter().collect() };
161+
let (permitted, rule) =
162+
rbac_rule.is_permitted(&create_network_context("127.0.0.1", 8000, "127.0.0.1", 9000, None));
156163
assert!(permitted);
157164
assert_eq!(rule, Some("my-id".into()));
158165
}
@@ -163,8 +170,10 @@ mod tests {
163170
let permission1 = Permission::Any;
164171
let principal = Principal::Any;
165172
let policy = Policy { permissions: vec![permission1, permission2], principals: vec![principal] };
166-
let rbac_rule = NetworkRbac { action: Action::Allow, policies: vec![("my-id".into(),policy)].into_iter().collect() };
167-
let (permitted, rule) = rbac_rule.is_permitted(&create_network_context("127.0.0.1", 8000, "127.0.0.1", 9000, None));
173+
let rbac_rule =
174+
NetworkRbac { action: Action::Allow, policies: vec![("my-id".into(), policy)].into_iter().collect() };
175+
let (permitted, rule) =
176+
rbac_rule.is_permitted(&create_network_context("127.0.0.1", 8000, "127.0.0.1", 9000, None));
168177
assert!(permitted);
169178
assert_eq!(rule, Some("my-id".into()));
170179
}
@@ -175,8 +184,10 @@ mod tests {
175184
let permission1 = Permission::Any;
176185
let principal = Principal::Any;
177186
let policy = Policy { permissions: vec![permission1, permission2], principals: vec![principal] };
178-
let rbac_rule = NetworkRbac { action: Action::Allow, policies: vec![("my-id".into(),policy)].into_iter().collect() };
179-
let (permitted, rule) = rbac_rule.is_permitted(&create_network_context("127.0.0.1", 8000, "127.0.0.1", 9000, None));
187+
let rbac_rule =
188+
NetworkRbac { action: Action::Allow, policies: vec![("my-id".into(), policy)].into_iter().collect() };
189+
let (permitted, rule) =
190+
rbac_rule.is_permitted(&create_network_context("127.0.0.1", 8000, "127.0.0.1", 9000, None));
180191
assert!(permitted);
181192
assert_eq!(rule, Some("my-id".into()));
182193
}
@@ -186,8 +197,10 @@ mod tests {
186197
let permission = Permission::DestinationIp("127.0.0.0/24".parse().unwrap());
187198
let principal = Principal::DownstreamRemoteIp("127.0.0.0/24".parse().unwrap());
188199
let policy = Policy { permissions: vec![permission], principals: vec![principal] };
189-
let rbac_rule = NetworkRbac { action: Action::Allow, policies: vec![("my-id".into(),policy)].into_iter().collect() };
190-
let (permitted, rule) = rbac_rule.is_permitted(&create_network_context("127.0.0.1", 8000, "127.0.0.1", 9000, None));
200+
let rbac_rule =
201+
NetworkRbac { action: Action::Allow, policies: vec![("my-id".into(), policy)].into_iter().collect() };
202+
let (permitted, rule) =
203+
rbac_rule.is_permitted(&create_network_context("127.0.0.1", 8000, "127.0.0.1", 9000, None));
191204
assert!(permitted);
192205
assert_eq!(rule, Some("my-id".into()));
193206
}

‎orion-lib/src/event_error.rs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
//
1616
//
1717

18+
use compact_str::CompactString;
1819
use http::Response;
1920
use orion_format::types::ResponseFlags as FmtResponseFlags;
2021
use orion_interner::StringInterner;
2122
use std::error::Error as ErrorTrait;
22-
use compact_str::CompactString;
2323
use std::io;
2424
use tokio::time::error::Elapsed;
2525

@@ -63,7 +63,7 @@ pub enum EventKind {
6363

6464
impl EventKind {
6565
pub fn code_details(&self) -> Option<ResponseCodeDetails> {
66-
match self {
66+
match self {
6767
EventKind::Error(err) => match err {
6868
EventError::IoError(err) => Some(ResponseCodeDetails::from(err)),
6969
EventError::ConnectTimeout(_) => Some(ResponseCodeDetails("connect_timeout")),
@@ -81,7 +81,9 @@ impl EventKind {
8181
EventKind::NoHealthyUpstream => Some(ResponseCodeDetails("no_healthy_upstream")),
8282
EventKind::RouteNotFound => Some(ResponseCodeDetails("route_not_found")),
8383
EventKind::UpgradeFailed => Some(ResponseCodeDetails("upgrade_failed")),
84-
EventKind::RbacAccessDenied(id) => Some(ResponseCodeDetails(format!("rbac_access_denied[{id}]").to_static_str())),
84+
EventKind::RbacAccessDenied(id) => {
85+
Some(ResponseCodeDetails(format!("rbac_access_denied[{id}]").to_static_str()))
86+
},
8587
EventKind::RateLimited => Some(ResponseCodeDetails("rate_limited")),
8688
EventKind::ViaUpstream => Some(ResponseCodeDetails("via_upstream")),
8789
}
@@ -95,7 +97,9 @@ impl EventKind {
9597
EventError::RouteTimeout => Some(ConnectionTerminationDetails("route timeout was reached")),
9698
_ => None,
9799
},
98-
EventKind::RbacAccessDenied(id) => Some(ConnectionTerminationDetails(format!("rbac_access_denied_matched_policy[{id}]").to_static_str())),
100+
EventKind::RbacAccessDenied(id) => {
101+
Some(ConnectionTerminationDetails(format!("rbac_access_denied_matched_policy[{id}]").to_static_str()))
102+
},
99103
_ => None,
100104
}
101105
}

‎orion-lib/src/listeners/http_connection_manager.rs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,8 +1159,11 @@ fn apply_authorization_rules<B>(rbac: &HttpRbac, req: &Request<B>) -> FilterDeci
11591159
FilterDecision::Continue
11601160
} else {
11611161
FilterDecision::DirectResponse(
1162-
SyntheticHttpResponse::forbidden(EventKind::RbacAccessDenied(enforced_policy.unwrap_or(CompactString::new("unknown"))), "RBAC: access denied")
1163-
.into_response(req.version()),
1162+
SyntheticHttpResponse::forbidden(
1163+
EventKind::RbacAccessDenied(enforced_policy.unwrap_or(CompactString::new("unknown"))),
1164+
"RBAC: access denied",
1165+
)
1166+
.into_response(req.version()),
11641167
)
11651168
}
11661169
}

0 commit comments

Comments
 (0)