pissnet/pissircd
1
0
Fork 0
mirror of https://github.com/pissnet/pissircd.git synced 2025-07-29 14:32:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make issecure (+Z/-Z) use the same msgids network-wide.

Browse source
This commit is contained in:
Bram Matthys 2019-09-06 15:18:45 +02:00
parent cf873d826a
commit a3e911a174
No known key found for this signature in database
GPG key ID: BF8116B163EAAE98
2 changed files with 32 additions and 22 deletions
src/modules
chanmodes
issecure.c
message-ids.c

28
src/modules/chanmodes/issecure.c
View file

@ -135,7 +135,7 @@ Member *member;
/* Set channel status of 'chptr' to be no longer secure (-Z) due to 'sptr'.
* sptr MAY be null!
*/
void issecure_unset(aChannel *chptr, aClient *sptr, int notice)
void issecure_unset(aChannel *chptr, aClient *sptr, MessageTag *recv_mtags, int notice)
{
Hook *h;
MessageTag *mtags;
@ -143,7 +143,7 @@ void issecure_unset(aChannel *chptr, aClient *sptr, int notice)
if (notice)
{
mtags = NULL;
new_message(&me, NULL, &mtags);
new_message_special(&me, recv_mtags, &mtags, "NOTICE %s :setting -Z", chptr->chname);
sendto_channel(chptr, &me, NULL, 0, 0, SEND_LOCAL, mtags, ":%s NOTICE %s :User '%s' joined and is not connected through SSL/TLS, setting channel -Z (insecure)",
me.name, chptr->chname, sptr->name);
free_message_tags(mtags);
@ -151,7 +151,7 @@ void issecure_unset(aChannel *chptr, aClient *sptr, int notice)
chptr->mode.extmode &= ~EXTCMODE_ISSECURE;
mtags = NULL;
new_message(&me, NULL, &mtags);
new_message_special(&me, recv_mtags, &mtags, "MODE %s -Z", chptr->chname);
sendto_channel(chptr, &me, NULL, 0, 0, SEND_LOCAL, mtags, ":%s MODE %s -Z", me.name, chptr->chname);
free_message_tags(mtags);
}
@ -162,12 +162,12 @@ void issecure_unset(aChannel *chptr, aClient *sptr, int notice)
* now considered secure. If 'sptr' is non-NULL then we are now secure
* thanks to this user leaving the chat.
*/
void issecure_set(aChannel *chptr, aClient *sptr, int notice)
void issecure_set(aChannel *chptr, aClient *sptr, MessageTag *recv_mtags, int notice)
{
MessageTag *mtags;
mtags = NULL;
new_message(&me, NULL, &mtags);
new_message_special(&me, recv_mtags, &mtags, "NOTICE %s :setting +Z", chptr->chname);
if (notice && sptr)
{
/* note that we have to skip 'sptr', since when this call is being made
@ -188,7 +188,7 @@ void issecure_set(aChannel *chptr, aClient *sptr, int notice)
chptr->mode.extmode |= EXTCMODE_ISSECURE;
mtags = NULL;
new_message(&me, NULL, &mtags);
new_message_special(&me, recv_mtags, &mtags, "MODE %s +Z", chptr->chname);
sendto_channel(chptr, &me, sptr, 0, 0, SEND_LOCAL, mtags,
":%s MODE %s +Z",
me.name, chptr->chname);
@ -203,11 +203,11 @@ int issecure_join(aClient *cptr, aClient *sptr, aChannel *chptr, MessageTag *mta
{
/* Check only if chan already +zZ and the user joining is insecure (no need to count) */
if (IsSecureJoin(chptr) && IsSecureChanIndicated(chptr) && !IsSecureConnect(sptr) && !IsULine(sptr))
issecure_unset(chptr, sptr, 1);
issecure_unset(chptr, sptr, mtags, 1);
/* Special case for +z in modes-on-join and first user creating the channel */
if ((chptr->users == 1) && IsSecureJoin(chptr) && !IsSecureChanIndicated(chptr) && !channel_has_insecure_users(chptr))
issecure_set(chptr, NULL, 0);
issecure_set(chptr, NULL, mtags, 0);
return 0;
}
@ -217,7 +217,7 @@ int issecure_part(aClient *cptr, aClient *sptr, aChannel *chptr, MessageTag *mta
/* Only care if chan is +z-Z and the user leaving is insecure, then count */
if (IsSecureJoin(chptr) && !IsSecureChanIndicated(chptr) && !IsSecureConnect(sptr) &&
!channel_has_insecure_users_butone(chptr, sptr))
issecure_set(chptr, sptr, 1);
issecure_set(chptr, sptr, mtags, 1);
return 0;
}
@ -232,7 +232,7 @@ aChannel *chptr;
/* Identical to part */
if (IsSecureJoin(chptr) && !IsSecureChanIndicated(chptr) &&
!IsSecureConnect(sptr) && !channel_has_insecure_users_butone(chptr, sptr))
issecure_set(chptr, sptr, 1);
issecure_set(chptr, sptr, mtags, 1);
}
return 0;
}
@ -242,7 +242,7 @@ int issecure_kick(aClient *cptr, aClient *sptr, aClient *victim, aChannel *chptr
/* Identical to part&quit, except we care about 'victim' and not 'sptr' */
if (IsSecureJoin(chptr) && !IsSecureChanIndicated(chptr) &&
!IsSecureConnect(victim) && !channel_has_insecure_users_butone(chptr, victim))
issecure_set(chptr, victim, 1);
issecure_set(chptr, victim, mtags, 1);
return 0;
}
@ -262,16 +262,16 @@ int issecure_chanmode(aClient *cptr, aClient *sptr, aChannel *chptr, MessageTag
{
/* Should be -Z, if not already */
if (IsSecureChanIndicated(chptr))
issecure_unset(chptr, NULL, 0); /* would be odd if we got here ;) */
issecure_unset(chptr, NULL, mtags, 0); /* would be odd if we got here ;) */
} else {
/* Should be +Z, but check if it isn't already.. */
if (!IsSecureChanIndicated(chptr))
issecure_set(chptr, NULL, 0);
issecure_set(chptr, NULL, mtags, 0);
}
} else {
/* there was a -z, check if the channel is currently +Z and if so, set it -Z */
if (IsSecureChanIndicated(chptr))
issecure_unset(chptr, NULL, 0);
issecure_unset(chptr, NULL, mtags, 0);
}
return 0;
}

26
src/modules/message-ids.c
View file

@ -121,7 +121,7 @@ void mtag_add_or_inherit_msgid(aClient *sender, MessageTag *recv_mtags, MessageT
else
m = mtag_generate_msgid();
if (signature && !strchr(m->value, '-'))
if (signature)
{
/* Special case:
* Some commands will receive a single msgid from
@ -133,13 +133,23 @@ void mtag_add_or_inherit_msgid(aClient *sender, MessageTag *recv_mtags, MessageT
* concatenated to the existing msgid.
* The hash is the first half of a SHA256 hash, then
* base64'd, and with the == suffix removed.
*
* The !strchr(m->value, '-') in the if above
* ensures that we never do more stacking,
* although theoretically that could be necessary,
* in which case we should reconsider.
* For now this fixes some PART issue.
*/
char prefix[MSGIDLEN+1], *p;
strlcpy(prefix, m->value, sizeof(prefix));
p = strchr(prefix, '-');
if (p)
{
/* It is possible that we have more stacking.
* IOTW: we are already stacked like xxx-yyy
* and it would have become an xxx-yyy-zzz
* sequence. Instead, we strip the yyy-
* so the end result will be xxx-zzz.
*
* One example code path would be when someone joins
* and the issecure module sets -Z.
*/
*p = '\0';
}
SHA256_CTX hash;
char binaryhash[SHA256_DIGEST_LENGTH];
char b64hash[SHA256_DIGEST_LENGTH*2+1];
@ -151,7 +161,7 @@ void mtag_add_or_inherit_msgid(aClient *sender, MessageTag *recv_mtags, MessageT
SHA256_Final(binaryhash, &hash);
b64_encode(binaryhash, sizeof(binaryhash)/2, b64hash, sizeof(b64hash));
b64hash[22] = '\0'; /* cut off at '=' */
snprintf(newbuf, sizeof(newbuf), "%s-%s", m->value, b64hash);
snprintf(newbuf, sizeof(newbuf), "%s-%s", prefix, b64hash);
safestrdup(m->value, newbuf);
}
AddListItem(m, *mtag_list);