From abc4919bfa11977e2b7c1d53952bb2671b51c91c Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Wed, 8 Nov 2017 11:42:05 +0100 Subject: [PATCH 1/2] improved URI support; added tests --- .../Poco/MongoDB/PoolableConnectionFactory.h | 26 ++++++++-- MongoDB/src/Connection.cpp | 19 ++++--- MongoDB/testsuite/src/MongoDBTest.cpp | 50 ++++++++++++++++++- MongoDB/testsuite/src/MongoDBTest.h | 1 + 4 files changed, 81 insertions(+), 15 deletions(-) diff --git a/MongoDB/include/Poco/MongoDB/PoolableConnectionFactory.h b/MongoDB/include/Poco/MongoDB/PoolableConnectionFactory.h index 573310ad6..60115b188 100644 --- a/MongoDB/include/Poco/MongoDB/PoolableConnectionFactory.h +++ b/MongoDB/include/Poco/MongoDB/PoolableConnectionFactory.h @@ -28,24 +28,38 @@ namespace Poco { template<> class PoolableObjectFactory /// PoolableObjectFactory specialisation for Connection. New connections - /// are created with the given address. + /// are created with the given address or URI. + /// + /// If a Connection::SocketFactory is given, it must live for the entire + /// lifetime of the PoolableObjectFactory. { public: PoolableObjectFactory(Net::SocketAddress& address): - _address(address) + _address(address), + _pSocketFactory(0) { } PoolableObjectFactory(const std::string& address): - _address(address) + _address(address), + _pSocketFactory(0) + { + } + + PoolableObjectFactory(const std::string& uri, MongoDB::Connection::SocketFactory& socketFactory): + _uri(uri), + _pSocketFactory(&socketFactory) { } MongoDB::Connection::Ptr createObject() { - return new MongoDB::Connection(_address); + if (_pSocketFactory) + return new MongoDB::Connection(_uri, *_pSocketFactory); + else + return new MongoDB::Connection(_address); } - + bool validateObject(MongoDB::Connection::Ptr pObject) { return true; @@ -65,6 +79,8 @@ public: private: Net::SocketAddress _address; + std::string _uri; + MongoDB::Connection::SocketFactory* _pSocketFactory; }; diff --git a/MongoDB/src/Connection.cpp b/MongoDB/src/Connection.cpp index a5944f062..56bb192ce 100644 --- a/MongoDB/src/Connection.cpp +++ b/MongoDB/src/Connection.cpp @@ -152,35 +152,38 @@ void Connection::connect(const std::string& uri, SocketFactory& socketFactory) std::string host = theURI.getHost(); Poco::UInt16 port = theURI.getPort(); if (port == 0) port = 27017; + std::string databaseName = theURI.getPath(); + if (!databaseName.empty() && databaseName[0] == '/') databaseName.erase(0, 1); if (databaseName.empty()) databaseName = "admin"; - bool secure = false; + + bool ssl = false; Poco::Timespan connectTimeout; Poco::Timespan socketTimeout; - std::string authMethod = Database::AUTH_SCRAM_SHA1; + std::string authMechanism = Database::AUTH_SCRAM_SHA1; Poco::URI::QueryParameters params = theURI.getQueryParameters(); for (Poco::URI::QueryParameters::const_iterator it = params.begin(); it != params.end(); ++it) { if (it->first == "ssl") { - secure = (it->second == "true"); + ssl = (it->second == "true"); } else if (it->first == "connectTimeoutMS") { - connectTimeout = 1000*Poco::NumberParser::parse(it->second); + connectTimeout = static_cast(1000)*Poco::NumberParser::parse(it->second); } else if (it->first == "socketTimeoutMS") { - socketTimeout = 1000*Poco::NumberParser::parse(it->second); + socketTimeout = static_cast(1000)*Poco::NumberParser::parse(it->second); } else if (it->first == "authMechanism") { - authMethod = it->second; + authMechanism = it->second; } } - connect(socketFactory.createSocket(host, port, connectTimeout, secure)); + connect(socketFactory.createSocket(host, port, connectTimeout, ssl)); if (socketTimeout > 0) { @@ -201,7 +204,7 @@ void Connection::connect(const std::string& uri, SocketFactory& socketFactory) else username = userInfo; Database database(databaseName); - if (!database.authenticate(*this, username, password, authMethod)) + if (!database.authenticate(*this, username, password, authMechanism)) throw Poco::NoPermissionException(Poco::format("Access to MongoDB database %s denied for user %s", databaseName, username)); } } diff --git a/MongoDB/testsuite/src/MongoDBTest.cpp b/MongoDB/testsuite/src/MongoDBTest.cpp index 0f8060a7d..6703f2764 100644 --- a/MongoDB/testsuite/src/MongoDBTest.cpp +++ b/MongoDB/testsuite/src/MongoDBTest.cpp @@ -221,10 +221,10 @@ void MongoDBTest::testDeleteRequest() void MongoDBTest::testCursorRequest() { Poco::MongoDB::Database db("team"); - + Poco::SharedPtr deleteRequest = db.createDeleteRequest("numbers"); _mongo->sendRequest(*deleteRequest); - + Poco::SharedPtr insertRequest = db.createInsertRequest("numbers"); for(int i = 0; i < 10000; ++i) { @@ -395,6 +395,51 @@ void MongoDBTest::testUUID() } +void MongoDBTest::testConnectURI() +{ + Poco::MongoDB::Connection conn; + Poco::MongoDB::Connection::SocketFactory sf; + + conn.connect("mongodb://127.0.0.1", sf); + conn.disconnect(); + + try + { + conn.connect("http://127.0.0.1", sf); + fail("invalid URI scheme - must throw"); + } + catch (Poco::UnknownURISchemeException&) + { + } + + try + { + conn.connect("mongodb://127.0.0.1?ssl=true", sf); + fail("SSL not supported, must throw"); + } + catch (Poco::NotImplementedException&) + { + } + + conn.connect("mongodb://127.0.0.1/admin?ssl=false&connectTimeoutMS=10000&socketTimeoutMS=10000", sf); + conn.disconnect(); + + try + { + conn.connect("mongodb://127.0.0.1/admin?connectTimeoutMS=foo", sf); + fail("invalid parameter - must throw"); + } + catch (Poco::Exception&) + { + } + +#ifdef MONGODB_TEST_AUTH + conn.connect("mongodb://admin:admin@127.0.0.1/admin", sf); + conn.disconnect(); +#endif +} + + CppUnit::Test* MongoDBTest::suite() { try @@ -423,6 +468,7 @@ CppUnit::Test* MongoDBTest::suite() CppUnit_addTest(pSuite, MongoDBTest, testObjectID); CppUnit_addTest(pSuite, MongoDBTest, testCommand); CppUnit_addTest(pSuite, MongoDBTest, testUUID); + CppUnit_addTest(pSuite, MongoDBTest, testConnectURI); return pSuite; } diff --git a/MongoDB/testsuite/src/MongoDBTest.h b/MongoDB/testsuite/src/MongoDBTest.h index 9818c4de4..4c5954612 100644 --- a/MongoDB/testsuite/src/MongoDBTest.h +++ b/MongoDB/testsuite/src/MongoDBTest.h @@ -39,6 +39,7 @@ public: void testObjectID(); void testCommand(); void testUUID(); + void testConnectURI(); void setUp(); void tearDown(); From d90a3da585f0215b20efbc915a71de84f527bf98 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Wed, 8 Nov 2017 11:48:52 +0100 Subject: [PATCH 2/2] merge fixes from develop --- MongoDB/include/Poco/MongoDB/MongoDB.h | 2 +- MongoDB/include/Poco/MongoDB/ObjectId.h | 2 +- MongoDB/include/Poco/MongoDB/PoolableConnectionFactory.h | 5 ++++- MongoDB/include/Poco/MongoDB/ReplicaSet.h | 6 +++--- MongoDB/src/Document.cpp | 2 +- MongoDB/src/KillCursorsRequest.cpp | 2 +- MongoDB/testsuite/src/MongoDBTest.cpp | 2 +- 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/MongoDB/include/Poco/MongoDB/MongoDB.h b/MongoDB/include/Poco/MongoDB/MongoDB.h index 9ccaca185..8e2126f12 100644 --- a/MongoDB/include/Poco/MongoDB/MongoDB.h +++ b/MongoDB/include/Poco/MongoDB/MongoDB.h @@ -28,7 +28,7 @@ // from a DLL simpler. All files within this DLL are compiled with the MongoDB_EXPORTS // symbol defined on the command line. this symbol should not be defined on any project // that uses this DLL. This way any other project whose source files include this file see -// MongoDB_API functions as being imported from a DLL, wheras this DLL sees symbols +// MongoDB_API functions as being imported from a DLL, whereas this DLL sees symbols // defined with this macro as being exported. // diff --git a/MongoDB/include/Poco/MongoDB/ObjectId.h b/MongoDB/include/Poco/MongoDB/ObjectId.h index 8c58d80a4..659047c95 100644 --- a/MongoDB/include/Poco/MongoDB/ObjectId.h +++ b/MongoDB/include/Poco/MongoDB/ObjectId.h @@ -47,7 +47,7 @@ public: explicit ObjectId(const std::string& id); /// Creates an ObjectId from a string. /// - /// The string must contain a hexidecimal representation + /// The string must contain a hexadecimal representation /// of an object ID. This means a string of 24 characters. ObjectId(const ObjectId& copy); diff --git a/MongoDB/include/Poco/MongoDB/PoolableConnectionFactory.h b/MongoDB/include/Poco/MongoDB/PoolableConnectionFactory.h index 60115b188..a723eb13b 100644 --- a/MongoDB/include/Poco/MongoDB/PoolableConnectionFactory.h +++ b/MongoDB/include/Poco/MongoDB/PoolableConnectionFactory.h @@ -100,7 +100,10 @@ public: { try { - _pool.returnObject(_connection); + if (_connection) + { + _pool.returnObject(_connection); + } } catch (...) { diff --git a/MongoDB/include/Poco/MongoDB/ReplicaSet.h b/MongoDB/include/Poco/MongoDB/ReplicaSet.h index e4fb5741b..1f7cd93d6 100644 --- a/MongoDB/include/Poco/MongoDB/ReplicaSet.h +++ b/MongoDB/include/Poco/MongoDB/ReplicaSet.h @@ -52,7 +52,7 @@ private: }; -#endif // MongoDB_ReplicaSet_INCLUDED - - } } // namespace Poco::MongoDB + + +#endif // MongoDB_ReplicaSet_INCLUDED diff --git a/MongoDB/src/Document.cpp b/MongoDB/src/Document.cpp index 6e7bc065c..114fc9938 100644 --- a/MongoDB/src/Document.cpp +++ b/MongoDB/src/Document.cpp @@ -57,7 +57,7 @@ Int64 Document::getInteger(const std::string& name) const if (ElementTraits::TypeId == element->type()) { ConcreteElement* concrete = dynamic_cast*>(element.get()); - if (concrete) return concrete->value(); + if (concrete) return static_cast(concrete->value()); } else if (ElementTraits::TypeId == element->type()) { diff --git a/MongoDB/src/KillCursorsRequest.cpp b/MongoDB/src/KillCursorsRequest.cpp index 7bf133a9c..6baa0e0be 100644 --- a/MongoDB/src/KillCursorsRequest.cpp +++ b/MongoDB/src/KillCursorsRequest.cpp @@ -33,7 +33,7 @@ KillCursorsRequest::~KillCursorsRequest() void KillCursorsRequest::buildRequest(BinaryWriter& writer) { writer << 0; // 0 - reserved for future use - writer << _cursors.size(); + writer << static_cast(_cursors.size()); for (std::vector::iterator it = _cursors.begin(); it != _cursors.end(); ++it) { writer << *it; diff --git a/MongoDB/testsuite/src/MongoDBTest.cpp b/MongoDB/testsuite/src/MongoDBTest.cpp index 6703f2764..334c8f118 100644 --- a/MongoDB/testsuite/src/MongoDBTest.cpp +++ b/MongoDB/testsuite/src/MongoDBTest.cpp @@ -243,7 +243,7 @@ void MongoDBTest::testCursorRequest() Poco::MongoDB::ResponseMessage& response = cursor.next(*_mongo); while(1) { - n += response.documents().size(); + n += static_cast(response.documents().size()); if ( response.cursorID() == 0 ) break; response = cursor.next(*_mongo);