mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-09 15:24:32 +00:00
refactor(telegram): dedupe group auth checks
This commit is contained in:
@@ -171,6 +171,22 @@ async function resolveTelegramCommandAuth(params: {
|
|||||||
const senderId = senderIdRaw ? String(senderIdRaw) : "";
|
const senderId = senderIdRaw ? String(senderIdRaw) : "";
|
||||||
const senderUsername = msg.from?.username ?? "";
|
const senderUsername = msg.from?.username ?? "";
|
||||||
|
|
||||||
|
const isGroupSenderAllowed = () =>
|
||||||
|
senderIdRaw != null &&
|
||||||
|
isSenderAllowed({
|
||||||
|
allow: effectiveGroupAllow,
|
||||||
|
senderId: String(senderIdRaw),
|
||||||
|
senderUsername,
|
||||||
|
});
|
||||||
|
|
||||||
|
const rejectNotAuthorized = async () => {
|
||||||
|
await withTelegramApiErrorLogging({
|
||||||
|
operation: "sendMessage",
|
||||||
|
fn: () => bot.api.sendMessage(chatId, "You are not authorized to use this command."),
|
||||||
|
});
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
|
||||||
if (isGroup && groupConfig?.enabled === false) {
|
if (isGroup && groupConfig?.enabled === false) {
|
||||||
await withTelegramApiErrorLogging({
|
await withTelegramApiErrorLogging({
|
||||||
operation: "sendMessage",
|
operation: "sendMessage",
|
||||||
@@ -186,19 +202,8 @@ async function resolveTelegramCommandAuth(params: {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
if (requireAuth && isGroup && hasGroupAllowOverride) {
|
if (requireAuth && isGroup && hasGroupAllowOverride) {
|
||||||
if (
|
if (!isGroupSenderAllowed()) {
|
||||||
senderIdRaw == null ||
|
return await rejectNotAuthorized();
|
||||||
!isSenderAllowed({
|
|
||||||
allow: effectiveGroupAllow,
|
|
||||||
senderId: String(senderIdRaw),
|
|
||||||
senderUsername,
|
|
||||||
})
|
|
||||||
) {
|
|
||||||
await withTelegramApiErrorLogging({
|
|
||||||
operation: "sendMessage",
|
|
||||||
fn: () => bot.api.sendMessage(chatId, "You are not authorized to use this command."),
|
|
||||||
});
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -213,19 +218,8 @@ async function resolveTelegramCommandAuth(params: {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
if (groupPolicy === "allowlist" && requireAuth) {
|
if (groupPolicy === "allowlist" && requireAuth) {
|
||||||
if (
|
if (!isGroupSenderAllowed()) {
|
||||||
senderIdRaw == null ||
|
return await rejectNotAuthorized();
|
||||||
!isSenderAllowed({
|
|
||||||
allow: effectiveGroupAllow,
|
|
||||||
senderId: String(senderIdRaw),
|
|
||||||
senderUsername,
|
|
||||||
})
|
|
||||||
) {
|
|
||||||
await withTelegramApiErrorLogging({
|
|
||||||
operation: "sendMessage",
|
|
||||||
fn: () => bot.api.sendMessage(chatId, "You are not authorized to use this command."),
|
|
||||||
});
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const groupAllowlist = resolveGroupPolicy(chatId);
|
const groupAllowlist = resolveGroupPolicy(chatId);
|
||||||
|
|||||||
Reference in New Issue
Block a user