Add GetPeerCredentials() to rmi::Gateway

Signed-off-by: Sangwan Kwon <sangwan.kwon@samsung.com>

diff --git a/src/vist/rmi/impl/credentials.hpp b/src/vist/credentials.hpp
similarity index 91%
rename from src/vist/rmi/impl/credentials.hpp
rename to src/vist/credentials.hpp
index f4af021..f1ba0c2 100644 (file)
--- a/src/vist/rmi/impl/credentials.hpp
+++ b/src/vist/credentials.hpp
@@ -22,15 +22,9 @@
 #include <sys/types.h>
 
 namespace vist {
-namespace rmi {
-namespace impl {
 
 struct Credentials {
-       pid_t pid;
-       uid_t uid;
-       gid_t gid;
-
-       static Credentials GetPeers(int fd)
+       static Credentials Peer(int fd)
        {
                struct ucred cred;
                socklen_t credsz = sizeof(cred);
@@ -40,8 +34,10 @@ struct Credentials {
 
                return {cred.pid, cred.uid, cred.gid};
        }
+
+       pid_t pid;
+       uid_t uid;
+       gid_t gid;
 };
 
-} // namespace impl
-} // namespace rmi
 } // namespace vist

diff --git a/src/vist/rmi/gateway.cpp b/src/vist/rmi/gateway.cpp
index f12e42d..5f4bed6 100644 (file)
--- a/src/vist/rmi/gateway.cpp
+++ b/src/vist/rmi/gateway.cpp
@@ -84,5 +84,11 @@ void Gateway::stop(void)
        this->pImpl->stop();
 }
 
+/// Credentials exists per thread.
+std::shared_ptr<Credentials> GetPeerCredentials()
+{
+       return Server::GetPeerCredentials();
+}
+
 } // namespace rmi
 } // namespace vist

diff --git a/src/vist/rmi/gateway.hpp b/src/vist/rmi/gateway.hpp
index d63a816..afc7a1a 100644 (file)
--- a/src/vist/rmi/gateway.hpp
+++ b/src/vist/rmi/gateway.hpp
@@ -18,6 +18,7 @@
 
 #define EXPOSE(gateway, object, function) gateway.expose(object, #function, function)
 
+#include <vist/credentials.hpp>
 #include <vist/klass/functor.hpp>
 #include <vist/macro.hpp>
 
@@ -50,6 +51,8 @@ public:
        template<typename O, typename F>
        void expose(O& object, const std::string& name, F&& func);
 
+       static std::shared_ptr<Credentials> GetPeerCredentials();
+
 private:
        class Impl;
 

diff --git a/src/vist/rmi/impl/server.cpp b/src/vist/rmi/impl/server.cpp
index 76abbd1..53b1633 100644 (file)
--- a/src/vist/rmi/impl/server.cpp
+++ b/src/vist/rmi/impl/server.cpp
@@ -27,6 +27,8 @@ namespace vist {
 namespace rmi {
 namespace impl {
 
+thread_local std::shared_ptr<Credentials> Server::peer = nullptr;
+
 Server::Server(const std::string& path, const Task& task, ServiceType type) : worker(5)
 {
        switch (type) {
@@ -62,6 +64,8 @@ void Server::accept(const Task& task)
                /// process task per thread
                this->worker.submit([this, connection, task]{
                        auto onRead = [connection, task]() {
+                               Server::peer.reset(new Credentials(Credentials::Peer(connection->getFd())));
+
                                Message request = connection->recv();
                                DEBUG(VIST) << "Session header: " << request.signature;
 
@@ -80,8 +84,7 @@ void Server::accept(const Task& task)
                                this->mainloop.removeHandler(connection->getFd());
                        };
 
-                       this->mainloop.addHandler(connection->getFd(),
-                                                                       std::move(onRead), std::move(onClose));
+                       this->mainloop.addHandler(connection->getFd(), std::move(onRead), std::move(onClose));
                });
        };
 

diff --git a/src/vist/rmi/impl/server.hpp b/src/vist/rmi/impl/server.hpp
index 1625bd3..a64e090 100644 (file)
--- a/src/vist/rmi/impl/server.hpp
+++ b/src/vist/rmi/impl/server.hpp
@@ -16,10 +16,11 @@
 
 #pragma once
 
+#include <vist/credentials.hpp>
 #include <vist/rmi/gateway.hpp>
-#include <vist/rmi/message.hpp>
 #include <vist/rmi/impl/mainloop.hpp>
 #include <vist/rmi/impl/socket.hpp>
+#include <vist/rmi/message.hpp>
 #include <vist/thread-pool.hpp>
 
 #include <memory>
@@ -48,9 +49,16 @@ public:
        void run(int timeout = -1, Stopper stopper = nullptr);
        void stop(void);
 
+       static std::shared_ptr<Credentials> GetPeerCredentials()
+       {
+               return peer;
+       }
+
 private:
        void accept(const Task& task);
 
+       static thread_local std::shared_ptr<Credentials> peer;
+
        std::unique_ptr<Socket> socket;
        Mainloop mainloop;
        ThreadPool worker;

diff --git a/src/vist/rmi/impl/tests/server-client.cpp b/src/vist/rmi/impl/tests/server-client.cpp
index a657ed6..2c94b13 100644 (file)
--- a/src/vist/rmi/impl/tests/server-client.cpp
+++ b/src/vist/rmi/impl/tests/server-client.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2019-present Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ std::string response3 = "response argument";
 
 TEST(ServerClientTests, not_ondemand)
 {
-       std::string sockPath = "./vist-test.sock";
+       std::string sockPath = "@vist-test.sock";
 
        auto task = [&](Message& message) -> Message {
                EXPECT_EQ(message.signature, requestSignature);
@@ -97,3 +97,50 @@ TEST(ServerClientTests, not_ondemand)
        if (serverThread.joinable())
                serverThread.join();
 }
+
+TEST(ServerClientTests, peer_pid)
+{
+       std::string sockPath = "@vist-test.sock";
+       auto task = [](Message& message) -> Message {
+               EXPECT_EQ(message.signature, requestSignature);
+
+               auto peer = Server::GetPeerCredentials();
+               EXPECT_TRUE(peer != nullptr);
+
+               int recv1;
+               message.disclose(recv1);
+               EXPECT_EQ(request1, recv1);
+
+               Message reply(Message::Type::Reply, responseSignature);
+               reply.enclose(response1);
+               return reply;
+       };
+
+       Server server(sockPath, task);
+       auto serverThread = std::thread([&]() {
+               server.run();
+       });
+
+       { /// Client configuration
+               auto clientClosure = [&]() {
+                       Client client(sockPath);
+
+                       Message message(Message::Type::MethodCall, requestSignature);
+                       message.enclose(request1);
+
+                       auto reply = client.request(message);
+                       EXPECT_EQ(reply.signature, responseSignature);
+
+                       int recv1;
+                       reply.disclose(recv1);
+                       EXPECT_EQ(response1, recv1);
+               };
+
+               clientClosure();
+       }
+
+       server.stop();
+
+       if (serverThread.joinable())
+               serverThread.join();
+}

diff --git a/src/vist/rmi/impl/tests/socket.cpp b/src/vist/rmi/impl/tests/socket.cpp
index 85d4e25..54f8e8d 100644 (file)
--- a/src/vist/rmi/impl/tests/socket.cpp
+++ b/src/vist/rmi/impl/tests/socket.cpp
@@ -14,7 +14,7 @@
  *  limitations under the License
  */
 
-#include <vist/rmi/impl/credentials.hpp>
+#include <vist/credentials.hpp>
 #include <vist/rmi/impl/socket.hpp>
 
 #include <cstring>
@@ -109,7 +109,7 @@ TEST(SocketTests, peer_credeintials)
 
        Socket accepted = socket.accept();
 
-       auto cred = Credentials::GetPeers(accepted.getFd());
+       auto cred = vist::Credentials::Peer(accepted.getFd());
        EXPECT_TRUE(cred.pid > 0);
 
        // Recv input from client.

diff --git a/src/vist/rmi/tests/rmi.cpp b/src/vist/rmi/tests/rmi.cpp
index d39fb46..b0d2fc9 100644 (file)
--- a/src/vist/rmi/tests/rmi.cpp
+++ b/src/vist/rmi/tests/rmi.cpp
@@ -36,6 +36,9 @@ struct Foo {
 
        std::string getName(void)
        {
+               auto peer = Gateway::GetPeerCredentials();
+               EXPECT_TRUE(peer != nullptr);
+
                return this->name;
        }