Merge remote-tracking branch 'origin/master' into oauth.5

default.yaml

@@ -854,6 +854,9 @@ limits:
     # identlen is the max ident length allowed
     identlen: 20
 
+    # realnamelen is the maximum realname length allowed
+    realnamelen: 150
+
     # channellen is the max channel length allowed
     channellen: 64
 

irc/config.go

@@ -487,6 +487,7 @@ type Limits struct {
 	ChanListModes        int `yaml:"chan-list-modes"`
 	ChannelLen           int `yaml:"channellen"`
 	IdentLen             int `yaml:"identlen"`
+	RealnameLen          int `yaml:"realnamelen"`
 	KickLen              int `yaml:"kicklen"`
 	MonitorEntries       int `yaml:"monitor-entries"`
 	NickLen              int `yaml:"nicklen"`

irc/handlers.go

@@ -3374,6 +3374,10 @@ func userHandler(server *Server, client *Client, msg ircmsg.Message, rb *Respons
 		rb.Add(nil, server.name, ERR_NEEDMOREPARAMS, client.Nick(), "USER", client.t("Not enough parameters"))
 		return false
 	}
+	config := server.Config()
+	if config.Limits.RealnameLen > 0 && len(realname) > config.Limits.RealnameLen {
+		realname = ircmsg.TruncateUTF8Safe(realname, config.Limits.RealnameLen)
+	}
 
 	// #843: we accept either: `USER user:pass@clientid` or `USER user@clientid`
 	if strudelIndex := strings.IndexByte(username, '@'); strudelIndex != -1 {

irctest

@@ -1 +1 @@
-Subproject commit 6425e707acb092386b859ef738ee401a0021f65b
+Subproject commit df2880e379866c6354fa7ce776b436a2c49c557b

traditional.yaml

@@ -826,6 +826,9 @@ limits:
     # identlen is the max ident length allowed
     identlen: 20
 
+    # realnamelen is the maximum realname length allowed
+    realnamelen: 150
+
     # channellen is the max channel length allowed
     channellen: 64