McServerSSLUtil -> McSSLUtil

Summary: We plan to put client routines in here as well. Reviewed By: andreazevedo Differential Revision: D7401598 fbshipit-source-id: 812945047084475ee6a884f5d458d364371fa8b3
c4milo · Mar 27, 2018 · 2e39a38 · 2e39a38
1 parent 7241e5e
commit 2e39a38
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/mcrouter/lib/Makefile.am b/mcrouter/lib/Makefile.am
@@ -174,8 +174,8 @@ libmcrouter_a_SOURCES = \
   network/McServerRequestContext.h \
   network/McServerSession.cpp \
   network/McServerSession.h \
-  network/McServerSSLUtil.cpp \
-  network/McServerSSLUtil.h \
+  network/McSSLUtil.cpp \
+  network/McSSLUtil.h \
   network/MemcacheMessageHelpers.h \
   network/MemoryController.cpp \
   network/MemoryController.h \

diff --git a/mcrouter/lib/network/McServerSSLUtil.cpp → mcrouter/lib/network/McSSLUtil.cpp b/mcrouter/lib/network/McServerSSLUtil.cpp → mcrouter/lib/network/McSSLUtil.cpp
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-#include "McServerSSLUtil.h"
+#include "McSSLUtil.h"
 
 #include <folly/SharedMutex.h>
 #include <folly/io/async/ssl/OpenSSLUtils.h>
@@ -19,13 +19,13 @@ static folly::SharedMutex& getMutex() {
   return MUTEX;
 }
 
-static McServerSSLUtil::SSLVerifyFunction& getAppFuncRef() {
-  static McServerSSLUtil::SSLVerifyFunction VERIFIER;
+static McSSLUtil::SSLVerifyFunction& getAppFuncRef() {
+  static McSSLUtil::SSLVerifyFunction VERIFIER;
   return VERIFIER;
 }
 } // namespace
 
-bool McServerSSLUtil::verifySSLWithDefaultBehavior(
+bool McSSLUtil::verifySSLWithDefaultBehavior(
     folly::AsyncSSLSocket*,
     bool preverifyOk,
     X509_STORE_CTX* ctx) noexcept {
@@ -59,12 +59,12 @@ bool McServerSSLUtil::verifySSLWithDefaultBehavior(
       cert, reinterpret_cast<sockaddr*>(&addrStorage), addrLen);
 }
 
-void McServerSSLUtil::setApplicationSSLVerifier(SSLVerifyFunction func) {
+void McSSLUtil::setApplicationSSLVerifier(SSLVerifyFunction func) {
   folly::SharedMutex::WriteHolder wh(getMutex());
   getAppFuncRef() = std::move(func);
 }
 
-bool McServerSSLUtil::verifySSL(
+bool McSSLUtil::verifySSL(
     folly::AsyncSSLSocket* sock,
     bool preverifyOk,
     X509_STORE_CTX* ctx) noexcept {

diff --git a/mcrouter/lib/network/McServerSSLUtil.h → mcrouter/lib/network/McSSLUtil.h b/mcrouter/lib/network/McServerSSLUtil.h → mcrouter/lib/network/McSSLUtil.h
@@ -13,11 +13,11 @@
 namespace facebook {
 namespace memcache {
 /**
- * A utility class for SSL related items in McRouter Servers.
- * Manages an app specific SSL verification routine that is used by
- * McServerSession when verifying SSL handshakes.
+ * A utility class for SSL related items in McRouter clients and servers.
+ * Manages app-specific SSL routines that are used by clients and servers during
+ * and immediately after SSL handshakes.
  */
-class McServerSSLUtil {
+class McSSLUtil {
  public:
   using SSLVerifyFunction =
       folly::Function<bool(folly::AsyncSSLSocket*, bool, X509_STORE_CTX*)

diff --git a/mcrouter/lib/network/McServerSession.cpp b/mcrouter/lib/network/McServerSession.cpp
@@ -12,8 +12,8 @@
 #include <folly/small_vector.h>
 
 #include "mcrouter/lib/debug/FifoManager.h"
+#include "mcrouter/lib/network/McSSLUtil.h"
 #include "mcrouter/lib/network/McServerRequestContext.h"
-#include "mcrouter/lib/network/McServerSSLUtil.h"
 #include "mcrouter/lib/network/MultiOpParent.h"
 #include "mcrouter/lib/network/WriteBuffer.h"
 
@@ -481,7 +481,7 @@ bool McServerSession::handshakeVer(
     folly::AsyncSSLSocket* sock,
     bool preverifyOk,
     X509_STORE_CTX* ctx) noexcept {
-  return McServerSSLUtil::verifySSL(sock, preverifyOk, ctx);
+  return McSSLUtil::verifySSL(sock, preverifyOk, ctx);
 }
 
 void McServerSession::handshakeSuc(folly::AsyncSSLSocket* sock) noexcept {

diff --git a/mcrouter/lib/network/test/AsyncMcServerTest.cpp b/mcrouter/lib/network/test/AsyncMcServerTest.cpp
@@ -7,7 +7,7 @@
  */
 #include <gtest/gtest.h>
 
-#include "mcrouter/lib/network/McServerSSLUtil.h"
+#include "mcrouter/lib/network/McSSLUtil.h"
 #include "mcrouter/lib/network/test/TestClientServerUtil.h"
 
 using namespace facebook::memcache;
@@ -60,7 +60,7 @@ TEST(AsyncMcServer, sslCertCommonName) {
 }
 
 TEST(AsyncMcServer, sslVerify) {
-  McServerSSLUtil::setApplicationSSLVerifier(
+  McSSLUtil::setApplicationSSLVerifier(
       [](folly::AsyncSSLSocket*, bool, X509_STORE_CTX*) { return false; });
   auto server = TestServer::create(false, true /* use ssl */);