Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 05:17:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

blacklist -> blocklist

Browse source
This commit is contained in:
HifiExperiments 2024-08-13 17:39:51 -07:00
parent f2d8fa2fe4
commit 74b0754f72
14 changed files with 64 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
domain-server/src/DomainGatekeeper.cpp
View file

@ -178,7 +178,7 @@ NodePermissions DomainGatekeeper::setPermissionsForUser(bool isLocalUser, QStrin
}
// If this user is a known member of a domain group, give them the implied permissions.
// Do before processing verifiedUsername in case user is logged into the Directory Services and is a member of a blacklist group.
// Do before processing verifiedUsername in case user is logged into the Directory Services and is a member of a blocklist group.
if (!verifiedDomainUserName.isEmpty()) {
auto userGroups = _domainGroupMemberships[verifiedDomainUserName];
foreach (QString userGroup, userGroups) {
@ -277,8 +277,8 @@ NodePermissions DomainGatekeeper::setPermissionsForUser(bool isLocalUser, QStrin
}
}
// if this user is a known member of a blacklist group, remove the implied permissions
foreach (QUuid groupID, _server->_settingsManager.getBlacklistGroupIDs()) {
// if this user is a known member of a blocklist group, remove the implied permissions
foreach (QUuid groupID, _server->_settingsManager.getBlocklistGroupIDs()) {
QUuid rankID = _server->_settingsManager.isGroupMember(verifiedUsername, groupID);
if (rankID != QUuid()) {
QUuid rankID = _server->_settingsManager.isGroupMember(verifiedUsername, groupID);
@ -287,7 +287,7 @@ NodePermissions DomainGatekeeper::setPermissionsForUser(bool isLocalUser, QStrin
GroupRank rank = _server->_settingsManager.getGroupRank(groupID, rankID);
#ifdef WANT_DEBUG
qDebug() << "| user-permissions: user is in blacklist group:" << groupID << " rank:" << rank.name
qDebug() << "| user-permissions: user is in blocklist group:" << groupID << " rank:" << rank.name
<< "so:" << userPerms;
#endif
}
@ -299,20 +299,20 @@ NodePermissions DomainGatekeeper::setPermissionsForUser(bool isLocalUser, QStrin
userPerms.setVerifiedUserName(verifiedUsername);
}
// If this user is a known member of an domain group that is blacklisted, remove the implied permissions.
// If this user is a known member of an domain group that is blocklisted, remove the implied permissions.
if (!verifiedDomainUserName.isEmpty()) {
auto userGroups = _domainGroupMemberships[verifiedDomainUserName];
foreach(QString userGroup, userGroups) {
// A domain group is signified by a leading special character, "@".
// Multiple domain groups may be specified in one domain server setting as a comma- and/or space-separated lists of
// domain group names. For example, "@silver @Gold, @platinum".
auto domainGroups = _server->_settingsManager.getDomainServerBlacklistGroupNames()
auto domainGroups = _server->_settingsManager.getDomainServerBlocklistGroupNames()
.filter(QRegularExpression("^(.*[\\s,])?" + QRegularExpression::escape(userGroup) + "([\\s,].*)?$",
QRegularExpression::CaseInsensitiveOption));
foreach(QString domainGroup, domainGroups) {
userPerms &= ~_server->_settingsManager.getForbiddensForGroup(domainGroup, QUuid());
#ifdef WANT_DEBUG
qDebug() << "| user-permissions: domain user is in blacklist group:" << domainGroup << "so:" << userPerms;
qDebug() << "| user-permissions: domain user is in blocklist group:" << domainGroup << "so:" << userPerms;
#endif
}
}
@ -1027,7 +1027,7 @@ void DomainGatekeeper::getGroupMemberships(const QString& username) {
QJsonObject json;
QSet<QString> groupIDSet;
foreach (QUuid groupID, _server->_settingsManager.getGroupIDs() + _server->_settingsManager.getBlacklistGroupIDs()) {
foreach (QUuid groupID, _server->_settingsManager.getGroupIDs() + _server->_settingsManager.getBlocklistGroupIDs()) {
groupIDSet += groupID.toString().mid(1,36);
}

6
domain-server/src/DomainServerExporter.cpp
View file

@ -254,9 +254,9 @@ static const QMap<QString, DomainServerExporter::MetricType> TYPE_MAP {
//
// For numeric values with an unit, instead of trying to parse it, the stats will just need to
// have a second copy of the metric added, with the value expressed as a number, with the original
// being blacklisted here.
// being blocklisted here.
static const QSet<QString> BLACKLIST = {
static const QSet<QString> BLOCKLIST = {
"asset_server_connection_stats_last_heard", // Timestamp as a string
"asset_server_username", // Username
"audio_mixer_listeners_jitter_downstream_avg_gap", // Number as string with unit name, alternative added
@ -379,7 +379,7 @@ void DomainServerExporter::generateMetricsFromJson(QTextStream& stream,
continue;
}
if (BLACKLIST.contains(metricName)) {
if (BLOCKLIST.contains(metricName)) {
continue;
}

10
domain-server/src/DomainServerSettingsManager.cpp
View file

@ -688,7 +688,7 @@ void DomainServerSettingsManager::packPermissions() {
// save settings for groups
packPermissionsForMap("permissions", _groupPermissions, GROUP_PERMISSIONS_KEYPATH);
// save settings for blacklist groups
// save settings for blocklist groups
packPermissionsForMap("permissions", _groupForbiddens, GROUP_FORBIDDENS_KEYPATH);
persistToFile();
@ -869,7 +869,7 @@ bool DomainServerSettingsManager::ensurePermissionsForGroupRanks() {
}
}
QList<QUuid> forbiddenGroupIDs = getBlacklistGroupIDs();
QList<QUuid> forbiddenGroupIDs = getBlocklistGroupIDs();
foreach (QUuid groupID, forbiddenGroupIDs) {
QString groupName = _groupNames[groupID];
QHash<QUuid, GroupRank>& ranksForGroup = _groupRanks[groupID];
@ -2038,7 +2038,7 @@ void DomainServerSettingsManager::apiRefreshGroupInformation() {
}
if (_groupIDs.contains(lowerGroupName)) {
// we already know about this one. recall setGroupID in case the group has been
// added to another section (the same group is found in both groups and blacklists).
// added to another section (the same group is found in both groups and blocklists).
changed = setGroupID(groupName, _groupIDs[lowerGroupName]);
continue;
}
@ -2245,7 +2245,7 @@ QList<QUuid> DomainServerSettingsManager::getGroupIDs() {
return result.values();
}
QList<QUuid> DomainServerSettingsManager::getBlacklistGroupIDs() {
QList<QUuid> DomainServerSettingsManager::getBlocklistGroupIDs() {
QSet<QUuid> result;
foreach (NodePermissionsKey groupKey, _groupForbiddens.keys()) {
if (_groupForbiddens[groupKey]->isGroup()) {
@ -2264,7 +2264,7 @@ QStringList DomainServerSettingsManager::getDomainServerGroupNames() {
return result.values();
}
QStringList DomainServerSettingsManager::getDomainServerBlacklistGroupNames() {
QStringList DomainServerSettingsManager::getDomainServerBlocklistGroupNames() {
// All names as listed in the domain server settings; not necessarily Directory Services groups.
QSet<QString> result;
foreach (NodePermissionsKey groupKey, _groupForbiddens.keys()) {

4
domain-server/src/DomainServerSettingsManager.h
View file

@ -135,10 +135,10 @@ public:
GroupRank getGroupRank(QUuid groupID, QUuid rankID) { return _groupRanks[groupID][rankID]; }
QList<QUuid> getGroupIDs();
QList<QUuid> getBlacklistGroupIDs();
QList<QUuid> getBlocklistGroupIDs();
QStringList getDomainServerGroupNames();
QStringList getDomainServerBlacklistGroupNames();
QStringList getDomainServerBlocklistGroupNames();
// these are used to locally cache the result of calling "/api/v1/groups/.../is_member/..." on Directory Services api
void clearGroupMemberships(const QString& name) { _groupMembership[name.toLower()].clear(); }

2
interface/src/main.cpp
View file

@ -286,7 +286,7 @@ int main(int argc, const char* argv[]) {
// "--qmljsdebugger", which appears in output from "--help-all".
// Those below don't seem to be optional.
// --ignore-gpu-blacklist
// --ignore-gpu-blocklist
// --suppress-settings-reset

4
libraries/networking/src/UserActivityLogger.cpp
View file

@ -137,7 +137,7 @@ void UserActivityLogger::changedDomain(QString domainURL) {
}
void UserActivityLogger::connectedDevice(QString typeOfDevice, QString deviceName) {
static QStringList DEVICE_BLACKLIST = {
static QStringList DEVICE_BLOCKLIST = {
"Desktop",
"NullDisplayPlugin",
"3D TV - Side by Side Stereo",
@ -145,7 +145,7 @@ void UserActivityLogger::connectedDevice(QString typeOfDevice, QString deviceNam
"Keyboard/Mouse"
};
if (DEVICE_BLACKLIST.contains(deviceName) || deviceName.isEmpty()) {
if (DEVICE_BLOCKLIST.contains(deviceName) || deviceName.isEmpty()) {
return;
}

4
scripts/developer/tests/raypickTester.js
View file

@ -36,8 +36,8 @@ var pickID = Picks.createPick(PickType.Ray, {
filter: PICK_FILTERS,
enabled: true,
});
var blacklist = [ overlayID ]; // exclude hover text from ray pick results
Picks.setIgnoreItems(pickID, blacklist);
var blocklist = [ overlayID ]; // exclude hover text from ray pick results
Picks.setIgnoreItems(pickID, blocklist);
Script.scriptEnding.connect(function() {
Picks.removePick(pickID);
});

48
scripts/system/controllers/controllerDispatcher.js
View file

@ -56,7 +56,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
this.veryhighVarianceCount = 0;
this.orderedPluginNames = [];
this.tabletID = null;
this.blacklist = [];
this.blocklist = [];
this.pointerManager = new PointerManager();
this.grabSphereOverlays = [null, null];
this.targetIDs = {};
@ -169,8 +169,8 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
this.setIgnorePointerItems = function() {
if (HMD.tabletID && HMD.tabletID !== this.tabletID) {
this.tabletID = HMD.tabletID;
Pointers.setIgnoreItems(_this.leftPointer, _this.blacklist);
Pointers.setIgnoreItems(_this.rightPointer, _this.blacklist);
Pointers.setIgnoreItems(_this.leftPointer, _this.blocklist);
Pointers.setIgnoreItems(_this.rightPointer, _this.blocklist);
}
};
@ -547,19 +547,19 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
}
};
this.leftBlacklistTabletIDs = [];
this.rightBlacklistTabletIDs = [];
this.leftBlocklistTabletIDs = [];
this.rightBlocklistTabletIDs = [];
this.setLeftBlacklist = function () {
Pointers.setIgnoreItems(_this.leftPointer, _this.blacklist.concat(_this.leftBlacklistTabletIDs));
this.setLeftBlocklist = function () {
Pointers.setIgnoreItems(_this.leftPointer, _this.blocklist.concat(_this.leftBlocklistTabletIDs));
};
this.setRightBlacklist = function () {
Pointers.setIgnoreItems(_this.rightPointer, _this.blacklist.concat(_this.rightBlacklistTabletIDs));
this.setRightBlocklist = function () {
Pointers.setIgnoreItems(_this.rightPointer, _this.blocklist.concat(_this.rightBlocklistTabletIDs));
};
this.setBlacklist = function() {
_this.setLeftBlacklist();
_this.setRightBlacklist();
this.setBlocklist = function() {
_this.setLeftBlocklist();
_this.setRightBlocklist();
};
var MAPPING_NAME = "com.highfidelity.controllerDispatcher";
@ -634,34 +634,34 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
var message;
if (sender === MyAvatar.sessionUUID) {
try {
if (channel === 'Hifi-Hand-RayPick-Blacklist') {
if (channel === 'Hifi-Hand-RayPick-Blocklist') {
message = JSON.parse(data);
var action = message.action;
var id = message.id;
var index = _this.blacklist.indexOf(id);
var index = _this.blocklist.indexOf(id);
if (action === 'add' && index === -1) {
_this.blacklist.push(id);
_this.setBlacklist();
_this.blocklist.push(id);
_this.setBlocklist();
}
if (action === 'remove') {
if (index > -1) {
_this.blacklist.splice(index, 1);
_this.setBlacklist();
_this.blocklist.splice(index, 1);
_this.setBlocklist();
}
}
if (action === "tablet") {
var tabletIDs = message.blacklist ?
var tabletIDs = message.blocklist ?
[HMD.tabletID, HMD.tabletScreenID, HMD.homeButtonID, HMD.homeButtonHighlightID] :
[];
if (message.hand === LEFT_HAND) {
_this.leftBlacklistTabletIDs = tabletIDs;
_this.setLeftBlacklist();
_this.leftBlocklistTabletIDs = tabletIDs;
_this.setLeftBlocklist();
} else {
_this.rightBlacklistTabletIDs = tabletIDs;
_this.setRightBlacklist();
_this.rightBlocklistTabletIDs = tabletIDs;
_this.setRightBlocklist();
}
}
}
@ -737,7 +737,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
Entities.mousePressOnEntity.connect(mousePress);
var controllerDispatcher = new ControllerDispatcher();
Messages.subscribe('Hifi-Hand-RayPick-Blacklist');
Messages.subscribe('Hifi-Hand-RayPick-Blocklist');
Messages.messageReceived.connect(controllerDispatcher.handleMessage);
Picks.handLaserDelayChanged.connect(controllerDispatcher.handLaserDelayChanged);

4
scripts/system/controllers/controllerModules/farActionGrabEntity.js
View file

@ -299,7 +299,7 @@ Script.include("/~/system/libraries/controllers.js");
action: 'remove',
id: this.ignoredEntities[i]
};
Messages.sendMessage('Hifi-Hand-RayPick-Blacklist', JSON.stringify(data));
Messages.sendMessage('Hifi-Hand-RayPick-Blocklist', JSON.stringify(data));
}
this.ignoredEntities = [];
};
@ -394,7 +394,7 @@ Script.include("/~/system/libraries/controllers.js");
action: 'add',
id: intersection.objectID
};
Messages.sendMessage('Hifi-Hand-RayPick-Blacklist', JSON.stringify(data));
Messages.sendMessage('Hifi-Hand-RayPick-Blocklist', JSON.stringify(data));
this.ignoredEntities.push(intersection.objectID);
}
}

6
scripts/system/controllers/controllerModules/inEditMode.js
View file

@ -229,7 +229,7 @@ Script.include("/~/system/libraries/utils.js");
enableDispatcherModule("RightHandInEditMode", rightHandInEditMode);
var INEDIT_STATUS_CHANNEL = "Hifi-InEdit-Status";
var HAND_RAYPICK_BLACKLIST_CHANNEL = "Hifi-Hand-RayPick-Blacklist";
var HAND_RAYPICK_BLOCKLIST_CHANNEL = "Hifi-Hand-RayPick-Blocklist";
this.handleMessage = function (channel, data, sender) {
if (channel === INEDIT_STATUS_CHANNEL && sender === MyAvatar.sessionUUID) {
var message;
@ -247,10 +247,10 @@ Script.include("/~/system/libraries/utils.js");
} else {
rightHandInEditMode.isEditing = message.editing;
}
Messages.sendLocalMessage(HAND_RAYPICK_BLACKLIST_CHANNEL, JSON.stringify({
Messages.sendLocalMessage(HAND_RAYPICK_BLOCKLIST_CHANNEL, JSON.stringify({
action: "tablet",
hand: message.hand,
blacklist: message.editing
blocklist: message.editing
}));
break;
}

6
scripts/system/controllers/controllerModules/inVREditMode.js
View file

@ -146,7 +146,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
enableDispatcherModule("RightHandInVREditMode", rightHandInVREditMode);
var INVREDIT_STATUS_CHANNEL = "Hifi-InVREdit-Status";
var HAND_RAYPICK_BLACKLIST_CHANNEL = "Hifi-Hand-RayPick-Blacklist";
var HAND_RAYPICK_BLOCKLIST_CHANNEL = "Hifi-Hand-RayPick-Blocklist";
this.handleMessage = function (channel, data, sender) {
if (channel === INVREDIT_STATUS_CHANNEL && sender === MyAvatar.sessionUUID) {
var message;
@ -168,10 +168,10 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
} else {
rightHandInVREditMode.isEditing = message.editing;
}
Messages.sendLocalMessage(HAND_RAYPICK_BLACKLIST_CHANNEL, JSON.stringify({
Messages.sendLocalMessage(HAND_RAYPICK_BLOCKLIST_CHANNEL, JSON.stringify({
action: "tablet",
hand: message.hand,
blacklist: message.editing
blocklist: message.editing
}));
break;
}

6
scripts/system/controllers/controllerModules/webSurfaceLaserInput.js
View file

@ -113,7 +113,7 @@ Script.include("/~/system/libraries/controllers.js");
action: 'add',
id: objectID
};
Messages.sendMessage('Hifi-Hand-RayPick-Blacklist', JSON.stringify(data));
Messages.sendMessage('Hifi-Hand-RayPick-Blocklist', JSON.stringify(data));
this.ignoredObjects.push(objectID);
}
} else if (intersection.type === Picks.INTERSECTED_ENTITY) {
@ -122,7 +122,7 @@ Script.include("/~/system/libraries/controllers.js");
action: 'add',
id: objectID
};
Messages.sendMessage('Hifi-Hand-RayPick-Blacklist', JSON.stringify(data));
Messages.sendMessage('Hifi-Hand-RayPick-Blocklist', JSON.stringify(data));
this.ignoredObjects.push(objectID);
}
}
@ -134,7 +134,7 @@ Script.include("/~/system/libraries/controllers.js");
action: 'remove',
id: this.ignoredObjects[index]
};
Messages.sendMessage('Hifi-Hand-RayPick-Blacklist', JSON.stringify(data));
Messages.sendMessage('Hifi-Hand-RayPick-Blocklist', JSON.stringify(data));
}
this.ignoredObjects = [];

8
unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js
View file

@ -119,14 +119,14 @@
},
removeCurrentBigVersion: function(rotatorBlock) {
var blacklistKey = 'Hifi-Hand-RayPick-Blacklist';
var blocklistKey = 'Hifi-Hand-RayPick-Blocklist';
var myProps = Entities.getEntityProperties(_this.entityID);
var results = Entities.findEntities(myProps.position, 10);
results.forEach(function(result) {
var resultProps = Entities.getEntityProperties(result);
if (resultProps.name === "hifi-home-dressing-room-big-transformer") {
Messages.sendMessage(blacklistKey, JSON.stringify({
Messages.sendMessage(blocklistKey, JSON.stringify({
action: 'remove',
id: result
}));
@ -192,8 +192,8 @@
var bigVersion = Entities.addEntity(bigVersionProps);
var blacklistKey = 'Hifi-Hand-RayPick-Blacklist';
Messages.sendMessage(blacklistKey, JSON.stringify({
var blocklistKey = 'Hifi-Hand-RayPick-Blocklist';
Messages.sendMessage(blocklistKey, JSON.stringify({
action: 'add',
id: bigVersion
}));

4
unpublishedScripts/DomainContent/Home/hoverGame/hoverContainer.js
View file

@ -12,14 +12,14 @@
action: 'add',
id: this.entityID
};
Messages.sendLocalMessage('Hifi-Hand-RayPick-Blacklist', JSON.stringify(data))
Messages.sendLocalMessage('Hifi-Hand-RayPick-Blocklist', JSON.stringify(data))
},
unload: function() {
var data = {
action: 'remove',
id: this.entityID
};
Messages.sendLocalMessage('Hifi-Hand-RayPick-Blacklist', JSON.stringify(data))
Messages.sendLocalMessage('Hifi-Hand-RayPick-Blocklist', JSON.stringify(data))
}
}