sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3895 from mapycz/postgis-connection-creator-id

Browse source 
postgis: Exclude password from ConnectionCreator::id()
This commit is contained in:
Artem Pavlenko 2018-05-08 17:46:26 +01:00 • committed by GitHub
commit c2fe73ecbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/input/postgis/connection_manager.hpp
View file

@ -67,7 +67,7 @@ public:
inline std::string id() const
{
return connection_string();
return connection_string_safe();
}
inline std::string connection_string() const

18
test/unit/datasource/postgis.cpp
View file

@ -28,6 +28,7 @@
#include <mapnik/geometry/geometry_type.hpp>
#include <mapnik/unicode.hpp>
#include <mapnik/util/fs.hpp>
#include "../../../plugins/input/postgis/connection_manager.hpp"
/*
Compile and run just this test:
@ -406,3 +407,20 @@ TEST_CASE("postgis") {
}
}
TEST_CASE("ConnectionCreator") {
SECTION("ConnectionCreator::id() should not expose password")
{
ConnectionCreator<Connection> creator(boost::optional<std::string>("host"),
boost::optional<std::string>("12345"),
boost::optional<std::string>("dbname"),
boost::optional<std::string>("user"),
boost::optional<std::string>("pass"),
boost::optional<std::string>("111"));
CHECK(creator.id() == "host=host port=12345 dbname=dbname user=user connect_timeout=111");
}
}