serverless-ircd 0.7.0 → 0.8.0

package/packages/irc-core/tests/commands/privmsg.test.ts

@@ -958,3 +958,150 @@ describe('privmsgChannelReducer — chathistory recording', () => {
     expect(recorded.map((m) => m.msgid)).toEqual(['nonce-0', 'nonce-1']);
   });
 });
+
+// ============================================================================
+// channelReducer — ChanServ +R (block unidentified PRIVMSG)
+// ============================================================================
+
+describe('privmsgChannelReducer — +R (block unidentified PRIVMSG)', () => {
+  it('rejects an unidentified member with 404 ERR_CANNOTSENDTOCHAN', () => {
+    const chan = makeChan('#foo');
+    chan.modes.blockUnidentified = true;
+    addMember(chan, 'c1', 'guest');
+    const conn = makeConn('c1', 'guest');
+    // guest has no account.
+    const ctx = makeCtx(conn);
+
+    const out = privmsgChannelReducer(
+      chan,
+      { command: 'PRIVMSG', params: ['#foo', 'hello'], tags: {} },
+      ctx,
+    );
+
+    expect(out.effects.filter((e) => e.tag === 'Broadcast')).toHaveLength(0);
+    const texts = out.effects.flatMap((e) => (e.tag === 'Send' ? e.lines.map((l) => l.text) : []));
+    expect(texts).toContain(':irc.example.com 404 guest #foo :Cannot send to channel');
+  });
+
+  it('admits an identified member (account set)', () => {
+    const chan = makeChan('#foo');
+    chan.modes.blockUnidentified = true;
+    addMember(chan, 'c1', 'alice');
+    const conn = makeConn('c1', 'alice');
+    conn.account = 'alice';
+    const ctx = makeCtx(conn);
+
+    const out = privmsgChannelReducer(
+      chan,
+      { command: 'PRIVMSG', params: ['#foo', 'hello'], tags: {} },
+      ctx,
+    );
+
+    expect(out.effects.filter((e) => e.tag === 'Broadcast')).toHaveLength(1);
+  });
+
+  it('NOTICE is silent on +R rejection (RFC: NOTICE never produces numerics)', () => {
+    const chan = makeChan('#foo');
+    chan.modes.blockUnidentified = true;
+    addMember(chan, 'c1', 'guest');
+    const conn = makeConn('c1', 'guest');
+    const ctx = makeCtx(conn);
+
+    const out = noticeChannelReducer(
+      chan,
+      { command: 'NOTICE', params: ['#foo', 'hello'], tags: {} },
+      ctx,
+    );
+
+    expect(out.effects).toEqual<EffectType[]>([]);
+  });
+});
+
+// ============================================================================
+// channelReducer — ChanServ +M (moderated requires identification)
+// ============================================================================
+
+describe('privmsgChannelReducer — +M (moderated-ident)', () => {
+  it('rejects an unidentified non-op/non-voice member with 404', () => {
+    const chan = makeChan('#foo');
+    chan.modes.moderatedIdent = true;
+    addMember(chan, 'c1', 'guest');
+    const conn = makeConn('c1', 'guest');
+    const ctx = makeCtx(conn);
+
+    const out = privmsgChannelReducer(
+      chan,
+      { command: 'PRIVMSG', params: ['#foo', 'hi'], tags: {} },
+      ctx,
+    );
+
+    expect(out.effects.filter((e) => e.tag === 'Broadcast')).toHaveLength(0);
+    const texts = out.effects.flatMap((e) => (e.tag === 'Send' ? e.lines.map((l) => l.text) : []));
+    expect(texts).toContain(':irc.example.com 404 guest #foo :Cannot send to channel');
+  });
+
+  it('admits an identified non-op/non-voice member', () => {
+    const chan = makeChan('#foo');
+    chan.modes.moderatedIdent = true;
+    addMember(chan, 'c1', 'alice');
+    const conn = makeConn('c1', 'alice');
+    conn.account = 'alice';
+    const ctx = makeCtx(conn);
+
+    const out = privmsgChannelReducer(
+      chan,
+      { command: 'PRIVMSG', params: ['#foo', 'hi'], tags: {} },
+      ctx,
+    );
+
+    expect(out.effects.filter((e) => e.tag === 'Broadcast')).toHaveLength(1);
+  });
+
+  it('admits an unidentified op (op bypasses +M)', () => {
+    const chan = makeChan('#foo');
+    chan.modes.moderatedIdent = true;
+    addMember(chan, 'c1', 'guest', true);
+    const conn = makeConn('c1', 'guest');
+    const ctx = makeCtx(conn);
+
+    const out = privmsgChannelReducer(
+      chan,
+      { command: 'PRIVMSG', params: ['#foo', 'hi'], tags: {} },
+      ctx,
+    );
+
+    expect(out.effects.filter((e) => e.tag === 'Broadcast')).toHaveLength(1);
+  });
+
+  it('admits an unidentified voice (voice bypasses +M)', () => {
+    const chan = makeChan('#foo');
+    chan.modes.moderatedIdent = true;
+    addMember(chan, 'c1', 'guest', false, true);
+    const conn = makeConn('c1', 'guest');
+    const ctx = makeCtx(conn);
+
+    const out = privmsgChannelReducer(
+      chan,
+      { command: 'PRIVMSG', params: ['#foo', 'hi'], tags: {} },
+      ctx,
+    );
+
+    expect(out.effects.filter((e) => e.tag === 'Broadcast')).toHaveLength(1);
+  });
+
+  it('NOTICE is silent on +M rejection (RFC: NOTICE never produces numerics)', () => {
+    const chan = makeChan('#foo');
+    chan.modes.moderatedIdent = true;
+    addMember(chan, 'c1', 'guest');
+    const conn = makeConn('c1', 'guest');
+    const ctx = makeCtx(conn);
+
+    const out = noticeChannelReducer(
+      chan,
+      { command: 'NOTICE', params: ['#foo', 'hi'], tags: {} },
+      ctx,
+    );
+
+    expect(out.effects).toEqual<EffectType[]>([]);
+  });
+});

package/packages/irc-core/tests/commands/read-marker.test.ts

@@ -10,7 +10,7 @@ import {
 import {
   EmptyMotdProvider,
   FakeClock,
-  InMemoryReadMarkerStore,
+  InMemoryServicesStore,
   SequentialIdFactory,
 } from '../../src/ports';
 import { type ConnectionState, createConnection } from '../../src/state/connection';
@@ -38,14 +38,14 @@ function makeConn(id = 'c1', account?: string): ConnectionState {
   return s;
 }
 
-function makeCtx(conn: ConnectionState, readMarkers?: InMemoryReadMarkerStore): Ctx {
+function makeCtx(conn: ConnectionState, services?: InMemoryServicesStore): Ctx {
   return buildCtx({
     serverConfig,
     clock: new FakeClock(1_000),
     ids: new SequentialIdFactory(),
     motd: EmptyMotdProvider,
     connection: conn,
-    ...(readMarkers !== undefined ? { readMarkers } : {}),
+    ...(services !== undefined ? { services } : {}),
   });
 }
 
@@ -109,18 +109,18 @@ describe('readMarkerMsgid', () => {
 
 describe('persistReadMarker', () => {
   it('writes the marker to the store keyed by (account, channel)', () => {
-    const store = new InMemoryReadMarkerStore();
-    const ctx = makeCtx(makeConn('c1', 'alice'), store);
+    const services = new InMemoryServicesStore();
+    const ctx = makeCtx(makeConn('c1', 'alice'), services);
 
     persistReadMarker(ctx, '#foo', 'm7');
 
-    expect(store.get('alice', '#foo')).toBe('m7');
+    expect(services.getLastReadMarker('alice', '#foo')).toBe('m7');
   });
 
   it('also advances the connection in-memory lastReadMarkers', () => {
-    const store = new InMemoryReadMarkerStore();
+    const services = new InMemoryServicesStore();
     const conn = makeConn('c1', 'alice');
-    const ctx = makeCtx(conn, store);
+    const ctx = makeCtx(conn, services);
 
     persistReadMarker(ctx, '#foo', 'm7');
 
@@ -128,16 +128,16 @@ describe('persistReadMarker', () => {
   });
 
   it('overwrites a previously stored marker for the same pair', () => {
-    const store = new InMemoryReadMarkerStore();
-    const ctx = makeCtx(makeConn('c1', 'alice'), store);
+    const services = new InMemoryServicesStore();
+    const ctx = makeCtx(makeConn('c1', 'alice'), services);
 
     persistReadMarker(ctx, '#foo', 'm1');
     persistReadMarker(ctx, '#foo', 'm2');
 
-    expect(store.get('alice', '#foo')).toBe('m2');
+    expect(services.getLastReadMarker('alice', '#foo')).toBe('m2');
   });
 
-  it('is a no-op when no ReadMarkerStore is bound', () => {
+  it('is a no-op when no ServicesStore is bound', () => {
     const conn = makeConn('c1', 'alice');
     const ctx = makeCtx(conn); // no store
 
@@ -148,14 +148,14 @@ describe('persistReadMarker', () => {
   });
 
   it('is a no-op on the store when the connection has no account', () => {
-    const store = new InMemoryReadMarkerStore();
+    const services = new InMemoryServicesStore();
     const conn = makeConn('c1'); // no account
-    const ctx = makeCtx(conn, store);
+    const ctx = makeCtx(conn, services);
 
     persistReadMarker(ctx, '#foo', 'm1');
 
-    expect(store.get('alice', '#foo')).toBeUndefined();
-    expect(store.forAccount('alice')).toEqual([]);
+    expect(services.getLastReadMarker('alice', '#foo')).toBeUndefined();
+    expect(services.listReadMarkers('alice')).toEqual([]);
   });
 });
 
@@ -165,44 +165,44 @@ describe('persistReadMarker', () => {
 
 describe('seedReadMarkers', () => {
   it('populates lastReadMarkers from every persisted entry for the account', () => {
-    const store = new InMemoryReadMarkerStore();
-    store.set('alice', '#foo', 'm1');
-    store.set('alice', '#bar', 'm2');
+    const services = new InMemoryServicesStore();
+    services.setLastReadMarker('alice', '#foo', 'm1');
+    services.setLastReadMarker('alice', '#bar', 'm2');
     const conn = makeConn();
 
-    seedReadMarkers(conn, store, 'alice');
+    seedReadMarkers(conn, services, 'alice');
 
     expect(conn.lastReadMarkers?.get('#foo')).toBe('m1');
     expect(conn.lastReadMarkers?.get('#bar')).toBe('m2');
   });
 
   it('leaves existing in-memory markers untouched when the store is empty', () => {
-    const store = new InMemoryReadMarkerStore();
+    const services = new InMemoryServicesStore();
     const conn = makeConn();
     conn.lastReadMarkers = new Map<string, string>([['#foo', 'm9']]);
 
-    seedReadMarkers(conn, store, 'alice');
+    seedReadMarkers(conn, services, 'alice');
 
     expect(conn.lastReadMarkers?.get('#foo')).toBe('m9');
   });
 
   it('seeds markers for an account regardless of case spelling', () => {
-    const store = new InMemoryReadMarkerStore();
-    store.set('Alice', '#foo', 'm1');
+    const services = new InMemoryServicesStore();
+    services.setLastReadMarker('Alice', '#foo', 'm1');
     const conn = makeConn();
 
-    seedReadMarkers(conn, store, 'alice');
+    seedReadMarkers(conn, services, 'alice');
 
     expect(conn.lastReadMarkers?.get('#foo')).toBe('m1');
   });
 
   it('does not overwrite an in-memory marker already present for a channel', () => {
-    const store = new InMemoryReadMarkerStore();
-    store.set('alice', '#foo', 'stored');
+    const services = new InMemoryServicesStore();
+    services.setLastReadMarker('alice', '#foo', 'stored');
     const conn = makeConn();
     conn.lastReadMarkers = new Map<string, string>([['#foo', 'in-memory']]);
 
-    seedReadMarkers(conn, store, 'alice');
+    seedReadMarkers(conn, services, 'alice');
 
     // The in-memory (session) marker wins: the connection may have already
     // advanced past the persisted value this session.