Merge pull request #351 from slingamn/changelog.2

changelog and manual updates, plus some last-minute fixes

irc/accounts.go

@@ -306,8 +306,16 @@ func (am *AccountManager) Register(client *Client, account string, callbackNames
 		return errAccountAlreadyRegistered
 	}
 
-	// can't register a guest nickname
 	config := am.server.AccountConfig()
+	// if nick reservation is enabled, you can only register your current nickname
+	// as an account; this prevents "land-grab" situations where someone else
+	// registers your nick out from under you and then NS GHOSTs you
+	// n.b. client is nil during a SAREGISTER:
+	if config.NickReservation.Enabled && client != nil && client.Nick() != account {
+		return errAccountMustHoldNick
+	}
+
+	// can't register a guest nickname
 	renamePrefix := strings.ToLower(config.NickReservation.RenamePrefix)
 	if renamePrefix != "" && strings.HasPrefix(casefoldedAccount, renamePrefix) {
 		return errAccountAlreadyRegistered

irc/errors.go

@@ -9,14 +9,14 @@ import "errors"
 
 // Runtime Errors
 var (
-	errAccountAlreadyRegistered       = errors.New("Account already exists")
-	errAccountAlreadyVerified         = errors.New("Account is already verified")
+	errAccountAlreadyRegistered       = errors.New(`Account already exists`)
+	errAccountAlreadyVerified         = errors.New(`Account is already verified`)
 	errAccountCantDropPrimaryNick     = errors.New("Can't unreserve primary nickname")
 	errAccountCreation                = errors.New("Account could not be created")
 	errAccountCredUpdate              = errors.New("Could not update password hash to new method")
 	errAccountDoesNotExist            = errors.New("Account does not exist")
 	errAccountInvalidCredentials      = errors.New("Invalid account credentials")
-	errAccountBadPassphrase           = errors.New("Passphrase contains forbidden characters or is otherwise invalid")
+	errAccountBadPassphrase           = errors.New(`Passphrase contains forbidden characters or is otherwise invalid`)
 	errAccountNickReservationFailed   = errors.New("Could not (un)reserve nick")
 	errAccountNotLoggedIn             = errors.New("You're not logged into an account")
 	errAccountTooManyNicks            = errors.New("Account has too many reserved nicks")
@@ -24,8 +24,9 @@ var (
 	errAccountVerificationFailed      = errors.New("Account verification failed")
 	errAccountVerificationInvalidCode = errors.New("Invalid account verification code")
 	errAccountUpdateFailed            = errors.New("Error while updating your account information")
+	errAccountMustHoldNick            = errors.New(`You must hold that nickname in order to register it`)
 	errCallbackFailed                 = errors.New("Account verification could not be sent")
-	errCertfpAlreadyExists            = errors.New("An account already exists with your certificate")
+	errCertfpAlreadyExists            = errors.New(`An account already exists for your certificate fingerprint`)
 	errChannelAlreadyRegistered       = errors.New("Channel is already registered")
 	errChannelNameInUse               = errors.New("Channel name in use")
 	errInvalidChannelName             = errors.New("Invalid channel name")

irc/handlers.go

@@ -153,19 +153,7 @@ func accRegisterHandler(server *Server, client *Client, msg ircmsg.IrcMessage, r
 
 	err = server.accounts.Register(client, account, callbackNamespace, callbackValue, passphrase, certfp)
 	if err != nil {
-		msg := "Unknown"
-		code := ERR_UNKNOWNERROR
-		if err == errCertfpAlreadyExists {
-			msg = "An account already exists for your certificate fingerprint"
-		} else if err == errAccountAlreadyRegistered {
-			msg = "Account already exists"
-			code = ERR_ACCOUNT_ALREADY_EXISTS
-		} else if err == errAccountBadPassphrase {
-			msg = "Passphrase contains forbidden characters or is otherwise invalid"
-		}
-		if err == errAccountAlreadyRegistered || err == errAccountCreation || err == errCertfpAlreadyExists {
-			msg = err.Error()
-		}
+		msg, code := registrationErrorToMessageAndCode(err)
 		rb.Add(nil, server.name, code, nick, "ACC", "REGISTER", client.t(msg))
 		return false
 	}
@@ -186,6 +174,21 @@ func accRegisterHandler(server *Server, client *Client, msg ircmsg.IrcMessage, r
 	return false
 }
 
+func registrationErrorToMessageAndCode(err error) (message, numeric string) {
+	// default responses: let's be risk-averse about displaying internal errors
+	// to the clients, especially for something as sensitive as accounts
+	message = `Could not register`
+	numeric = ERR_UNKNOWNERROR
+	switch err {
+	case errAccountAlreadyRegistered, errAccountAlreadyVerified:
+		message = err.Error()
+		numeric = ERR_ACCOUNT_ALREADY_EXISTS
+	case errAccountCreation, errAccountMustHoldNick, errAccountBadPassphrase, errCertfpAlreadyExists:
+		message = err.Error()
+	}
+	return
+}
+
 // helper function to dispatch messages when a client successfully registers
 func sendSuccessfulRegResponse(client *Client, rb *ResponseBuffer, forNS bool) {
 	if forNS {

irc/nickserv.go

@@ -339,6 +339,10 @@ func nsRegisterHandler(server *Server, client *Client, command string, params []
 		return
 	}
 
+	if !nsLoginThrottleCheck(client, rb) {
+		return
+	}
+
 	config := server.AccountConfig()
 	var callbackNamespace, callbackValue string
 	noneCallbackAllowed := false
@@ -376,14 +380,7 @@ func nsRegisterHandler(server *Server, client *Client, command string, params []
 
 	// details could not be stored and relevant numerics have been dispatched, abort
 	if err != nil {
-		errMsg := client.t("Could not register")
-		if err == errCertfpAlreadyExists {
-			errMsg = client.t("An account already exists for your certificate fingerprint")
-		} else if err == errAccountAlreadyRegistered || err == errAccountAlreadyVerified {
-			errMsg = client.t("Account already exists")
-		} else if err == errAccountBadPassphrase {
-			errMsg = client.t("Passphrase contains forbidden characters or is otherwise invalid")
-		}
+		errMsg, _ := registrationErrorToMessageAndCode(err)
 		nsNotice(rb, errMsg)
 		return
 	}

irc/server.go

@@ -261,7 +261,7 @@ func (server *Server) acceptClient(conn clientConn) {
 		}
 	}
 
-	server.logger.Debug("localconnect-ip", fmt.Sprintf("Client connecting from %v", ipaddr))
+	server.logger.Info("localconnect-ip", fmt.Sprintf("Client connecting from %v", ipaddr))
 	// prolly don't need to alert snomasks on this, only on connection reg
 
 	NewClient(server, conn.Conn, conn.IsTLS)
@@ -421,7 +421,7 @@ func (server *Server) tryRegister(c *Client) {
 	server.stats.ChangeTotal(1)
 
 	// continue registration
-	server.logger.Debug("localconnect", fmt.Sprintf("Client connected [%s] [u:%s] [r:%s]", c.nick, c.username, c.realname))
+	server.logger.Info("localconnect", fmt.Sprintf("Client connected [%s] [u:%s] [r:%s]", c.nick, c.username, c.realname))
 	server.snomasks.Send(sno.LocalConnects, fmt.Sprintf("Client connected [%s] [u:%s] [h:%s] [ip:%s] [r:%s]", c.nick, c.username, c.rawHostname, c.IPString(), c.realname))
 
 	// "register"; this includes the initial phase of session resumption