|
@@ -103,7 +103,7 @@ func (clients *ClientManager) Resume(oldClient *Client, session *Session) (err e
|
103
|
103
|
return errNickMissing
|
104
|
104
|
}
|
105
|
105
|
|
106
|
|
- success, _, _ := oldClient.AddSession(session)
|
|
106
|
+ success, _, _, _ := oldClient.AddSession(session)
|
107
|
107
|
if !success {
|
108
|
108
|
return errNickMissing
|
109
|
109
|
}
|
|
@@ -112,7 +112,7 @@ func (clients *ClientManager) Resume(oldClient *Client, session *Session) (err e
|
112
|
112
|
}
|
113
|
113
|
|
114
|
114
|
// SetNick sets a client's nickname, validating it against nicknames in use
|
115
|
|
-func (clients *ClientManager) SetNick(client *Client, session *Session, newNick string) (setNick string, err error) {
|
|
115
|
+func (clients *ClientManager) SetNick(client *Client, session *Session, newNick string) (setNick string, err error, returnedFromAway bool) {
|
116
|
116
|
config := client.server.Config()
|
117
|
117
|
|
118
|
118
|
var newCfNick, newSkeleton string
|
|
@@ -134,24 +134,24 @@ func (clients *ClientManager) SetNick(client *Client, session *Session, newNick
|
134
|
134
|
|
135
|
135
|
if useAccountName {
|
136
|
136
|
if registered && newNick != accountName && newNick != "" {
|
137
|
|
- return "", errNickAccountMismatch
|
|
137
|
+ return "", errNickAccountMismatch, false
|
138
|
138
|
}
|
139
|
139
|
newNick = accountName
|
140
|
140
|
newCfNick = account
|
141
|
141
|
newSkeleton, err = Skeleton(newNick)
|
142
|
142
|
if err != nil {
|
143
|
|
- return "", errNicknameInvalid
|
|
143
|
+ return "", errNicknameInvalid, false
|
144
|
144
|
}
|
145
|
145
|
} else {
|
146
|
146
|
newNick = strings.TrimSpace(newNick)
|
147
|
147
|
if len(newNick) == 0 {
|
148
|
|
- return "", errNickMissing
|
|
148
|
+ return "", errNickMissing, false
|
149
|
149
|
}
|
150
|
150
|
|
151
|
151
|
if account == "" && config.Accounts.NickReservation.ForceGuestFormat {
|
152
|
152
|
newCfNick, err = CasefoldName(newNick)
|
153
|
153
|
if err != nil {
|
154
|
|
- return "", errNicknameInvalid
|
|
154
|
+ return "", errNicknameInvalid, false
|
155
|
155
|
}
|
156
|
156
|
if !config.Accounts.NickReservation.guestRegexpFolded.MatchString(newCfNick) {
|
157
|
157
|
newNick = strings.Replace(config.Accounts.NickReservation.GuestFormat, "*", newNick, 1)
|
|
@@ -163,23 +163,23 @@ func (clients *ClientManager) SetNick(client *Client, session *Session, newNick
|
163
|
163
|
newCfNick, err = CasefoldName(newNick)
|
164
|
164
|
}
|
165
|
165
|
if err != nil {
|
166
|
|
- return "", errNicknameInvalid
|
|
166
|
+ return "", errNicknameInvalid, false
|
167
|
167
|
}
|
168
|
168
|
if len(newNick) > config.Limits.NickLen || len(newCfNick) > config.Limits.NickLen {
|
169
|
|
- return "", errNicknameInvalid
|
|
169
|
+ return "", errNicknameInvalid, false
|
170
|
170
|
}
|
171
|
171
|
newSkeleton, err = Skeleton(newNick)
|
172
|
172
|
if err != nil {
|
173
|
|
- return "", errNicknameInvalid
|
|
173
|
+ return "", errNicknameInvalid, false
|
174
|
174
|
}
|
175
|
175
|
|
176
|
176
|
if restrictedCasefoldedNicks[newCfNick] || restrictedSkeletons[newSkeleton] {
|
177
|
|
- return "", errNicknameInvalid
|
|
177
|
+ return "", errNicknameInvalid, false
|
178
|
178
|
}
|
179
|
179
|
|
180
|
180
|
reservedAccount, method := client.server.accounts.EnforcementStatus(newCfNick, newSkeleton)
|
181
|
181
|
if method == NickEnforcementStrict && reservedAccount != "" && reservedAccount != account {
|
182
|
|
- return "", errNicknameReserved
|
|
182
|
+ return "", errNicknameReserved, false
|
183
|
183
|
}
|
184
|
184
|
}
|
185
|
185
|
|
|
@@ -204,20 +204,20 @@ func (clients *ClientManager) SetNick(client *Client, session *Session, newNick
|
204
|
204
|
if currentClient != nil && currentClient != client && session != nil {
|
205
|
205
|
// these conditions forbid reattaching to an existing session:
|
206
|
206
|
if registered || !bouncerAllowed || account == "" || account != currentClient.Account() {
|
207
|
|
- return "", errNicknameInUse
|
|
207
|
+ return "", errNicknameInUse, false
|
208
|
208
|
}
|
209
|
209
|
// check TLS modes
|
210
|
210
|
if client.HasMode(modes.TLS) != currentClient.HasMode(modes.TLS) {
|
211
|
211
|
if useAccountName {
|
212
|
212
|
// #955: this is fatal because they can't fix it by trying a different nick
|
213
|
|
- return "", errInsecureReattach
|
|
213
|
+ return "", errInsecureReattach, false
|
214
|
214
|
} else {
|
215
|
|
- return "", errNicknameInUse
|
|
215
|
+ return "", errNicknameInUse, false
|
216
|
216
|
}
|
217
|
217
|
}
|
218
|
|
- reattachSuccessful, numSessions, lastSeen := currentClient.AddSession(session)
|
|
218
|
+ reattachSuccessful, numSessions, lastSeen, back := currentClient.AddSession(session)
|
219
|
219
|
if !reattachSuccessful {
|
220
|
|
- return "", errNicknameInUse
|
|
220
|
+ return "", errNicknameInUse, false
|
221
|
221
|
}
|
222
|
222
|
if numSessions == 1 {
|
223
|
223
|
invisible := currentClient.HasMode(modes.Invisible)
|
|
@@ -232,24 +232,24 @@ func (clients *ClientManager) SetNick(client *Client, session *Session, newNick
|
232
|
232
|
// for performance reasons
|
233
|
233
|
currentClient.SetNames("user", realname, true)
|
234
|
234
|
// successful reattach!
|
235
|
|
- return newNick, nil
|
|
235
|
+ return newNick, nil, back
|
236
|
236
|
} else if currentClient == client && currentClient.Nick() == newNick {
|
237
|
237
|
// see #1019: normally no-op nick changes are caught earlier, by performNickChange,
|
238
|
238
|
// but they are not detected there when force-guest-format is enabled (because
|
239
|
239
|
// the proposed nickname is e.g. alice and the current nickname is Guest-alice)
|
240
|
|
- return "", errNoop
|
|
240
|
+ return "", errNoop, false
|
241
|
241
|
}
|
242
|
242
|
// analogous checks for skeletons
|
243
|
243
|
skeletonHolder := clients.bySkeleton[newSkeleton]
|
244
|
244
|
if skeletonHolder != nil && skeletonHolder != client {
|
245
|
|
- return "", errNicknameInUse
|
|
245
|
+ return "", errNicknameInUse, false
|
246
|
246
|
}
|
247
|
247
|
|
248
|
248
|
clients.removeInternal(client)
|
249
|
249
|
clients.byNick[newCfNick] = client
|
250
|
250
|
clients.bySkeleton[newSkeleton] = client
|
251
|
251
|
client.updateNick(newNick, newCfNick, newSkeleton)
|
252
|
|
- return newNick, nil
|
|
252
|
+ return newNick, nil, false
|
253
|
253
|
}
|
254
|
254
|
|
255
|
255
|
func (clients *ClientManager) AllClients() (result []*Client) {
|