From 0f39fde647e7d4f4071908665929f4a832ac9c34 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Sun, 4 Jun 2023 17:45:46 -0400 Subject: [PATCH] remove insecure reattach check See #2013; given that plaintext is deprecated now, it seems like there is no added value from continuing to police this. --- irc/client_lookup_set.go | 9 --------- irc/server.go | 5 +---- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/irc/client_lookup_set.go b/irc/client_lookup_set.go index a68aaf53..ef767b6d 100644 --- a/irc/client_lookup_set.go +++ b/irc/client_lookup_set.go @@ -195,15 +195,6 @@ func (clients *ClientManager) SetNick(client *Client, session *Session, newNick dryRun || session == nil { return "", errNicknameInUse, false } - // check TLS modes - if client.HasMode(modes.TLS) != currentClient.HasMode(modes.TLS) { - if useAccountName { - // #955: this is fatal because they can't fix it by trying a different nick - return "", errInsecureReattach, false - } else { - return "", errNicknameInUse, false - } - } reattachSuccessful, numSessions, lastSeen, wasAway, nowAway := currentClient.AddSession(session) if !reattachSuccessful { return "", errNicknameInUse, false diff --git a/irc/server.go b/irc/server.go index e1f3805c..6978c87e 100644 --- a/irc/server.go +++ b/irc/server.go @@ -359,10 +359,7 @@ func (server *Server) tryRegister(c *Client, session *Session) (exiting bool) { rb := NewResponseBuffer(session) nickError := performNickChange(server, c, c, session, c.preregNick, rb) rb.Send(true) - if nickError == errInsecureReattach { - c.Quit(c.t("You can't mix secure and insecure connections to this account"), nil) - return true - } else if nickError != nil { + if nickError != nil { c.preregNick = "" return false }