diff options
| author | June McEnroe <june@causal.agency> | 2022-02-12 13:26:38 -0500 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2022-02-12 13:26:38 -0500 |
| commit | 397b4ce6bd9064aa36f8b9c264e4bbc226822d6f (patch) | |
| tree | a8f45e286765c4bab90cf561cd7762ebed5114e7 /handle.c | |
| parent | Treat any amount of space and punctuation as word boundaries (diff) | |
| download | catgirl-397b4ce6bd9064aa36f8b9c264e4bbc226822d6f.tar.gz catgirl-397b4ce6bd9064aa36f8b9c264e4bbc226822d6f.zip | |
Prompt for empty server or SASL passwords
Diffstat (limited to '')
| -rw-r--r-- | handle.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/handle.c b/handle.c index e460c7c..d663ca1 100644 --- a/handle.c +++ b/handle.c @@ -164,7 +164,9 @@ static void handleCap(struct Message *msg) { } else if (!strcmp(msg->params[1], "ACK")) { self.caps |= caps; if (caps & CapSASL) { - ircFormat("AUTHENTICATE %s\r\n", (self.plain ? "PLAIN" : "EXTERNAL")); + ircFormat( + "AUTHENTICATE %s\r\n", (self.plainUser ? "PLAIN" : "EXTERNAL") + ); } if (!(self.caps & CapSASL)) ircFormat("CAP END\r\n"); } else if (!strcmp(msg->params[1], "NAK")) { @@ -203,18 +205,18 @@ static void base64(char *dst, const byte *src, size_t len) { static void handleAuthenticate(struct Message *msg) { (void)msg; - if (!self.plain) { + if (!self.plainUser) { ircFormat("AUTHENTICATE +\r\n"); return; } byte buf[299] = {0}; - size_t len = 1 + strlen(self.plain); + size_t userLen = strlen(self.plainUser); + size_t passLen = strlen(self.plainPass); + size_t len = 1 + userLen + 1 + passLen; if (sizeof(buf) < len) errx(EX_USAGE, "SASL PLAIN is too long"); - memcpy(&buf[1], self.plain, len - 1); - byte *sep = memchr(buf, ':', len); - if (!sep) errx(EX_USAGE, "SASL PLAIN missing colon"); - *sep = 0; + memcpy(&buf[1], self.plainUser, userLen); + memcpy(&buf[1 + userLen + 1], self.plainPass, passLen); char b64[BASE64_SIZE(sizeof(buf))]; base64(b64, buf, len); @@ -224,7 +226,7 @@ static void handleAuthenticate(struct Message *msg) { explicit_bzero(b64, sizeof(b64)); explicit_bzero(buf, sizeof(buf)); - explicit_bzero(self.plain, strlen(self.plain)); + explicit_bzero(self.plainPass, strlen(self.plainPass)); } static void handleReplyLoggedIn(struct Message *msg) { |