nmdc: add extra EVENT_BAD_LOGIN_FAILURE for bad pass, hub-full etc

This commit is contained in:
mappu 2018-06-04 19:28:08 +12:00
parent 9eddfc6e58
commit 74c20aaed6
2 changed files with 5 additions and 0 deletions

View File

@ -14,6 +14,7 @@ const (
EVENT_HUBNAME_CHANGED HubEventType = 9 EVENT_HUBNAME_CHANGED HubEventType = 9
EVENT_DEBUG_MESSAGE HubEventType = 10 EVENT_DEBUG_MESSAGE HubEventType = 10
EVENT_USERCOMMAND HubEventType = 11 EVENT_USERCOMMAND HubEventType = 11
EVENT_BAD_LOGIN_FAILURE HubEventType = 12
) )
type HubEvent struct { type HubEvent struct {

View File

@ -94,6 +94,7 @@ func (this *NmdcProtocol) ProcessCommand(message string) {
this.hc.processEvent(HubEvent{EventType: EVENT_HUBNAME_CHANGED, Nick: commandParts[1]}) this.hc.processEvent(HubEvent{EventType: EVENT_HUBNAME_CHANGED, Nick: commandParts[1]})
case "$ValidateDenide": // sic case "$ValidateDenide": // sic
this.hc.processEvent(HubEvent{EventType: EVENT_BAD_LOGIN_FAILURE})
if len(this.hc.Hco.NickPassword) > 0 { if len(this.hc.Hco.NickPassword) > 0 {
this.hc.processEvent(HubEvent{EventType: EVENT_SYSTEM_MESSAGE_FROM_CONN, Message: "Incorrect password."}) this.hc.processEvent(HubEvent{EventType: EVENT_SYSTEM_MESSAGE_FROM_CONN, Message: "Incorrect password."})
} else { } else {
@ -101,15 +102,18 @@ func (this *NmdcProtocol) ProcessCommand(message string) {
} }
case "$HubIsFull": case "$HubIsFull":
this.hc.processEvent(HubEvent{EventType: EVENT_BAD_LOGIN_FAILURE})
this.hc.processEvent(HubEvent{EventType: EVENT_SYSTEM_MESSAGE_FROM_CONN, Message: "Hub is full."}) this.hc.processEvent(HubEvent{EventType: EVENT_SYSTEM_MESSAGE_FROM_CONN, Message: "Hub is full."})
case "$BadPass": case "$BadPass":
this.hc.processEvent(HubEvent{EventType: EVENT_BAD_LOGIN_FAILURE})
this.hc.processEvent(HubEvent{EventType: EVENT_SYSTEM_MESSAGE_FROM_CONN, Message: "Incorrect password."}) this.hc.processEvent(HubEvent{EventType: EVENT_SYSTEM_MESSAGE_FROM_CONN, Message: "Incorrect password."})
case "$GetPass": case "$GetPass":
if len(this.hc.Hco.NickPassword) == 0 { if len(this.hc.Hco.NickPassword) == 0 {
// We've got a problem. MyPass with no arguments is a syntax error with no message = instant close // We've got a problem. MyPass with no arguments is a syntax error with no message = instant close
// Just drop the connection // Just drop the connection
this.hc.processEvent(HubEvent{EventType: EVENT_BAD_LOGIN_FAILURE})
this.hc.processEvent(HubEvent{EventType: EVENT_SYSTEM_MESSAGE_FROM_CONN, Message: "This account is passworded."}) this.hc.processEvent(HubEvent{EventType: EVENT_SYSTEM_MESSAGE_FROM_CONN, Message: "This account is passworded."})
this.hc.Disconnect() this.hc.Disconnect()
} else { } else {