(svc) catch not found errors when retrieving access policies

uatuko · Aug 7, 2023 · 98e82da · 98e82da
1 parent d0cc84a
commit 98e82da
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/src/svc/access.cpp b/src/svc/access.cpp
@@ -112,9 +112,16 @@ grpc::ServerUnaryReactor *Access::RetrievePolicy(
 	gk::v1::AccessPolicy *response) {
 	auto *reactor = context->DefaultReactor();
 
-	// TODO: error handling
-	auto policy = datastore::RetrieveAccessPolicy(request->id());
-	map(policy, response);
+	try {
+		auto policy = datastore::RetrieveAccessPolicy(request->id());
+		map(policy, response);
+	} catch (const err::DatastoreAccessPolicyNotFound &) {
+		reactor->Finish(grpc::Status(grpc::StatusCode::NOT_FOUND, "Policy not found"));
+		return reactor;
+	} catch (...) {
+		reactor->Finish(grpc::Status(grpc::StatusCode::UNAVAILABLE, "Failed to retrieve data"));
+		return reactor;
+	}
 
 	reactor->Finish(grpc::Status::OK);
 	return reactor;

diff --git a/src/svc/access_test.cpp b/src/svc/access_test.cpp
@@ -399,4 +399,19 @@ TEST_F(svc_AccessTest, RetrievePolicy) {
 		google::protobuf::util::MessageToJsonString(response.rules(0).attrs(), &attrs);
 		EXPECT_EQ(policy.rules().cbegin()->attrs, attrs);
 	}
+
+	// Error: policy not found
+	{
+		grpc::CallbackServerContext           ctx;
+		grpc::testing::DefaultReactorTestPeer peer(&ctx);
+		gk::v1::AccessPolicy                  response;
+
+		gk::v1::AccessRetrievePolicyRequest request;
+		request.set_id("id:svc_AccessTest.RetrievePolicy-not_found");
+
+		auto reactor = svc.RetrievePolicy(&ctx, &request, &response);
+		EXPECT_TRUE(peer.test_status_set());
+		EXPECT_EQ(grpc::StatusCode::NOT_FOUND, peer.test_status().error_code());
+		EXPECT_EQ("Policy not found", peer.test_status().error_message());
+	}
 }