You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2016/11/23 01:13:45 UTC
[1/2] mesos git commit: Fix SSL downgrade pathway for
temporary/persistent sockets.
Repository: mesos
Updated Branches:
refs/heads/0.28.x d1fffb46e -> 95ee5a583
Fix SSL downgrade pathway for temporary/persistent sockets.
This fixes some potential CHECK failures when a libprocess process
has (1) SSL downgrade enabled and (2) temporary and persistent
connections open with the same remote address. The second point is
only possible if messages are to a remote address without a persistent
connection and then a persistent connection is created.
The SSL downgrade path was only checking if the address of a socket
matched when performing the downgrade. The code must also check to
see if the socket itself matches.
Review: https://reviews.apache.org/r/53997/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4c56f51f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4c56f51f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4c56f51f
Branch: refs/heads/0.28.x
Commit: 4c56f51f5ea8b633cee12cbc212f29a760f99583
Parents: d1fffb4
Author: Joseph Wu <jo...@mesosphere.io>
Authored: Tue Nov 22 17:07:40 2016 -0800
Committer: Joseph Wu <jo...@apache.org>
Committed: Tue Nov 22 17:07:40 2016 -0800
----------------------------------------------------------------------
3rdparty/libprocess/src/process.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/4c56f51f/3rdparty/libprocess/src/process.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/process.cpp b/3rdparty/libprocess/src/process.cpp
index afb1035..0139da2 100644
--- a/3rdparty/libprocess/src/process.cpp
+++ b/3rdparty/libprocess/src/process.cpp
@@ -2190,16 +2190,16 @@ void SocketManager::swap_implementing_socket(const Socket& from, Socket* to)
addresses[to_fd] = addresses[from_fd];
addresses.erase(from_fd);
- // If this address is a temporary link.
- if (temps.count(addresses[to_fd]) > 0) {
- temps[addresses[to_fd]] = to_fd;
- // No need to erase as we're changing the value, not the key.
- }
-
- // If this address is a persistent link.
- if (persists.count(addresses[to_fd]) > 0) {
+ // If this address is a persistent or temporary link
+ // that matches the original FD.
+ if (persists.count(addresses[to_fd]) > 0 &&
+ persists.at(addresses[to_fd]) == from_fd) {
persists[addresses[to_fd]] = to_fd;
// No need to erase as we're changing the value, not the key.
+ } else if (temps.count(addresses[to_fd]) > 0 &&
+ temps.at(addresses[to_fd]) == from_fd) {
+ temps[addresses[to_fd]] = to_fd;
+ // No need to erase as we're changing the value, not the key.
}
// Move any encoders queued against this link to the new socket.
[2/2] mesos git commit: Added MESOS-6621 to CHANGELOG for 0.28.3.
Posted by jo...@apache.org.
Added MESOS-6621 to CHANGELOG for 0.28.3.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/95ee5a58
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/95ee5a58
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/95ee5a58
Branch: refs/heads/0.28.x
Commit: 95ee5a583eef1e60ba743900d49629b2286dbc97
Parents: 4c56f51
Author: Joseph Wu <jo...@apache.org>
Authored: Tue Nov 22 17:08:42 2016 -0800
Committer: Joseph Wu <jo...@apache.org>
Committed: Tue Nov 22 17:08:42 2016 -0800
----------------------------------------------------------------------
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/95ee5a58/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index a748d28..e9af58b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -32,6 +32,7 @@ All Issues:
* [MESOS-6457] - Tasks shouldn't transition from TASK_KILLING to TASK_RUNNING.
* [MESOS-6502] - _version uses incorrect MESOS_{MAJOR,MINOR,PATCH}_VERSION in libmesos java binding.
* [MESOS-6527] - Memory leak in the libprocess request decoder.
+ * [MESOS-6621] - SSL downgrade path will CHECK-fail when using both temporary and persistent sockets
Release Notes - Mesos - Version 0.28.2