Skip to content

Commit 8f66328

Browse files
authored
dan/per-12465-upgrade-pdp-websockets-to-v15 (permitio#276)
* Changed OPAL to 0.8.1rc1 * Updated Makefile * Removed scripts directory * Fixed clippy issues * Upgrade opal-common and opal-client to version 0.8.1
1 parent cfcebf4 commit 8f66328

37 files changed

+115
-365
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: help build prepare
1+
.PHONY: help build prepare build-amd64 build-arm64
22

33
.DEFAULT_GOAL := help
44

pdp-server/src/api/authn_middleware.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ pub(super) async fn authentication_middleware(
3333
header_str[7..].to_string()
3434
}
3535
Ok(header_str) => {
36-
warn!(
37-
"Invalid Authorization header format, missing 'Bearer ' prefix: {}",
38-
header_str
39-
);
36+
warn!("Invalid Authorization header format, missing 'Bearer ' prefix: {header_str}");
4037
return Response::builder()
4138
.status(StatusCode::FORBIDDEN)
4239
.body(
@@ -46,7 +43,7 @@ pub(super) async fn authentication_middleware(
4643
.expect("Failed to create response");
4744
}
4845
Err(e) => {
49-
warn!("Failed to parse Authorization header to string: {}", e);
46+
warn!("Failed to parse Authorization header to string: {e}");
5047
return Response::builder()
5148
.status(StatusCode::FORBIDDEN)
5249
.body(

pdp-server/src/api/authz/allowed.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pub(super) async fn allowed_handler(
3636
match query_allowed_cached(&state, &query, &cache_control).await {
3737
Ok(result) => (StatusCode::OK, Json(result)).into_response(),
3838
Err(err) => {
39-
log::error!("Failed to send request to OPA: {}", err);
39+
log::error!("Failed to send request to OPA: {err}");
4040
ApiError::from(err).into_response()
4141
}
4242
}

pdp-server/src/api/authz/allowed_bulk.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pub(super) async fn allowed_bulk_handler(
3636
match query_allowed_bulk_cached(&state, &queries, &cache_control).await {
3737
Ok(result) => (StatusCode::OK, Json(result)).into_response(),
3838
Err(err) => {
39-
log::error!("Failed to send request to OPA: {}", err);
39+
log::error!("Failed to send request to OPA: {err}");
4040
ApiError::from(err).into_response()
4141
}
4242
}

pdp-server/src/api/authz/authorized_users.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ pub(super) async fn authorized_users_handler(
3939
match query_authorized_users_cached(&state, &query, &cache_control).await {
4040
Ok(result) => (StatusCode::OK, Json(result)).into_response(),
4141
Err(err) => {
42-
log::error!("Failed to send request to OPA: {}", err);
42+
log::error!("Failed to send request to OPA: {err}");
4343
ApiError::from(err).into_response()
4444
}
4545
}

pdp-server/src/api/authz/user_permissions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ pub(super) async fn user_permissions_handler(
5656
let permissions = match query_user_permissions_cached(&state, &query, &cache_control).await {
5757
Ok(permissions) => permissions,
5858
Err(err) => {
59-
log::error!("Failed to send request to OPA: {}", err);
59+
log::error!("Failed to send request to OPA: {err}");
6060
return ApiError::from(err).into_response();
6161
}
6262
};

pdp-server/src/api/authzen/errors.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ impl From<crate::errors::ApiError> for AuthZenError {
8888
StatusCode::FORBIDDEN => AuthZenError::forbidden("Access denied"),
8989
StatusCode::BAD_REQUEST => AuthZenError::invalid_request(err.detail),
9090
_ => {
91-
log::error!("Internal error converted to AuthZen format: {:?}", err);
91+
log::error!("Internal error converted to AuthZen format: {err:?}");
9292
AuthZenError::internal_error("Internal server error")
9393
}
9494
}
@@ -98,7 +98,7 @@ impl From<crate::errors::ApiError> for AuthZenError {
9898
/// Convert OPA forwarding errors to AuthZen format
9999
impl From<crate::opa_client::ForwardingError> for AuthZenError {
100100
fn from(err: crate::opa_client::ForwardingError) -> Self {
101-
log::error!("OPA forwarding error: {:?}", err);
101+
log::error!("OPA forwarding error: {err:?}");
102102
// Use generic message to avoid leaking internal implementation details
103103
AuthZenError::internal_error("Internal server error")
104104
}

pdp-server/src/api/authzen/evaluation.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ pub async fn access_evaluation_handler(
108108
(StatusCode::OK, Json(authzen_response)).into_response()
109109
}
110110
Err(err) => {
111-
log::error!("Failed to process AuthZen request: {}", err);
111+
log::error!("Failed to process AuthZen request: {err}");
112112
let authzen_error = AuthZenError::from(err);
113113
authzen_error.into_response()
114114
}
@@ -700,13 +700,11 @@ mod tests {
700700
// Verify it's a plain string, not JSON
701701
assert!(
702702
!error_response_text.starts_with("{"),
703-
"AuthZen errors must be plain strings per spec section 12.1.11, got: {}",
704-
error_response_text
703+
"AuthZen errors must be plain strings per spec section 12.1.11, got: {error_response_text}"
705704
);
706705
assert!(
707706
!error_response_text.contains("\"error\""),
708-
"AuthZen errors must not be structured JSON, got: {}",
709-
error_response_text
707+
"AuthZen errors must not be structured JSON, got: {error_response_text}"
710708
);
711709

712710
// The error message should be our generic internal server error message

pdp-server/src/api/authzen/evaluations.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ pub async fn access_evaluations_handler(
215215
}
216216

217217
error_msg.push_str("\nPlease provide all required fields (subject, resource, action) either in individual evaluations or at the request level.");
218-
log::warn!("{}", error_msg);
218+
log::warn!("{error_msg}");
219219
let authzen_error = AuthZenError::invalid_request(&error_msg);
220220
return authzen_error.into_response();
221221
}
@@ -234,7 +234,7 @@ pub async fn access_evaluations_handler(
234234
(StatusCode::OK, Json(response)).into_response()
235235
}
236236
Err(err) => {
237-
log::error!("Failed to process AuthZen evaluations request: {:?}", err);
237+
log::error!("Failed to process AuthZen evaluations request: {err:?}");
238238
let authzen_error = AuthZenError::from(err);
239239
authzen_error.into_response()
240240
}

pdp-server/src/api/authzen/metadata.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ pub async fn authzen_metadata_handler(request: Request<Body>) -> Response {
4747
.or_else(|| uri_parts.authority.as_ref().map(|auth| auth.to_string()))
4848
.unwrap_or_else(|| "localhost:7766".to_string());
4949

50-
let base_url = format!("{}://{}", scheme, authority);
50+
let base_url = format!("{scheme}://{authority}");
5151

5252
let metadata = AuthZenMetadataResponse {
5353
policy_decision_point: base_url.clone(),
54-
access_evaluation_endpoint: format!("{}/access/v1/evaluation", base_url),
55-
access_evaluations_endpoint: format!("{}/access/v1/evaluations", base_url),
56-
search_subject_endpoint: format!("{}/access/v1/search/subject", base_url),
57-
search_resource_endpoint: format!("{}/access/v1/search/resource", base_url),
58-
search_action_endpoint: format!("{}/access/v1/search/action", base_url),
54+
access_evaluation_endpoint: format!("{base_url}/access/v1/evaluation"),
55+
access_evaluations_endpoint: format!("{base_url}/access/v1/evaluations"),
56+
search_subject_endpoint: format!("{base_url}/access/v1/search/subject"),
57+
search_resource_endpoint: format!("{base_url}/access/v1/search/resource"),
58+
search_action_endpoint: format!("{base_url}/access/v1/search/action"),
5959
};
6060
(StatusCode::OK, Json(metadata)).into_response()
6161
}
@@ -140,23 +140,23 @@ mod tests {
140140
assert_eq!(metadata.policy_decision_point, expected_base);
141141
assert_eq!(
142142
metadata.access_evaluation_endpoint,
143-
format!("{}/access/v1/evaluation", expected_base)
143+
format!("{expected_base}/access/v1/evaluation")
144144
);
145145
assert_eq!(
146146
metadata.access_evaluations_endpoint,
147-
format!("{}/access/v1/evaluations", expected_base)
147+
format!("{expected_base}/access/v1/evaluations")
148148
);
149149
assert_eq!(
150150
metadata.search_subject_endpoint,
151-
format!("{}/access/v1/search/subject", expected_base)
151+
format!("{expected_base}/access/v1/search/subject")
152152
);
153153
assert_eq!(
154154
metadata.search_action_endpoint,
155-
format!("{}/access/v1/search/action", expected_base)
155+
format!("{expected_base}/access/v1/search/action")
156156
);
157157
assert_eq!(
158158
metadata.search_resource_endpoint,
159-
format!("{}/access/v1/search/resource", expected_base)
159+
format!("{expected_base}/access/v1/search/resource")
160160
);
161161
}
162162
}

0 commit comments

Comments
 (0)