CXX-559 Backport server r3.0.0-rc6..r3.0.1 changes

Server SHAs cherry-picked into this commit:

656c47b
43ea13b
5285225
ac7d4ea
77c5493
33afe7a
8f6875a
0cbcdfd

Author: acmorrow

SConstruct

@@ -246,14 +246,7 @@ add_option('variables-help',
            "Print the help text for SCons variables", 0, False)
 
 if darwin:
-    osx_version_choices = ['10.6', '10.7', '10.8', '10.9', '10.10']
-
-    my_version, _, _ = py_platform.mac_ver()
-    my_version = '.'.join(my_version.split('.')[:2])
-
-    add_option("osx-version-min",
-               "minimum OS X version to support, defaults to current version", 1, True,
-               type = 'choice', default = my_version, choices = osx_version_choices)
+    add_option("osx-version-min", "minimum OS X version to support", 1, True)
 
 elif windows:
     win_version_min_choices = {
@@ -366,7 +359,7 @@ if buildDir[0] not in ['$', '#']:
 
 cacheDir = get_option('cache-dir').rstrip('/')
 if cacheDir[0] not in ['$', '#']:
-    if not os.path.isabs(cachdDIr):
+    if not os.path.isabs(cacheDir):
         print("Do not use relative paths with --cache-dir")
         Exit(1)
 

src/mongo/bson/bson_validate.cpp

@@ -17,6 +17,7 @@
 
 #include <cstring>
 #include <deque>
+#include <limits>
 
 #include "mongo/base/data_view.h"
 #include "mongo/bson/bson_validate.h"
@@ -78,6 +79,11 @@ namespace mongo {
                 if ( !readNumber<int>( &sz ) )
                     return makeError("invalid bson", _idElem);
 
+                if ( sz <= 0 ) {
+                    // must have NULL at the very least
+                    return makeError("invalid bson", _idElem);
+                }
+
                 if ( out ) {
                     *out = StringData( _buffer + _position, sz );
                 }
@@ -237,6 +243,8 @@ namespace mongo {
                 int sz;
                 if ( !buffer->readNumber<int>( &sz ) )
                     return makeError("invalid bson", idElem);
+                if ( sz < 0 || sz == std::numeric_limits<int>::max() )
+                    return makeError("invalid size in bson", idElem);
                 if ( !buffer->skip( 1 + sz ) )
                     return makeError("invalid bson", idElem);
                 return Status::OK();

src/mongo/bson/bson_validate_test.cpp

@@ -281,4 +281,20 @@ namespace {
         ASSERT_NOT_OK(status);
         ASSERT_EQUALS(status.reason(), "not null terminated string in object with unknown _id");
     }
+
+    TEST(BSONValidateFast, StringHasSomething) {
+        BufBuilder bb;
+        BSONObjBuilder ob(bb);
+        bb.appendChar(String);
+        bb.appendStr("x", /*withNUL*/true);
+        bb.appendNum(0);
+        const BSONObj x = ob.done();
+        ASSERT_EQUALS(5 // overhead
+                      + 1 // type
+                      + 2 // name
+                      + 4 // size
+                      , x.objsize());
+        ASSERT_NOT_OK(validateBSON(x.objdata(), x.objsize()));
+    }
+
 }

src/mongo/bson/bsonobjbuilder.h

@@ -60,10 +60,13 @@ namespace mongo {
             , _s(this)
             , _tracker(0)
             , _doneCalled(false) {
-            // Reserve space for a holder object at the beginning of the buffer, followed by
+            // Skip over space for a holder object at the beginning of the buffer, followed by
             // space for the object length. The length is filled in by _done.
             _b.skip(sizeof(BSONObj::Holder));
             _b.skip(sizeof(int));
+
+            // Reserve space for the EOO byte. This means _done() can't fail.
+            _b.reserveBytes(1);
         }
 
         /** @param baseBuilder construct a BSONObjBuilder using an existing BufBuilder
@@ -76,9 +79,13 @@ namespace mongo {
             , _s(this)
             , _tracker(0)
             , _doneCalled(false) {
-            // Reserve space for the object length, which is filled in by _done. We don't need a holder
-            // since we are a sub-builder, and some parent builder has already made the reservation.
+            // Skip over space for the object length, which is filled in by _done. We don't need a
+            // holder since we are a sub-builder, and some parent builder has already made the
+            // reservation.
             _b.skip(sizeof(int));
+
+            // Reserve space for the EOO byte. This means _done() can't fail.
+            _b.reserveBytes(1);
         }
 
         BSONObjBuilder( const BSONSizeTracker & tracker )
@@ -91,6 +98,9 @@ namespace mongo {
             // See the comments in the first constructor for details.
             _b.skip(sizeof(BSONObj::Holder));
             _b.skip(sizeof(int));
+
+            // Reserve space for the EOO byte. This means _done() can't fail.
+            _b.reserveBytes(1);
         }
 
         ~BSONObjBuilder() {
@@ -626,6 +636,7 @@ namespace mongo {
         BSONObj asTempObj() {
             BSONObj temp(_done());
             _b.setlen(_b.len()-1); //next append should overwrite the EOO
+            _b.reserveBytes(1); // Rereserve room for the real EOO
             _doneCalled = false;
             return temp;
         }
@@ -707,8 +718,14 @@ namespace mongo {
                 return _b.buf() + _offset;
 
             _doneCalled = true;
+
+            // TODO remove this or find some way to prevent it from failing. Since this is intended
+            // for use with BSON() literal queries, it is less likely to result in oversized BSON.
             _s.endField();
+
+            _b.claimReservedBytes(1); // Prevents adding EOO from failing.
             _b.appendNum((char) EOO);
+
             char *data = _b.buf() + _offset;
             int size = _b.len() - _offset;
             DataView(data).writeLE(size);

src/mongo/bson/util/builder.h

@@ -102,6 +102,7 @@ namespace mongo {
                 data = 0;
             }
             l = 0;
+            reservedBytes = 0;
         }
         ~_BufBuilder() { kill(); }
 
@@ -114,9 +115,11 @@ namespace mongo {
 
         void reset() {
             l = 0;
+            reservedBytes = 0;
         }
         void reset( int maxSize ) {
             l = 0;
+            reservedBytes = 0;
             if ( maxSize && size > maxSize ) {
                 al.Free(data);
                 data = (char*)al.Malloc(maxSize);
@@ -205,13 +208,36 @@ namespace mongo {
         inline char* grow(int by) {
             int oldlen = l;
             int newLen = l + by;
-            if ( newLen > size ) {
-                grow_reallocate(newLen);
+            int minSize = newLen + reservedBytes;
+            if ( minSize > size ) {
+                grow_reallocate(minSize);
             }
             l = newLen;
             return data + oldlen;
         }
 
+        /**
+         * Reserve room for some number of bytes to be claimed at a later time.
+         */
+        void reserveBytes(int bytes) {
+            int minSize = l + reservedBytes + bytes;
+            if (minSize > size)
+                grow_reallocate(minSize);
+
+            // This must happen *after* any attempt to grow.
+            reservedBytes += bytes;
+        }
+
+        /**
+         * Claim an earlier reservation of some number of bytes. These bytes must already have been
+         * reserved. Appends of up to this many bytes immediately following a claim are
+         * guaranteed to succeed without a need to reallocate.
+         */
+        void claimReservedBytes(int bytes) {
+            invariant(reservedBytes >= bytes);
+            reservedBytes -= bytes;
+        }
+
     private:
         template<typename T>
         void appendNumImpl(T t) {
@@ -224,10 +250,11 @@ namespace mongo {
 
 
         /* "slow" portion of 'grow()'  */
-        void NOINLINE_DECL grow_reallocate(int newLen) {
+        void NOINLINE_DECL grow_reallocate(int minSize) {
             int a = 64;
-            while( a < newLen ) 
+            while (a < minSize)
                 a = a * 2;
+
             if ( a > BufferMaxSize ) {
                 std::stringstream ss;
                 ss << "BufBuilder attempted to grow() to " << a << " bytes, past the 64MB limit.";
@@ -242,6 +269,7 @@ namespace mongo {
         char *data;
         int l;
         int size;
+        int reservedBytes; // eagerly grow_reallocate to keep this many bytes of spare room.
 
         friend class StringBuilderImpl<Allocator>;
     };

src/mongo/util/net/sock.cpp

@@ -487,15 +487,30 @@ namespace mongo {
         ConnectBG(int sock, SockAddr remote) : _sock(sock), _remote(remote) { }
 
         void run() {
-            _res = ::connect(_sock, _remote.raw(), _remote.addressSize);
-            _errnoWithDescription = errnoWithDescription();
+#if defined(_WIN32)
+            if ((_res = _connect()) == SOCKET_ERROR) {
+                _errnoWithDescription = errnoWithDescription();
+            }
+#else
+            while ((_res = _connect()) == -1) {
+                const int error = errno;
+                if (error != EINTR) {
+                    _errnoWithDescription = errnoWithDescription(error);
+                    break;
+                }
+            }
+#endif
         }
 
         std::string name() const { return "ConnectBG"; }
         std::string getErrnoWithDescription() const { return _errnoWithDescription; }
         int inError() const { return _res; }
 
     private:
+        int _connect() const {
+            return ::connect(_sock, _remote.raw(), _remote.addressSize);
+        }
+
         int _sock;
         int _res;
         SockAddr _remote;

src/mongo/util/net/ssl_manager.cpp

@@ -556,9 +556,14 @@ namespace mongo {
         // Note: this is for blocking sockets only.
         SSL_CTX_set_mode(*context, SSL_MODE_AUTO_RETRY);
 
-        // Disable session caching (see SERVER-10261)
-        SSL_CTX_set_session_cache_mode(*context, SSL_SESS_CACHE_OFF);
- 
+        massert(28607,
+                mongoutils::str::stream() << "can't store ssl session id context: " <<
+                    getSSLErrorMessage(ERR_get_error()),
+                SSL_CTX_set_session_id_context(
+                    *context,
+                    static_cast<unsigned char*>(static_cast<void*>(context)),
+                    sizeof(*context)));
+
         // Use the clusterfile for internal outgoing SSL connections if specified 
         if (context == &_clientContext && !params.clusterfile.empty()) {
             EVP_set_pw_prompt("Enter cluster certificate passphrase");