kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danburk...@apache.org
Subject [3/3] kudu git commit: Bump Squeasel version
Date Thu, 02 Feb 2017 00:23:32 GMT
Bump Squeasel version

Squeasel has recently landed some security-related fixes:

* OpenSSL is now dynamically linked, instead of dlopened.
* Squeasel can now skip OpenSSL initialization, which prevents conflicts
  with Kudu's initialization.

Change-Id: If5c69b412ff8f9e4c5eb1f35f86ee62e0348bf0c
Reviewed-on: http://gerrit.cloudera.org:8080/5855
Reviewed-by: Adar Dembo <adar@cloudera.com>
Tested-by: Kudu Jenkins
Reviewed-by: Todd Lipcon <todd@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/8993716d
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/8993716d
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/8993716d

Branch: refs/heads/master
Commit: 8993716d70f326a0a782b7f943c0b9492eab9c0f
Parents: b30d68a
Author: Dan Burkert <danburkert@apache.org>
Authored: Wed Feb 1 11:43:18 2017 -0800
Committer: Todd Lipcon <todd@apache.org>
Committed: Wed Feb 1 22:36:32 2017 +0000

----------------------------------------------------------------------
 src/kudu/server/webserver.cc | 8 ++++++++
 thirdparty/vars.sh           | 4 +---
 2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/8993716d/src/kudu/server/webserver.cc
----------------------------------------------------------------------
diff --git a/src/kudu/server/webserver.cc b/src/kudu/server/webserver.cc
index 0b8cdfd..fd1fcdd 100644
--- a/src/kudu/server/webserver.cc
+++ b/src/kudu/server/webserver.cc
@@ -40,6 +40,7 @@
 #include "kudu/gutil/strings/split.h"
 #include "kudu/gutil/strings/stringpiece.h"
 #include "kudu/gutil/strings/strip.h"
+#include "kudu/security/openssl_util.h"
 #include "kudu/util/env.h"
 #include "kudu/util/flag_tags.h"
 #include "kudu/util/locks.h"
@@ -141,6 +142,13 @@ Status Webserver::Start() {
 
   if (IsSecure()) {
     LOG(INFO) << "Webserver: Enabling HTTPS support";
+
+    // Initialize OpenSSL, and prevent Squeasel from also performing global OpenSSL
+    // initialization.
+    security::InitializeOpenSSL();
+    options.push_back("ssl_global_init");
+    options.push_back("false");
+
     options.push_back("ssl_certificate");
     options.push_back(opts_.certificate_file);
 

http://git-wip-us.apache.org/repos/asf/kudu/blob/8993716d/thirdparty/vars.sh
----------------------------------------------------------------------
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index 6f0178d..652c6fe 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -91,9 +91,7 @@ RAPIDJSON_SOURCE=$TP_SOURCE_DIR/$RAPIDJSON_NAME
 #  export NAME=squeasel-$(git rev-parse HEAD)
 #  git archive HEAD --prefix=$NAME/ -o /tmp/$NAME.tar.gz
 #  s3cmd put -P /tmp/$NAME.tar.gz s3://cloudera-thirdparty-libs/$NAME.tar.gz
-#
-# File a HD ticket for access to the cloudera-dev AWS instance to push to S3.
-SQUEASEL_VERSION=8ac777a122fccf0358cb8562e900f8e9edd9ed11
+SQUEASEL_VERSION=c304d3f3481b07bf153979155f02e0aab24d01de
 SQUEASEL_NAME=squeasel-$SQUEASEL_VERSION
 SQUEASEL_SOURCE=$TP_SOURCE_DIR/$SQUEASEL_NAME
 


Mime
View raw message