support ssl

wuzhuqingfeng · Jun 8, 2020 · 311d5ec · 311d5ec
1 parent 2594175
commit 311d5ec
Show file tree

Hide file tree

Showing 10 changed files with 420 additions and 63 deletions.
diff --git a/examples/client/CMakeLists.txt b/examples/client/CMakeLists.txt
@@ -3,11 +3,23 @@ project(basic_client)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -std=c++11")
 
+SET(ENABLE_SSL ON)
+
+if (ENABLE_SSL)
+	add_definitions(-DCINATRA_ENABLE_SSL)
+	message(STATUS "Use SSL")
+endif()
+
 find_package(Boost COMPONENTS system REQUIRED)
 include_directories(
         "../../include"
         "../../third/msgpack/include"
 )
 
 add_executable(basic_client main.cpp)
-target_link_libraries(basic_client ${Boost_LIBRARIES})
+
+if (ENABLE_SSL)
+	target_link_libraries(basic_client ${Boost_LIBRARIES} -lssl -lcrypto -lpthread)
+else()
+	target_link_libraries(basic_client ${Boost_LIBRARIES})
+endif()
diff --git a/examples/client/basic_client.vcxproj b/examples/client/basic_client.vcxproj
@@ -97,6 +97,7 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -123,6 +124,7 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

diff --git a/examples/client/main.cpp b/examples/client/main.cpp
@@ -549,6 +549,58 @@ void test_threads() {
 	std::cin >> str;
 }
 
+void test_ssl() {
+    bool is_ssl = true;
+    rpc_client client;
+    client.set_error_callback([](auto ec) {
+        std::cout << ec.message() << "\n";
+    });
+
+#ifdef CINATRA_ENABLE_SSL
+    client.set_ssl_context_callback([](boost::asio::ssl::context& ctx) {
+        ctx.set_verify_mode(boost::asio::ssl::context::verify_peer);
+        ctx.load_verify_file("server.crt");
+    });
+#endif
+
+    bool r = client.connect("127.0.0.1", 9000, is_ssl);
+    if (!r) {
+        return;
+    }
+
+    for (size_t i = 0; i < 100; i++) {
+        try {
+            auto result = client.call<std::string>("echo", "purecpp");
+            std::cout << result << " sync\n";
+        }
+        catch (const std::exception& e) {
+            std::cout << e.what() << " sync\n";
+        }        
+
+        auto future = client.async_call<CallModel::future>("echo", "purecpp");
+        auto status = future.wait_for(std::chrono::milliseconds(5000));
+        if (status == std::future_status::timeout) {
+            std::cout << "timeout future\n";
+        }
+        else {
+            auto result1 = future.get();
+            std::cout << result1.as<std::string>() << " future\n";
+        }
+
+        client.async_call("echo", [](auto ec, auto data) {
+            if (ec) {                
+                std::cout << ec.message() <<" "<< data << "\n";
+                return;
+            }
+
+            auto result = as<std::string>(data);
+            std::cout << result << " async\n";
+        }, "purecpp");
+    }
+
+    std::getchar();
+}
+
 int main() {
 	test_sub1();
 	test_connect();

diff --git a/examples/server/CMakeLists.txt b/examples/server/CMakeLists.txt
@@ -3,11 +3,23 @@ project(basic_server)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -std=c++11")
 
-find_package(Boost COMPONENTS system REQUIRED)
+SET(ENABLE_SSL OFF)
+
+if (ENABLE_SSL)
+    add_definitions(-DCINATRA_ENABLE_SSL)
+    message(STATUS "Use SSL")
+endif()
+
+find_package(Boost COMPONENTS system filesystem REQUIRED)
 include_directories(
         "../../include"
         "../../third/msgpack/include"
 )
 
 add_executable(basic_server main.cpp)
-target_link_libraries(basic_server ${Boost_LIBRARIES})
+
+if (ENABLE_SSL)
+    target_link_libraries(basic_server ${Boost_LIBRARIES} -lssl -lcrypto -lpthread)
+else()
+    target_link_libraries(basic_server ${Boost_LIBRARIES})
+endif()
diff --git a/examples/server/basic_server.vcxproj b/examples/server/basic_server.vcxproj
@@ -97,6 +97,7 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -123,6 +124,7 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

diff --git a/examples/server/main.cpp b/examples/server/main.cpp
@@ -91,6 +91,13 @@ int get_int(rpc_conn conn, int val) {
 	return val;
 }
 
+void test_ssl() {
+    rpc_server server(9000, std::thread::hardware_concurrency(), { "server.crt", "server.key" });
+    server.register_handler("hello", hello);
+    server.register_handler("echo", echo);
+    server.run();
+}
+
 int main() {
 	rpc_server server(9000, std::thread::hardware_concurrency());