diff --git a/backend/src/support-chat/support-chat.dto.ts b/backend/src/support-chat/support-chat.dto.ts index b4617fdd..0bfdd94e 100644 --- a/backend/src/support-chat/support-chat.dto.ts +++ b/backend/src/support-chat/support-chat.dto.ts @@ -1,5 +1,4 @@ -import { IsIn, IsString, Length } from 'class-validator'; +import { IsString, Length } from 'class-validator'; export class SupportChatDto { @IsString() @Length(1, 1500) message!: string; - @IsIn(['public', 'orders', 'wallet']) scope: 'public' | 'orders' | 'wallet' = 'public'; } diff --git a/backend/src/support-chat/support-chat.http.spec.ts b/backend/src/support-chat/support-chat.http.spec.ts index f1a6542c..f96a9436 100644 --- a/backend/src/support-chat/support-chat.http.spec.ts +++ b/backend/src/support-chat/support-chat.http.spec.ts @@ -22,20 +22,28 @@ describe('support HTTP boundary', () => { app = mod.createNestApplication(); app.useGlobalPipes(new ValidationPipe({ transform: true, whitelist: true, forbidNonWhitelisted: true })); await app.init(); }); afterAll(() => app.close()); - beforeEach(() => { jest.clearAllMocks(); }); - it.each(['userId','history','context','sessionId','conversationId'])('rejects untrusted %s', async field => { await request(app.getHttpServer()).post('/support-chat/ask').send({message:'سلام', [field]:'alice'}).expect(400); }); + beforeEach(() => { + jest.restoreAllMocks(); jest.clearAllMocks(); + process.env.SUPPORT_CHAT_URL='http://internal/ask'; process.env.SUPPORT_CHAT_KEY='test'; + jest.spyOn(global,'fetch').mockImplementation(async (url, opts) => { + const message=JSON.parse(opts!.body as string).message; + const intent=message==='کیف پول'?'wallet':message==='سفارش من'||message==='سفارش'?'orders':'public'; + return {ok:true,status:200,json:async()=>String(url).endsWith('/classify')?{intent}:{answer:'راهنمای محصولات کنینا'}} as any; + }); + }); + it.each(['scope','userId','history','context','sessionId','conversationId'])('rejects untrusted %s', async field => { await request(app.getHttpServer()).post('/support-chat/ask').send({message:'سلام', [field]:'alice'}).expect(400); }); it.each(['Bearer broken','Basic abc','', 'Bearer '])('rejects supplied invalid auth %j', async auth => { await request(app.getHttpServer()).post('/support-chat/ask').set('Authorization',auth).send({message:'سلام'}).expect(401); }); - it('fails closed when configured JWT secret is missing', async () => { const saved=process.env.JWT_ACCESS_SECRET; delete process.env.JWT_ACCESS_SECRET; await request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub:'alice'})).send({message:'کیف پول',scope:'wallet'}).expect(401); process.env.JWT_ACCESS_SECRET=saved; }); + it('fails closed when configured JWT secret is missing', async () => { const saved=process.env.JWT_ACCESS_SECRET; delete process.env.JWT_ACCESS_SECRET; await request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub:'alice'})).send({message:'کیف پول'}).expect(401); process.env.JWT_ACCESS_SECRET=saved; }); it('rejects expired JWT', async () => { await request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub:'alice'}, {expiresIn:-1})).send({message:'سلام'}).expect(401); }); it('rejects cookie JWT rather than downgrading to guest', async () => { await request(app.getHttpServer()).post('/support-chat/ask').set('Cookie','accessToken=broken').send({message:'سلام'}).expect(401); }); - it('guest orders do not touch any private rows', async () => { const r=await request(app.getHttpServer()).post('/support-chat/ask').send({message:'سفارش من',scope:'orders'}).expect(201); expect(r.body.answer).toContain('وارد'); expect(prisma.order.findMany).not.toHaveBeenCalled(); }); + it('guest orders do not touch any private rows', async () => { const r=await request(app.getHttpServer()).post('/support-chat/ask').send({message:'سفارش من'}).expect(201); expect(r.body.answer).toContain('وارد'); expect(prisma.order.findMany).not.toHaveBeenCalled(); }); it('scopes wallet to validated identity across concurrent callers', async () => { - const replies=await Promise.all(['alice','bob'].map(sub => request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub})).send({message:'کیف پول',scope:'wallet'}).expect(201))); + const replies=await Promise.all(['alice','bob'].map(sub => request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub})).send({message:'کیف پول'}).expect(201))); expect(replies[0].body.answer).toContain('11'); expect(replies[0].body.answer).not.toContain('22'); expect(replies[1].body.answer).toContain('22'); expect(prisma.product.findMany).not.toHaveBeenCalled(); }); - it('scopes bounded orders to identity', async () => { const r=await request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub:'bob'})).send({message:'سفارش',scope:'orders'}).expect(201); expect(r.body.answer).toContain('bob-order'); expect(prisma.order.findMany).toHaveBeenCalledWith(expect.objectContaining({ where:{userId:'bob'}, take:5 })); }); + it('scopes bounded orders to identity', async () => { const r=await request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub:'bob'})).send({message:'سفارش'}).expect(201); expect(r.body.answer).toContain('bob-order'); expect(prisma.order.findMany).toHaveBeenCalledWith(expect.objectContaining({ where:{userId:'bob'}, take:5 })); }); it.each(['', 'x'.repeat(1501)])('bounds message length', async message => { await request(app.getHttpServer()).post('/support-chat/ask').send({message}).expect(400); }); - it('does not query private data in public scope even with valid JWT', async () => { await request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub:'alice'})).send({message:'سلام',scope:'public'}); expect(prisma.user.findUnique).not.toHaveBeenCalled(); expect(prisma.order.findMany).not.toHaveBeenCalled(); }); + it('does not query private data in public scope even with valid JWT', async () => { await request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub:'alice'})).send({message:'سلام'}); expect(prisma.user.findUnique).not.toHaveBeenCalled(); expect(prisma.order.findMany).not.toHaveBeenCalled(); }); it.each([{error:'upstream-secret'}, {answer:'Provider authentication failed Hermes'}, {answer:''}])('filters malformed and default upstream failures', async body => { process.env.SUPPORT_CHAT_URL='http://internal/ask'; process.env.SUPPORT_CHAT_KEY='test'; const f=jest.spyOn(global,'fetch').mockResolvedValue({ok:true,json:async()=>body} as any); const r=await request(app.getHttpServer()).post('/support-chat/ask').send({message:'مکمل سگ'}).expect(503); expect(r.body.message).toBe(UNAVAILABLE); expect(JSON.stringify(r.body)).not.toContain('upstream-secret'); f.mockRestore(); }); it('returns safe unavailable on network errors', async () => { const f=jest.spyOn(global,'fetch').mockRejectedValue(new Error('private-secret')); const r=await request(app.getHttpServer()).post('/support-chat/ask').send({message:'مکمل سگ'}).expect(503); expect(r.body.message).toBe(UNAVAILABLE); f.mockRestore(); }); }); diff --git a/backend/src/support-chat/support-chat.service.spec.ts b/backend/src/support-chat/support-chat.service.spec.ts index 2eb8736c..4389c0bb 100644 --- a/backend/src/support-chat/support-chat.service.spec.ts +++ b/backend/src/support-chat/support-chat.service.spec.ts @@ -1,13 +1,13 @@ import { SupportChatService, UNAVAILABLE } from './support-chat.service'; -describe('SupportChatService', () => { - const prisma: any = { product: { findMany: jest.fn().mockResolvedValue([]) }, order: { findMany: jest.fn().mockResolvedValue([]) }, user: { findUnique: jest.fn().mockResolvedValue({ walletBalance: '17' }) } }; - let service: SupportChatService; - beforeEach(() => { jest.clearAllMocks(); service = new SupportChatService(prisma); }); - it('does not load private rows for a guest asking about wallet', async () => { - const result = await service.ask({ message: 'موجودی کیف پول من', scope: 'wallet' }); - expect(result.answer).toContain('وارد'); - expect(prisma.user.findUnique).not.toHaveBeenCalled(); - expect(prisma.order.findMany).not.toHaveBeenCalled(); - }); +describe('model intent routing', () => { + const prisma: any = { product:{findMany:jest.fn().mockResolvedValue([])}, order:{findMany:jest.fn().mockResolvedValue([])}, user:{findUnique:jest.fn().mockResolvedValue({walletBalance:'17'})} }; + let service: SupportChatService; + beforeEach(()=>{jest.clearAllMocks();process.env.SUPPORT_CHAT_URL='http://internal/ask';process.env.SUPPORT_CHAT_KEY='test';service=new SupportChatService(prisma);}); + afterEach(()=>jest.restoreAllMocks()); + function model(body:any) { return jest.spyOn(global,'fetch').mockResolvedValue({ok:true,json:async()=>body} as any); } + it('guest model wallet does not load private rows',async()=>{model({intent:'wallet'});expect((await service.ask({message:'cheghadr etebar daram'})).answer).toContain('وارد');expect(prisma.user.findUnique).not.toHaveBeenCalled();expect(prisma.order.findMany).not.toHaveBeenCalled();}); + it('uses semantic model intent rather than message keywords',async()=>{const f=model({intent:'wallet'});expect((await service.ask({message:'چقدر اعتبار دارم؟'},{id:'alice'})).answer).toContain('17');expect(prisma.user.findUnique).toHaveBeenCalledWith({where:{id:'alice'},select:{walletBalance:true}});expect(JSON.parse(f.mock.calls[0][1]!.body as string)).toEqual({message:'چقدر اعتبار دارم؟'});expect(f).toHaveBeenCalledTimes(1);}); + it.each([{intent:'admin'},{intent:'wallet',userId:'bob'},{answer:'orders'},{intent:null},{}])('fails closed on invalid classifier %j',async body=>{model(body);await expect(service.ask({message:'سلام'},{id:'alice'})).rejects.toThrow(UNAVAILABLE);expect(prisma.user.findUnique).not.toHaveBeenCalled();expect(prisma.order.findMany).not.toHaveBeenCalled();expect(prisma.product.findMany).not.toHaveBeenCalled();}); + it('classifier outage does not fall back to keyword routing',async()=>{jest.spyOn(global,'fetch').mockRejectedValue(new Error('secret'));await expect(service.ask({message:'کیف پول'},{id:'alice'})).rejects.toThrow(UNAVAILABLE);expect(prisma.user.findUnique).not.toHaveBeenCalled();}); }); diff --git a/backend/src/support-chat/support-chat.service.ts b/backend/src/support-chat/support-chat.service.ts index 11b2fd5a..b8127f75 100644 --- a/backend/src/support-chat/support-chat.service.ts +++ b/backend/src/support-chat/support-chat.service.ts @@ -7,13 +7,25 @@ export const UNAVAILABLE = 'پشتیبان هوشمند فعلاً در دستر export class SupportChatService { constructor(private readonly prisma: PrismaService) {} async ask(input: SupportChatDto, user?: { id: string }) { - if (input.scope !== 'public' && !user) return { answer: 'برای مشاهده سفارش‌ها یا کیف پول خود ابتدا وارد حساب کاربری شوید.' }; - if (input.scope === 'wallet') { + const url = process.env.SUPPORT_CHAT_URL; + const key = process.env.SUPPORT_CHAT_KEY; + let intent: 'public' | 'orders' | 'wallet'; + try { + if (!url || !key || !url.endsWith('/ask')) throw new Error('disabled'); + const response = await fetch(url.replace(/\/ask$/, '/classify'), { method: 'POST', headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${key}` }, signal: AbortSignal.timeout(45000), body: JSON.stringify({ message: input.message }) }); + if (response.status === 400) return { answer: 'فقط درباره محصولات و سلامت حیوانات خانگی و خدمات کنینا پاسخ می‌دهم. پیوند دلخواه پذیرفته نمی‌شود.' }; + if (!response.ok) throw new Error('upstream'); + const data = await response.json(); + if (!data || Object.keys(data).length !== 1 || !['public', 'orders', 'wallet'].includes(data.intent)) throw new Error('intent'); + intent = data.intent; + } catch { throw new ServiceUnavailableException(UNAVAILABLE); } + if (intent !== 'public' && !user) return { answer: 'برای مشاهده سفارش‌ها یا کیف پول خود ابتدا وارد حساب کاربری شوید.' }; + if (intent === 'wallet') { const row = await this.prisma.user.findUnique({ where: { id: user!.id }, select: { walletBalance: true } }); if (!row) throw new ServiceUnavailableException(UNAVAILABLE); return { answer: `موجودی کیف پول شما: ${row.walletBalance.toString()} تومان.` }; } - if (input.scope === 'orders') { + if (intent === 'orders') { const rows = await this.prisma.order.findMany({ where: { userId: user!.id }, select: { id: true, status: true, totalAmount: true, createdAt: true }, take: 5, orderBy: { createdAt: 'desc' } }); return { answer: rows.length ? rows.map(r => `سفارش ${r.id}: ${r.status} — ${r.totalAmount.toString()} تومان`).join('\n') : 'سفارشی برای حساب شما ثبت نشده است.' }; } diff --git a/frontend/application/components/SupportChat.test.tsx b/frontend/application/components/SupportChat.test.tsx index d32e4c2a..6e65b327 100644 --- a/frontend/application/components/SupportChat.test.tsx +++ b/frontend/application/components/SupportChat.test.tsx @@ -5,13 +5,14 @@ import { render, screen, fireEvent, waitFor, cleanup } from '@testing-library/re import SupportChat from './SupportChat'; afterEach(() => { cleanup(); vi.restoreAllMocks(); localStorage.clear(); }); describe('support widget', () => { - it('submits only message and explicit scope, renders text safely', async () => { + it('submits only message without scope tabs, renders text safely', async () => { const fetcher=vi.spyOn(globalThis,'fetch').mockResolvedValue({ok:true,json:async()=>({answer:''})} as Response); render(); fireEvent.click(screen.getByRole('button',{name:/گفتگو با پشتیبان/})); fireEvent.change(screen.getByLabelText('پیام شما'),{target:{value:'مکمل سگ'}}); fireEvent.click(screen.getByRole('button',{name:'ارسال'})); await waitFor(()=>expect(screen.getByText('')).toBeTruthy()); - expect(JSON.parse(fetcher.mock.calls[0][1]!.body as string)).toEqual({message:'مکمل سگ',scope:'public'}); + expect(JSON.parse(fetcher.mock.calls[0][1]!.body as string)).toEqual({message:'مکمل سگ'}); expect(document.querySelector('script')).toBeNull(); + for (const label of ['محصولات و عمومی','سفارش‌های من','کیف پول']) expect(screen.queryByRole('button',{name:label})).toBeNull(); }); it('does not expose upstream errors', async()=> { vi.spyOn(globalThis,'fetch').mockResolvedValue({ok:false,status:503,json:async()=>({message:'secret-provider'})} as Response); diff --git a/frontend/application/components/SupportChat.tsx b/frontend/application/components/SupportChat.tsx index 57f72732..d496c942 100644 --- a/frontend/application/components/SupportChat.tsx +++ b/frontend/application/components/SupportChat.tsx @@ -13,7 +13,6 @@ const token = () => { export default function SupportChat() { const [open, setOpen] = useState(false); const [message, setMessage] = useState(''); - const [scope, setScope] = useState<'public' | 'orders' | 'wallet'>('public'); const [busy, setBusy] = useState(false); const [rows, setRows] = useState<{ question: string; answer: string }[]>([]); const identity = useRef(''); @@ -28,7 +27,6 @@ export default function SupportChat() { pending.current?.abort(); setRows([]); setMessage(''); - setScope('public'); setBusy(false); } }; @@ -72,7 +70,7 @@ export default function SupportChat() { ...(current ? { Authorization: `Bearer ${current}` } : {}) }, credentials: 'include', - body: JSON.stringify({ message: question, scope }), + body: JSON.stringify({ message: question }), signal: AbortSignal.any([controller.signal, AbortSignal.timeout(50000)]) }); if (response.status === 401) { @@ -151,43 +149,6 @@ export default function SupportChat() { - {/* Scope Selector Bar */} -
- - - -
- {/* Message Area */}
orders; cheghadr etebar daram => wallet; chetor sefaresh bedam => public.') + return safe_intent(agent.run_conversation(json.dumps({'message': message}, ensure_ascii=False), system_message=prompt, conversation_history=[])) + finally: + with contextlib.suppress(Exception): agent.close() + +async def classify(request): + key = os.environ.get('SUPPORT_INTERNAL_KEY', '') + if len(key) < 32 or not hmac.compare_digest(request.headers.get('Authorization', ''), 'Bearer '+key): + return web.json_response({'answer': UNAVAILABLE}, status=401) + try: + data = await request.json() + if not isinstance(data, dict) or set(data) != {'message'}: raise ValueError('payload') + message = validate_message(data['message']) + except Exception: + return web.json_response({'answer': DOMAIN}, status=400) + if LIMIT.locked(): return web.json_response({'answer': UNAVAILABLE}, status=503) + try: + async with LIMIT: + intent = await asyncio.to_thread(classify_once, message) + return web.json_response({'intent': intent}, headers={'Cache-Control': 'no-store'}) + except Exception: + return web.json_response({'answer': UNAVAILABLE}, status=503) + async def ask(request): key = os.environ.get('SUPPORT_INTERNAL_KEY', '') if len(key) < 32 or not hmac.compare_digest(request.headers.get('Authorization', ''), 'Bearer '+key): @@ -73,5 +109,6 @@ async def ask(request): app = web.Application(client_max_size=100000) app.router.add_post('/support/ask', ask) +app.router.add_post('/support/classify', classify) if __name__ == '__main__': web.run_app(app, host='0.0.0.0', port=8643, print=None, access_log=None) diff --git a/scripts/support-chat/test_policy.py b/scripts/support-chat/test_policy.py index 3a2fcce1..264aa44a 100644 --- a/scripts/support-chat/test_policy.py +++ b/scripts/support-chat/test_policy.py @@ -1,3 +1,4 @@ +import json import unittest from policy import validate_message, safe_answer @@ -39,3 +40,15 @@ class PolicyTests(unittest.TestCase): if __name__ == '__main__': unittest.main() + + +class IntentPolicyTests(unittest.TestCase): + def test_allowlisted_intents(self): + from policy import safe_intent + for intent in ('public', 'orders', 'wallet'): + self.assertEqual(safe_intent({'final_response': json.dumps({'intent': intent})}), intent) + def test_invalid_intents_fail_closed(self): + from policy import safe_intent + for value in ('{}', '{"intent":"admin"}', '{"intent":"wallet","userId":"other"}', 'garbage'): + with self.assertRaises((ValueError, TypeError)): + safe_intent({'final_response': value}) diff --git a/scripts/support-chat/verify-stage.cjs b/scripts/support-chat/verify-stage.cjs index f4a957e3..18c56031 100644 --- a/scripts/support-chat/verify-stage.cjs +++ b/scripts/support-chat/verify-stage.cjs @@ -15,11 +15,13 @@ async function check(name, body, expected, token, test=()=>true){ const ids=[randomUUID(),randomUUID()]; try { for(let i=0;i<2;i++)await p.user.create({data:{id:ids[i],firstName:'Synthetic',lastName:'ChatTest',mobile:'T'+ids[i].replaceAll('-','').slice(0,13),walletBalance:i?222:111}}); - await check('guest wallet',{message:'کیف پول',scope:'wallet'},201,null,d=>d.answer.includes('وارد')); + await check('guest wallet',{message:'کیف پول'},201,null,d=>d.answer.includes('وارد')); + await check('guest orders real model',{message:'سفارشم کجا رسیده؟'},201,null,d=>d.answer.includes('وارد')); + await check('guest orders Finglish real model',{message:'sefaresham koja reside?'},201,null,d=>d.answer.includes('وارد')); await check('invalid JWT',{message:'سلام'},401,'invalid'); await check('expired JWT',{message:'سلام'},401,jwt.sign({sub:ids[0]},{expiresIn:-1})); - for(const field of ['userId','history','context','sessionId'])await check('reject '+field,{message:'سلام',[field]:ids[1]},400); - await Promise.all(ids.map((id,i)=>check('wallet isolation '+i,{message:'کیف پول',scope:'wallet'},201,jwt.sign({sub:id}),d=>d.answer.includes(i?'222':'111')&&!d.answer.includes(i?'111':'222')))); + for(const field of ['scope','userId','history','context','sessionId'])await check('reject '+field,{message:'سلام',[field]:ids[1]},400); + await Promise.all(ids.map((id,i)=>check('wallet isolation '+i,{message:'کیف پول'},201,jwt.sign({sub:id}),d=>d.answer.includes(i?'222':'111')&&!d.answer.includes(i?'111':'222')))); await check('guest public real model',{message:'مکمل سگ کنینا'},201,null,d=>typeof d.answer==='string'&&!/provider|hermes|api.key/i.test(d.answer)); await new Promise(resolve=>setTimeout(resolve,61000)); await check('finglish dog query allowed',{message:'Sagam qaza nemikhore chizi darin?'},201,null,d=>typeof d.answer==='string'&&d.answer.length>10);