summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-10-26 22:15:47 -0400
committerJune McEnroe <june@causal.agency>2019-10-26 22:15:47 -0400
commit437162dca3dff21272328908054b37b19351a228 (patch)
treefccdb95a24d24398356d5dfa0986fefcc27d34b0
parentRespond to PING with same parameter (diff)
downloadpounce-437162dca3dff21272328908054b37b19351a228.tar.gz
pounce-437162dca3dff21272328908054b37b19351a228.zip
Wait for AUTHENTICATE + from server
-rw-r--r--server.c7
-rw-r--r--state.c6
2 files changed, 7 insertions, 6 deletions
diff --git a/server.c b/server.c
index 3dec684..964b15b 100644
--- a/server.c
+++ b/server.c
@@ -159,12 +159,7 @@ void serverLogin(
 
 void serverAuth(void) {
 	assert(authPlain);
-	serverFormat(
-		"AUTHENTICATE PLAIN\r\n"
-		"AUTHENTICATE %s\r\n"
-		"CAP END\r\n",
-		authPlain
-	);
+	serverFormat("AUTHENTICATE %s\r\nCAP END\r\n", authPlain);
 	free(authPlain);
 	authPlain = NULL;
 }
diff --git a/state.c b/state.c
index fa9c77b..ee3ae78 100644
--- a/state.c
+++ b/state.c
@@ -122,6 +122,11 @@ static void handleCap(struct Message *msg) {
 	bool ack = msg->params[1] && !strcmp(msg->params[1], "ACK");
 	bool sasl = msg->params[2] && !strncmp(msg->params[2], "sasl", 4);
 	if (!ack || !sasl) errx(EX_CONFIG, "server does not support SASL");
+	serverFormat("AUTHENTICATE PLAIN\r\n");
+}
+
+static void handleAuthenticate(struct Message *msg) {
+	(void)msg;
 	serverAuth();
 }
 
@@ -221,6 +226,7 @@ static const struct {
 	{ "004", handleReplyMyInfo },
 	{ "005", handleReplyISupport },
 	{ "332", handleReplyTopic },
+	{ "AUTHENTICATE", handleAuthenticate },
 	{ "CAP", handleCap },
 	{ "ERROR", handleError },
 	{ "JOIN", handleJoin },
p;follow=1'>Add chroot targetJune McEnroe 2020-02-11Exit focus and paste modes on err exitJune McEnroe 2020-02-11Add startup GPLv3 note and URLJune McEnroe I am a degenerate. 2020-02-11Make sure -D_GNU_SOURCE ends up in CFLAGS on LinuxJune McEnroe 2020-02-11Add note about setting PKG_CONFIG_PATHJune McEnroe 2020-02-11Rename query ID on nick changeJune McEnroe 2020-02-11Call completeClear when closing a windowJune McEnroe 2020-02-11Don't insert color codes for non-mentionsJune McEnroe 2020-02-11Take first two words in colorMentionsJune McEnroe This lets phrases like "hi june" get colored, but still doesn't get carried away. 2020-02-11Use time_t for save signatureJune McEnroe It's actually more likely to be 64-bit than size_t anyway, and it eliminates some helper functions. Also don't error when reading an empty save file. 2020-02-11Set self.nick to * initiallyJune McEnroe Allows removing a bunch of checks that self.nick is set, and it's what the server usually calls you before registration. Never highlight notices as mentions. 2020-02-11Define ColorCap instead of hardcoding 100June McEnroe 2020-02-11Move hash to top of chat.hJune McEnroe 2020-02-11Move base64 out of chat.hJune McEnroe 2020-02-11Move XDG_SUBDIR out of chat.hJune McEnroe 2020-02-11Fix whois idle unit calculationJune McEnroe Rookie mistake. 2020-02-11Cast towupper to wchar_tJune McEnroe For some reason it takes and returns wint_t... 2020-02-11Cast set but unused variables to voidJune McEnroe 2020-02-11Declare strlcatJune McEnroe 2020-02-11Check if VDSUSP existsJune McEnroe 2020-02-11Fix completeReplace iterationJune McEnroe 2020-02-11Use pkg(8) to configure on FreeBSDJune McEnroe 2020-02-11Remove legacy codeJune McEnroe 2020-02-11Add INSTALLING section to READMEJune McEnroe