Fixed CORE-5189: Codes of operation of user management plugin are mis…

…sing in public API

src/auth/SecureRemotePassword/manage/SrpManagement.cpp

@@ -279,18 +279,18 @@ class SrpManagement FB_FINAL : public Firebird::StdPlugin<Firebird::IManagementI
 
 			switch(user->operation())
 			{
-			case MAP_DROP_OPER:
-			case MAP_SET_OPER:
+			case Firebird::IUser::OP_USER_DROP_MAP:
+			case Firebird::IUser::OP_USER_SET_MAP:
 				{
 					Firebird::string sql;
 					sql.printf("ALTER ROLE " ADMIN_ROLE " %s AUTO ADMIN MAPPING",
-						user->operation() == MAP_SET_OPER ? "SET" : "DROP");
+						user->operation() == Firebird::IUser::OP_USER_SET_MAP ? "SET" : "DROP");
 					att->execute(status, tra, sql.length(), sql.c_str(), SQL_DIALECT_V6, NULL, NULL, NULL, NULL);
 					check(status);
 				}
 				break;
 
-			case ADD_OPER:
+			case Firebird::IUser::OP_USER_ADD:
 				{
 					const char* insert =
 						"INSERT INTO plg$srp_view(PLG$USER_NAME, PLG$VERIFIER, PLG$SALT, PLG$FIRST, PLG$MIDDLE, PLG$LAST,"
@@ -378,7 +378,7 @@ class SrpManagement FB_FINAL : public Firebird::StdPlugin<Firebird::IManagementI
 				}
 				break;
 
-			case MOD_OPER:
+			case Firebird::IUser::OP_USER_MODIFY:
 				{
 					Firebird::string update = "UPDATE plg$srp_view SET ";
 
@@ -482,7 +482,7 @@ class SrpManagement FB_FINAL : public Firebird::StdPlugin<Firebird::IManagementI
 				}
 				break;
 
-			case DEL_OPER:
+			case Firebird::IUser::OP_USER_DELETE:
 				{
 					const char* del = "DELETE FROM plg$srp_view WHERE PLG$USER_NAME=?";
 					Firebird::IStatement* stmt = NULL;
@@ -525,8 +525,7 @@ class SrpManagement FB_FINAL : public Firebird::StdPlugin<Firebird::IManagementI
 				}
 				break;
 
-			case OLD_DIS_OPER:
-			case DIS_OPER:
+			case Firebird::IUser::OP_USER_DISPLAY:
 				{
 					Firebird::string disp =	"SELECT PLG$USER_NAME, PLG$FIRST, PLG$MIDDLE, PLG$LAST, PLG$COMMENT, PLG$ATTRIBUTES, "
 											"	CASE WHEN RDB$RELATION_NAME IS NULL THEN FALSE ELSE TRUE END, PLG$ACTIVE "

src/auth/SecurityDatabase/LegacyManagement.epp

@@ -324,12 +324,12 @@ int SecurityDatabaseManagement::execute(Firebird::CheckStatusWrapper* st, Firebi
 
 		switch (user->operation())
 		{
-		case MAP_DROP_OPER:
-		case MAP_SET_OPER:
+		case Firebird::IUser::OP_USER_DROP_MAP:
+		case Firebird::IUser::OP_USER_SET_MAP:
 			{
 				Firebird::string sql;
 				sql.printf("ALTER ROLE " ADMIN_ROLE " %s AUTO ADMIN MAPPING",
-					user->operation() == MAP_SET_OPER ? "SET" : "DROP");
+					user->operation() == Firebird::IUser::OP_USER_SET_MAP ? "SET" : "DROP");
 				isc_dsql_execute_immediate(isc_status, &database, &transaction, sql.length(), sql.c_str(), 1, NULL);
 				if (isc_status[1] != 0)
 				{
@@ -338,7 +338,7 @@ int SecurityDatabaseManagement::execute(Firebird::CheckStatusWrapper* st, Firebi
 			}
 			break;
 
-		case ADD_OPER:
+		case Firebird::IUser::OP_USER_ADD:
 			// this checks the "entered" flags for each parameter (except the name)
 			// and makes all non-entered parameters null valued
 
@@ -412,7 +412,7 @@ int SecurityDatabaseManagement::execute(Firebird::CheckStatusWrapper* st, Firebi
 			}
 			break;
 
-		case MOD_OPER:
+		case Firebird::IUser::OP_USER_MODIFY:
 			// this updates an existing record, replacing all fields that are
 			// entered, and for those that were specified but not entered, it
 			// changes the current value to the null value
@@ -509,7 +509,7 @@ int SecurityDatabaseManagement::execute(Firebird::CheckStatusWrapper* st, Firebi
 			}
 			break;
 
-		case DEL_OPER:
+		case Firebird::IUser::OP_USER_DELETE:
 			// looks up the specified user record and deletes it
 
 			found = false;
@@ -546,8 +546,7 @@ int SecurityDatabaseManagement::execute(Firebird::CheckStatusWrapper* st, Firebi
 			}
 			break;
 
-		case DIS_OPER:
-		case OLD_DIS_OPER:
+		case Firebird::IUser::OP_USER_DISPLAY:
 			// gets either the desired record, or all records, and displays them
 
 			found = false;

src/common/call_service.cpp

@@ -273,12 +273,11 @@ isc_svc_handle attachRemoteServiceManager(ISC_STATUS* status,
 
 	userInfoToSpb
 
-	@brief	Writes data from awful borland's struct internal_user_data
-	to not less awful borland's format of spb.
+	@brief	Writes data from UserData to spb.
 
 
 	@param spb
-	@param userInfo
+	@param userData
 
  **/
 static void userInfoToSpb(char*& spb, Auth::UserData& userData)

src/include/firebird/FirebirdInterface.idl

@@ -645,6 +645,14 @@ interface User : Versioned
 	IntUserField admin();
 
 	void clear(Status status);
+
+	// code of operation()
+	const int OP_USER_ADD = 1;
+	const int OP_USER_MODIFY = 2;
+	const int OP_USER_DELETE = 3;
+	const int OP_USER_DISPLAY = 4;
+	const int OP_USER_SET_MAP = 5;
+	const int OP_USER_DROP_MAP = 6;
 }
 
 interface ListUsers : Versioned

src/include/firebird/IdlFbInterfaces.h

@@ -2601,6 +2601,13 @@ namespace Firebird
 	public:
 		static const unsigned VERSION = 2;
 
+		static const int OP_USER_ADD = 1;
+		static const int OP_USER_MODIFY = 2;
+		static const int OP_USER_DELETE = 3;
+		static const int OP_USER_DISPLAY = 4;
+		static const int OP_USER_SET_MAP = 5;
+		static const int OP_USER_DROP_MAP = 6;
+
 		int operation()
 		{
 			int ret = static_cast<VTable*>(this->cloopVTable)->operation(this);

src/utilities/gsec/gsec.cpp

@@ -232,8 +232,8 @@ namespace {
 		public Firebird::AutoIface<Firebird::IListUsersImpl<Display, Firebird::CheckStatusWrapper> >
 	{
 	public:
-		explicit Display(tsec* t)
-			: tdsec(t), first(true)
+		Display(tsec* t, int op)
+			: tdsec(t), first(true), putAdmin(op != OLD_DIS_OPER)
 		{ }
 
 		// IListUsers implementation
@@ -257,7 +257,7 @@ namespace {
 					tdsec->utilSvc->putLine(isc_spb_sec_lastname, data->lastName()->entered() ? data->lastName()->get() : "");
 					tdsec->utilSvc->putSLong(isc_spb_sec_userid, attr["uid"]);
 					tdsec->utilSvc->putSLong(isc_spb_sec_groupid, attr["gid"]);
-					if (data->operation() == DIS_OPER)
+					if (putAdmin)
 					{
 						tdsec->utilSvc->putSLong(isc_spb_sec_admin, data->admin()->get());
 					}
@@ -288,6 +288,7 @@ namespace {
 	private:
 		tsec* tdsec;
 		bool first;
+		bool putAdmin;
 	};
 
 
@@ -521,14 +522,17 @@ int gsec(Firebird::UtilSvc* uSvc)
 	{
 		if (ret == 0)
 		{
+			Display disp(tdsec, user_data->op);
+			if (user_data->op == OLD_DIS_OPER)
+				user_data->op = DIS_OPER;
+
 			// Signal the start of the service here ONLY if we are displaying users
 			// since the number of users may exceed the service buffer.  This
 			// will cause the service to wait for the client to request data.  However,
 			// if the server is not signaled, then the client can never request anything.
-			if (user_data->operation() == DIS_OPER || user_data->operation() == OLD_DIS_OPER)
+			if (user_data->operation() == DIS_OPER)
 				uSvc->started();
 
-			Display disp(tdsec);
 			if (! useServices)
 			{
 				if (user_data->operation() == ADD_OPER)
@@ -543,7 +547,7 @@ int gsec(Firebird::UtilSvc* uSvc)
 					(fieldSet(&user_data->u) || fieldSet(&user_data->g) || fieldSet(&user_data->group)))
 				{
 					StackUserData u;
-					u.op = OLD_DIS_OPER;
+					u.op = DIS_OPER;
 					u.user.set(&statusWrapper, user_data->userName()->get());
 					check(&statusWrapper);
 					u.user.setEntered(&statusWrapper, 1);
@@ -658,7 +662,7 @@ int gsec(Firebird::UtilSvc* uSvc)
 
 				if (ret == 0)
 				{
-					Display disp(tdsec);
+					Display disp(tdsec, DIS_OPER);
 					callRemoteServiceManager(status, sHandle, *user_data, &disp);
 					if (status[1])
 					{

src/utilities/gsec/gsec.h

@@ -24,6 +24,7 @@
 #ifndef UTILITIES_GSEC_H
 #define UTILITIES_GSEC_H
 
+#include "firebird/Interface.h"
 #include "../common/ThreadData.h"
 #include "../jrd/constants.h"
 
@@ -40,16 +41,17 @@ class UserData;
    operation to perform and any parameters entered (sizes are determined
    by the size of the fields in the USERS relation in USERINFO.GDB) */
 
-const int ADD_OPER		= 1;
-const int DEL_OPER		= 2;
-const int DIS_OPER		= 3;
-const int MOD_OPER		= 4;
-const int QUIT_OPER		= 5;
-const int HELP_OPER		= 6;
-const int ADDMOD_OPER	= 7;		// This oper never goes to plugins
-const int MAP_SET_OPER	= 8;
-const int MAP_DROP_OPER	= 9;
-const int OLD_DIS_OPER	= 10;
+const int ADD_OPER		= Firebird::IUser::OP_USER_ADD;
+const int MOD_OPER		= Firebird::IUser::OP_USER_MODIFY;
+const int DEL_OPER		= Firebird::IUser::OP_USER_DELETE;
+const int DIS_OPER		= Firebird::IUser::OP_USER_DISPLAY;
+const int MAP_SET_OPER	= Firebird::IUser::OP_USER_SET_MAP;
+const int MAP_DROP_OPER	= Firebird::IUser::OP_USER_DROP_MAP;
+// Foolowing operations never go to plugins
+const int QUIT_OPER		= 101;
+const int HELP_OPER		= 102;
+const int ADDMOD_OPER	= 103;
+const int OLD_DIS_OPER	= 104;
 
 const int USER_NAME_LEN	= 133;
 const int ALT_NAME_LEN	= 129;