public/admc
1
0
Fork 0
mirror of https://github.com/altlinux/admc.git synced 2025-01-05 01:18:06 +03:00
Code Issues Projects Releases Wiki Activity

Attribute "groupType" value display is changed from decimal to hex

Browse Source
This commit is contained in:
Semyon Knyazev 2023-02-06 21:29:36 +04:00 committed by Evgeny Sinelnikov
parent 95d9443e0d
commit b10003b8c0
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/adldap/ad_display.cpp
View File

@ -45,6 +45,7 @@ QString guid_to_display_value(const QByteArray &bytes);
QString uac_to_display_value(const QByteArray &bytes);
QString samaccounttype_to_display_value(const QByteArray &bytes);
QString primarygrouptype_to_display_value(const QByteArray &bytes);
QString grouptype_to_display_value(const QByteArray &bytes);
QString attribute_display_value(const QString &attribute, const QByteArray &value, const AdConfig *adconfig) {
if (adconfig == nullptr) {
@ -61,6 +62,8 @@ QString attribute_display_value(const QString &attribute, const QByteArray &valu
return samaccounttype_to_display_value(value);
} else if (attribute == ATTRIBUTE_PRIMARY_GROUP_ID) {
return primarygrouptype_to_display_value(value);
} else if (attribute == ATTRIBUTE_GROUP_TYPE) {
return grouptype_to_display_value(value);
} else {
return QString(value);
}
@ -419,3 +422,30 @@ QString primarygrouptype_to_display_value(const QByteArray &bytes) {
return QString::number(value_int);
}
}
QString grouptype_to_display_value(const QByteArray &bytes) {
bool toInt_ok;
const int value_int = bytes.toInt(&toInt_ok);
if (!toInt_ok) {
return QCoreApplication::translate("attribute_display", "<invalid value>");
}
const QHash<int, QString> mask_name_map = {
//TODO: change strings according to rsat
{GROUP_TYPE_BIT_SYSTEM, "SYSTEM_GROUP"},
{GROUP_TYPE_BIT_SECURITY, "SECURITY_ENABLED"},
{group_scope_bit(GroupScope_Global), "ACCOUNT_GROUP"},
{group_scope_bit(GroupScope_DomainLocal), "RESOURCE_GROUP"},
{group_scope_bit(GroupScope_Universal), "UNIVERSAL_GROUP"},
};
QStringList masks_strings;
for (const int mask : mask_name_map.keys()) {
if (bitmask_is_set(value_int, mask))
masks_strings.append(mask_name_map[mask]);
}
QString display_value = QString("0x%1 = ( %2 )").arg(QString::number((quint32)value_int, 16), masks_strings.join(" | "));
return display_value;
}