Restore NoOpAuthHandler and add DoNothingHandler

Author: alinaliBQ

cpp/src/arrow/flight/server_auth.cc

@@ -23,37 +23,50 @@ namespace arrow {
 namespace flight {
 
 ServerAuthHandler::~ServerAuthHandler() {}
-  // -AL- todo: write class read/write auth handler for our mock server.
-  // I think it is needed for stable behavior.
+
 NoOpAuthHandler::~NoOpAuthHandler() {}
 Status NoOpAuthHandler::Authenticate(const ServerCallContext& context,
                                      ServerAuthSender* outgoing,
                                      ServerAuthReader* incoming) {
+  return Status::OK();
+}
+
+Status NoOpAuthHandler::IsValid(const ServerCallContext& context,
+                                const std::string& token, std::string* peer_identity) {
+  *peer_identity = "";
+  return Status::OK();
+}
+
+// -AL- TestServerAuthHandler should be the most similar here.
+DoNothingHandler::~DoNothingHandler() {}
+Status DoNothingHandler::Authenticate(const ServerCallContext& context,
+                                     ServerAuthSender* outgoing,
+                                     ServerAuthReader* incoming) {
     // -AL- If this approach does work, I need to create a new handler to for the mock server.
-    ARROW_LOG(DEBUG) << "NoOpAuthHandler::Authenticate - Reading response from client";
+    ARROW_LOG(DEBUG) << "DoNothingHandler::Authenticate - Reading response from client";
     std::string client_token;
     RETURN_NOT_OK(incoming->Read(&client_token));  // Read client's message
-     ARROW_LOG(DEBUG) << "NoOpAuthHandler::Authenticate - client_token: " << client_token;
+     ARROW_LOG(DEBUG) << "DoNothingHandler::Authenticate - client_token: " << client_token;
 
     // -AL- do not write anything, to match real server like dbt
-// ARROW_LOG(DEBUG) << "NoOpAuthHandler::Authenticate - write response from server";
-//     // Validate token, then write response
-//     RETURN_NOT_OK(outgoing->Write("server-response"));  // Write response!
-
-ARROW_LOG(DEBUG) << "NoOpAuthHandler::Authenticate 1";
-  while (incoming->Read(&client_token).ok()) {
-    // Discard remaining messages
-    ARROW_LOG(DEBUG) << "NoOpAuthHandler::Authenticate - drain messages from client";
-  }
-ARROW_LOG(DEBUG) << "NoOpAuthHandler::Authenticate 2";
+ARROW_LOG(DEBUG) << "DoNothingHandler::Authenticate - write response from server";
+    // Validate token, then write response
+    RETURN_NOT_OK(outgoing->Write("server-response"));  // Write response!
+
+ARROW_LOG(DEBUG) << "DoNothingHandler::Authenticate 1";
+//   while (incoming->Read(&client_token).ok()) {
+//     // Discard remaining messages
+//     ARROW_LOG(DEBUG) << "DoNothingHandler::Authenticate - drain messages from client";
+//   }
+// ARROW_LOG(DEBUG) << "DoNothingHandler::Authenticate 2";
   return Status::OK();
 }
 
-Status NoOpAuthHandler::IsValid(const ServerCallContext& context,
+Status DoNothingHandler::IsValid(const ServerCallContext& context,
                                 const std::string& token, std::string* peer_identity) {
-  ARROW_LOG(DEBUG) << "NoOpAuthHandler::IsValid 1"; // -AL- TEMP                              
+  ARROW_LOG(DEBUG) << "DoNothingHandler::IsValid 1"; // -AL- TEMP                              
   *peer_identity = "";
-  ARROW_LOG(DEBUG) << "NoOpAuthHandler::IsValid 2"; // -AL- TEMP
+  ARROW_LOG(DEBUG) << "DoNothingHandler::IsValid 2"; // -AL- TEMP
   return Status::OK();
 }
 

cpp/src/arrow/flight/server_auth.h

@@ -103,5 +103,16 @@ class ARROW_FLIGHT_EXPORT NoOpAuthHandler : public ServerAuthHandler {
                  std::string* peer_identity) override;
 };
 
+/// \brief An authentication mechanism that does nothing by Alina for mock server
+/// TODO -AL- move to odbc tests later 
+class ARROW_FLIGHT_EXPORT DoNothingHandler : public ServerAuthHandler {
+ public:
+  ~DoNothingHandler() override;
+  Status Authenticate(const ServerCallContext& context, ServerAuthSender* outgoing,
+                      ServerAuthReader* incoming) override;
+  Status IsValid(const ServerCallContext& context, const std::string& token,
+                 std::string* peer_identity) override;
+};
+
 }  // namespace flight
 }  // namespace arrow

cpp/src/arrow/flight/sql/odbc/odbc_impl/flight_sql_auth_method.cc

@@ -74,12 +74,12 @@ class NoOpClientAuthHandler : public ClientAuthHandler {
     RETURN_NOT_OK(outgoing->Write(handshake_msg));
     ARROW_LOG(DEBUG) << "NoOpClientAuthHandler::Authenticate 4"; // -AL- TEMP  
 
-    // // READ the server's response -AL- code from copilot
-    // // -AL- this is where segfault happens, so that's also shown inside grpc.
-    // std::string response;
-    // ARROW_LOG(DEBUG) << "NoOpClientAuthHandler::Authenticate - Reading response from server";
-    // RETURN_NOT_OK(incoming->Read(&response));
-    // ARROW_LOG(DEBUG) << "NoOpClientAuthHandler::Authenticate - Got response: " << response;
+    // READ the server's response -AL- code from copilot
+    // -AL- Authenticate func is where segfault happens, so that's also shown inside grpc.
+    std::string response;
+    ARROW_LOG(DEBUG) << "NoOpClientAuthHandler::Authenticate - Reading response from server";
+    RETURN_NOT_OK(incoming->Read(&response));
+    ARROW_LOG(DEBUG) << "NoOpClientAuthHandler::Authenticate - Got response: " << response;
 
 
     return Status::OK(); // -AL- returning OK without write doesn't resolve the issue.