firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 22:43:04 +01:00
Code Issues

Backported CORE-5884: Initial global mapping from srp plugin does not work

Browse Source
This commit is contained in:
Alex Peshkoff 2018-08-02 19:02:36 +03:00
parent 6550c134bd
commit 5df4b868d8
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/jrd/Mapping.cpp
View File

@ -508,7 +508,7 @@ Cache* locate(const NoCaseString& alias, const NoCaseString& target)
class Found
{
public:
enum What {FND_NOTHING, FND_SEC, FND_DB};
enum What {FND_NOTHING, FND_PLUG, FND_SEC, FND_DB};
Found()
: found(FND_NOTHING)
@ -516,8 +516,13 @@ public:
void set(What find, const AuthReader::Info& val)
{
fb_assert(find != FND_NOTHING);
if (val.plugin.hasData())
find = FND_PLUG;
if (find == found && value != val.name)
Arg::Gds(isc_map_undefined).raise();
if (find > found)
{
found = find;
@ -983,16 +988,22 @@ bool mapUser(string& name, string& trusted_role, Firebird::string* auth_method,
// Create new writer
AuthWriter newBlock;
// detect presence of this databases mapping in authBlock
// detect presence of non-plugin databases mapping in authBlock
// in that case mapUser was already invoked for it
unsigned flags = db ? 0 : FLAG_DB;
for (AuthReader rdr(authBlock); rdr.getInfo(info); rdr.moveNext())
{
MAP_DEBUG(fprintf(stderr, "info.plugin=%s info.secDb=%s db=%s securityDb=%s\n",
info.plugin.c_str(), info.secDb.c_str(), db ? db : "NULL", securityDb));
if (info.plugin.isEmpty())
{
if (db && info.secDb == db)
flags |= FLAG_DB;
if (info.secDb == securityDb)
flags |= FLAG_SEC;
}
}
// Perform lock & map only when needed
if ((flags != (FLAG_DB | FLAG_SEC)) && authBlock.hasData())