vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-01 20:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

zalouser: resolve groupAllowFrom names to ids

Browse Source
This commit is contained in:
Tom
2026-03-04 14:30:33 +07:00
parent 6b5db7c8b9
commit 474bc798b9
1 changed files with 65 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
extensions/zalouser/src/monitor.ts
View File

@@ -79,6 +79,35 @@ function buildNameIndex<T>(items: T[], nameFn: (item: T) => string | undefined):
return index;
}
function resolveUserAllowlistEntries(
entries: string[],
byName: Map<string, Array<{ userId: string }>>,
): {
additions: string[];
mapping: string[];
unresolved: string[];
} {
const additions: string[] = [];
const mapping: string[] = [];
const unresolved: string[] = [];
for (const entry of entries) {
if (/^\d+$/.test(entry)) {
additions.push(entry);
continue;
}
const matches = byName.get(entry.toLowerCase()) ?? [];
const match = matches[0];
const id = match?.userId ? String(match.userId) : undefined;
if (id) {
additions.push(id);
mapping.push(`${entry}->${id}`);
} else {
unresolved.push(entry);
}
}
return { additions, mapping, unresolved };
}
type ZalouserCoreRuntime = ReturnType<typeof getZalouserRuntime>;
type ZalouserGroupHistoryState = {
@@ -680,37 +709,46 @@ export async function monitorZalouserProvider(
const allowFromEntries = (account.config.allowFrom ?? [])
.map((entry) => normalizeZalouserEntry(String(entry)))
.filter((entry) => entry && entry !== "*");
const groupAllowFromEntries = (account.config.groupAllowFrom ?? [])
.map((entry) => normalizeZalouserEntry(String(entry)))
.filter((entry) => entry && entry !== "*");
if (allowFromEntries.length > 0) {
if (allowFromEntries.length > 0 || groupAllowFromEntries.length > 0) {
const friends = await listZaloFriends(profile);
const byName = buildNameIndex(friends, (friend) => friend.displayName);
const additions: string[] = [];
const mapping: string[] = [];
const unresolved: string[] = [];
for (const entry of allowFromEntries) {
if (/^\d+$/.test(entry)) {
additions.push(entry);
continue;
}
const matches = byName.get(entry.toLowerCase()) ?? [];
const match = matches[0];
const id = match?.userId ? String(match.userId) : undefined;
if (id) {
additions.push(id);
mapping.push(`${entry}→${id}`);
} else {
unresolved.push(entry);
}
if (allowFromEntries.length > 0) {
const { additions, mapping, unresolved } = resolveUserAllowlistEntries(
allowFromEntries,
byName,
);
const allowFrom = mergeAllowlist({ existing: account.config.allowFrom, additions });
account = {
...account,
config: {
...account.config,
allowFrom,
},
};
summarizeMapping("zalouser users", mapping, unresolved, runtime);
}
if (groupAllowFromEntries.length > 0) {
const { additions, mapping, unresolved } = resolveUserAllowlistEntries(
groupAllowFromEntries,
byName,
);
const groupAllowFrom = mergeAllowlist({
existing: account.config.groupAllowFrom,
additions,
});
account = {
...account,
config: {
...account.config,
groupAllowFrom,
},
};
summarizeMapping("zalouser group users", mapping, unresolved, runtime);
}
const allowFrom = mergeAllowlist({ existing: account.config.allowFrom, additions });
account = {
...account,
config: {
...account.config,
allowFrom,
},
};
summarizeMapping("zalouser users", mapping, unresolved, runtime);
}
const groupsConfig = account.config.groups ?? {};