Summary

Add support for SASL v3.2

Review Request #3723 — Created Jan. 2, 2025 and submitted Jan. 16, 2025, 11:55 p.m.

Information

Owner

grim

Repository

ibis/ibis

Branch

default

Bugs

IBIS-45

Depends On

Reviewers

Groups

pidgin

People

Description

This just means that we try to re-authenticate when the sasl capability is
advertised via CAP NEW.

I also added some logic to ignore the wait counters outside of the initial capability negotiation.

Testing Done

Connected to a local ergo server with authentication turned on and made sure everything worked as expected.

I then disabled authentication and verified the CAP DEL message was received but we don't do anything with it.

I then re-enabled authentication and verfied we received CAP NEW and attempt SASL authentication again.

I also connected to the same server when authentication disabled and re-enabled it and verfied that we negotiated SASL properly.

Commits

Summary	ID
Add support for SASL v3.2 This just means that we try to re-authenticate when the sasl capability is advertised via CAP NEW.	f863f7e94c8d8fe6b281df7a92116a1f16aa2aae

Issues

Description	From	Last Updated
I created IBIS-46 for an issue that looks like it's in this code but I didn't think it was at …	grim	Jan. 13, 2025, 1:36 a.m.
This is a bit troublesome, as if someone calls ibis_capabilities_add_wait before finished, the wait counter won't increment, but if they …	QuLogic	Jan. 16, 2025, 11:43 p.m.
s/This/this/	QuLogic	Jan. 6, 2025, 8:57 p.m.
Ditto.	QuLogic	Jan. 6, 2025, 8:57 p.m.
Should we break here, or should this be called multiple times in succession?	QuLogic	Jan. 6, 2025, 10 p.m.
This comment appears wrong now?	QuLogic	Jan. 16, 2025, 11:53 p.m.

The issue has been resolved. Show all issues

I created IBIS-46 for an issue that looks like it's in this code but I didn't think it was at first.

ibis/ibiscapabilities.c (Diff revision 1)

The issue has been resolved. Show all issues

This is a bit troublesome, as if someone calls ibis_capabilities_add_wait before finished, the wait counter won't increment, but if they then call ibis_capabilities_remove_wait after finish, it will be decremented. This means the wait counter will be one (or more!) lower than it should be.

I have no idea when these are called and could make that happen, but there's currently nothing preventing that situation in here.

grim Jan. 13, 2025, 12:32 a.m.

This should be fixed via the new negotiating flag.

QuLogic Jan. 13, 2025, 1:18 a.m.

I still don't understand how ibis_capabilities_add_wait can't be called while negotiating, since that's not public. Are waits only added after some other event?

grim Jan. 13, 2025, 1:37 a.m.

It shouldn't do anything when it's not negotiating as the wait is to keep the negotiation going and delay the sending of CAP END.

QuLogic Jan. 16, 2025, 11:43 p.m.

Ah, I did not see the new documentation. So these functions should only be called before the done signal, and the done signal cannot happen until an equal number of add/remove have been called. OK, I don't see anything wrong with it now.

ibis/ibiscapabilities.h (Diff revision 1)
The issue has been resolved. Show all issues
```
s/This/this/
```
ibis/ibiscapabilities.h (Diff revision 1)
The issue has been resolved. Show all issues
```
Ditto.
```

ibis/ibissasl.c (Diff revision 1)

The issue has been resolved. Show all issues

Should we break here, or should this be called multiple times in succession?

Change Summary:

rebased, fixed issues, and reworked the way we ignore wait counters.

This should still wait until Hasl 0.4.0 is released though as the SASL re-authentication doesn't work right without the fixes in Hasl 0.4.0.

Commits:

	Summary	ID
	Add support for SASL v3.2 This just means that we try to re-authenticate when the sasl capability is advertised via CAP NEW.	75a5134de97339a08174dfd0d620c5fcfc1b5b7d
	Add support for SASL v3.2 This just means that we try to re-authenticate when the sasl capability is advertised via CAP NEW.	8faa80e15939e3470cc212c8d2adeb9a33d8ce16

Diff:

Revision 2 (+142 -32)

Show changes

	ibis/ibiscapabilities.h
	ibis/ibiscapabilities.c
	ibis/ibissasl.c

Change Summary:

Updated to Hasl 0.4 and used it's new features to make this much easier to follow and implement.

Commits:

	Summary	ID
	Add support for SASL v3.2 This just means that we try to re-authenticate when the sasl capability is advertised via CAP NEW.	8faa80e15939e3470cc212c8d2adeb9a33d8ce16
	Add support for SASL v3.2 This just means that we try to re-authenticate when the sasl capability is advertised via CAP NEW.	fc3d71701156a58b8c96727a1f674443d0c79193

Diff:

Revision 3 (+240 -96)

Show changes

	meson.build
	ibis/ibiscapabilities.h
	ibis/ibiscapabilities.c
	ibis/ibissasl.c
	ibis-cli/ibiscli.c
	subprojects/hasl.wrap

ibis/ibissasl.c (Diff revision 3)
The issue has been resolved. Show all issues
```
This comment appears wrong now?
```

Change Summary:

Fix some comments.

Commits:

	Summary	ID
	Add support for SASL v3.2 This just means that we try to re-authenticate when the sasl capability is advertised via CAP NEW.	fc3d71701156a58b8c96727a1f674443d0c79193
	Add support for SASL v3.2 This just means that we try to re-authenticate when the sasl capability is advertised via CAP NEW.	f863f7e94c8d8fe6b281df7a92116a1f16aa2aae

Diff:

Revision 4 (+242 -96)

Show changes

	meson.build
	ibis/ibiscapabilities.h
	ibis/ibiscapabilities.c
	ibis/ibissasl.c
	ibis-cli/ibiscli.c
	subprojects/hasl.wrap

Ship it!

```
Ship It!
```

Status:: Completed