@@ -2201,6 +2201,10 @@ async fn create_private_channel_ws(client: &mut BuzzTestClient, keys: &Keys) ->
22012201}
22022202
22032203/// Submit a kind:9000 PUT_USER event over WebSocket.
2204+ ///
2205+ /// `allow_self_tagging` keeps self-targeted adds working: EventBuilder otherwise
2206+ /// drops a `p` tag matching the signer (nostr-0.44.3 builder.rs:435-449) and the
2207+ /// event fails as "missing p tag" instead of exercising the authority check.
22042208async fn add_member_ws (
22052209 client : & mut BuzzTestClient ,
22062210 channel_id : & str ,
@@ -2210,6 +2214,7 @@ async fn add_member_ws(
22102214 let h_tag = Tag :: parse ( [ "h" , channel_id] ) . unwrap ( ) ;
22112215 let p_tag = Tag :: parse ( [ "p" , target_pubkey_hex] ) . unwrap ( ) ;
22122216 let event = EventBuilder :: new ( Kind :: Custom ( 9000 ) , "" )
2217+ . allow_self_tagging ( )
22132218 . tags ( [ h_tag, p_tag] )
22142219 . sign_with_keys ( signer)
22152220 . unwrap ( ) ;
@@ -2219,6 +2224,8 @@ async fn add_member_ws(
22192224}
22202225
22212226/// Submit a kind:9000 PUT_USER event with a role tag over WebSocket.
2227+ ///
2228+ /// See [`add_member_ws`] for why `allow_self_tagging` is required.
22222229async fn add_member_with_role_ws (
22232230 client : & mut BuzzTestClient ,
22242231 channel_id : & str ,
@@ -2230,6 +2237,7 @@ async fn add_member_with_role_ws(
22302237 let p_tag = Tag :: parse ( [ "p" , target_pubkey_hex] ) . unwrap ( ) ;
22312238 let role_tag = Tag :: parse ( [ "role" , role] ) . unwrap ( ) ;
22322239 let event = EventBuilder :: new ( Kind :: Custom ( 9000 ) , "" )
2240+ . allow_self_tagging ( )
22332241 . tags ( [ h_tag, p_tag, role_tag] )
22342242 . sign_with_keys ( signer)
22352243 . unwrap ( ) ;
@@ -2241,10 +2249,10 @@ async fn add_member_with_role_ws(
22412249 ( ok. accepted , ok. message )
22422250}
22432251
2244- /// Any member of a private channel can invite another user (Slack model) .
2252+ /// Only owners/admins can add another identity to a private channel .
22452253#[ tokio:: test]
22462254#[ ignore]
2247- async fn test_private_channel_any_member_can_invite ( ) {
2255+ async fn test_private_channel_member_cannot_invite ( ) {
22482256 let url = relay_url ( ) ;
22492257 let owner_keys = Keys :: generate ( ) ;
22502258 let member_keys = Keys :: generate ( ) ;
@@ -2271,23 +2279,85 @@ async fn test_private_channel_any_member_can_invite() {
22712279 . await
22722280 . expect ( "connect as member" ) ;
22732281
2274- // Regular member invites a third user — this should succeed .
2282+ // Regular member tries to invite a third user.
22752283 let ( accepted, msg) = add_member_ws (
22762284 & mut member_client,
22772285 & channel_id,
22782286 & invitee_keys. public_key ( ) . to_hex ( ) ,
22792287 & member_keys,
22802288 )
22812289 . await ;
2290+ assert ! (
2291+ !accepted,
2292+ "regular member must not add another private-channel identity: {msg}"
2293+ ) ;
2294+ assert ! (
2295+ msg. contains( "owners/admins" ) ,
2296+ "rejection should name the owner/admin requirement, got: {msg}"
2297+ ) ;
2298+
2299+ // The same member re-adding *themselves* stays idempotent — the huddle
2300+ // bot-add and kind:9021 paths depend on a self-targeted PUT_USER working.
2301+ let ( accepted, msg) = add_member_ws (
2302+ & mut member_client,
2303+ & channel_id,
2304+ & member_keys. public_key ( ) . to_hex ( ) ,
2305+ & member_keys,
2306+ )
2307+ . await ;
22822308 assert ! (
22832309 accepted,
2284- "regular member should be able to invite to private channel , got: {msg}"
2310+ "self-targeted re-add must stay idempotent , got: {msg}"
22852311 ) ;
22862312
22872313 owner_client. disconnect ( ) . await . expect ( "disconnect owner" ) ;
22882314 member_client. disconnect ( ) . await . expect ( "disconnect member" ) ;
22892315}
22902316
2317+ /// An admin — not just the owner — can still add to a private channel.
2318+ #[ tokio:: test]
2319+ #[ ignore]
2320+ async fn test_private_channel_admin_can_invite ( ) {
2321+ let url = relay_url ( ) ;
2322+ let owner_keys = Keys :: generate ( ) ;
2323+ let admin_keys = Keys :: generate ( ) ;
2324+ let invitee_keys = Keys :: generate ( ) ;
2325+
2326+ let mut owner_client = BuzzTestClient :: connect ( & url, & owner_keys)
2327+ . await
2328+ . expect ( "connect as owner" ) ;
2329+ let channel_id = create_private_channel_ws ( & mut owner_client, & owner_keys) . await ;
2330+
2331+ let ( accepted, msg) = add_member_with_role_ws (
2332+ & mut owner_client,
2333+ & channel_id,
2334+ & admin_keys. public_key ( ) . to_hex ( ) ,
2335+ "admin" ,
2336+ & owner_keys,
2337+ )
2338+ . await ;
2339+ assert ! ( accepted, "owner should add an admin, got: {msg}" ) ;
2340+
2341+ let mut admin_client = BuzzTestClient :: connect ( & url, & admin_keys)
2342+ . await
2343+ . expect ( "connect as admin" ) ;
2344+
2345+ let ( accepted, msg) = add_member_ws (
2346+ & mut admin_client,
2347+ & channel_id,
2348+ & invitee_keys. public_key ( ) . to_hex ( ) ,
2349+ & admin_keys,
2350+ )
2351+ . await ;
2352+ assert ! (
2353+ accepted,
2354+ "admin should be able to add to a private channel, got: {msg}"
2355+ ) ;
2356+
2357+ owner_client. disconnect ( ) . await . expect ( "disconnect owner" ) ;
2358+ admin_client. disconnect ( ) . await . expect ( "disconnect admin" ) ;
2359+ }
2360+
22912361/// A non-member cannot invite someone to a private channel.
22922362#[ tokio:: test]
22932363#[ ignore]
0 commit comments