@ -61,7 +61,7 @@ const (
var permissionLabels = map [ int ] string {
PERMISSION_CLIENT : "Client" ,
PERMISSION_REGISTERED : "Registered ",
PERMISSION_REGISTERED : "Registered Client ",
PERMISSION_VIP : "VIP" ,
PERMISSION_MODERATOR : "Moderator" ,
PERMISSION_ADMIN : "Administrator" ,
@ -269,7 +269,7 @@ func (s *Server) revealClient(channel string, identifier string) *Client {
log . Println ( "hash not found" )
return nil
}
log . Println ( "have hash" )
cls := s . getClients ( "" )
for _ , rcl := range cls {
if rcl . iphash == riphash || ( rcl . account > 0 && rcl . account == raccount ) {
@ -280,7 +280,7 @@ func (s *Server) revealClient(channel string, identifier string) *Client {
return nil
}
func ( s * Server ) revealClientInfo ( channel string , identifier string ) ( string , int ) {
func ( s * Server ) revealClientInfo ( channel string , identifier string ) ( string , int 64 ) {
if len ( identifier ) != 5 {
return "" , 0
}
@ -344,7 +344,7 @@ func (s *Server) joinChannel(channel string, client string) {
}
ch . clients . Store ( client , s . clientsInChannel ( channel , client ) + 1 )
cl . write ( & irc . Message { cl . getPrefix ( ) , irc . JOIN , [ ] string { channel } } )
cl . write ( cl . getPrefix ( ) , irc . JOIN , [ ] string { channel } )
ch . Log ( cl , irc . JOIN , "" )
s . sendNames ( channel , client )
@ -360,7 +360,7 @@ func (s *Server) partChannel(channel string, client string, reason string) {
return
}
cl . write ( & irc . Message { cl . getPrefix ( ) , irc . PART , [ ] string { channel , reason } } )
cl . write ( cl . getPrefix ( ) , irc . PART , [ ] string { channel , reason } )
ch . Log ( cl , irc . PART , reason )
ch . clients . Delete ( client )
@ -374,7 +374,7 @@ func (s *Server) partAllChannels(client string, reason string) {
}
}
func ( s * Server ) revealChannelLog ( channel string , client string , page int , fu ll bool ) {
func ( s * Server ) revealChannelLog ( channel string , client string , page int , showA ll bool ) {
cl := s . getClient ( client )
if cl == nil {
return
@ -390,7 +390,7 @@ func (s *Server) revealChannelLog(channel string, client string, page int, full
return
}
r := ch . RevealLog ( page , fu ll)
r := ch . RevealLog ( page , showA ll)
for _ , rev := range r {
cl . sendMessage ( rev )
}
@ -452,7 +452,7 @@ func (s *Server) updateClientCount(channel string, client string, reason string)
if ccount < chancount {
for i := ccount ; i < chancount ; i ++ {
cl . write ( & irc . Message { s . getAnonymousPrefix ( i ) , irc . JOIN , [ ] string { channel } } )
cl . write ( s . getAnonymousPrefix ( i ) , irc . JOIN , [ ] string { channel } )
}
ch . clients . Store ( cl . identifier , chancount )
@ -463,7 +463,7 @@ func (s *Server) updateClientCount(channel string, client string, reason string)
pr = reason
}
cl . write ( & irc . Message { s . getAnonymousPrefix ( i - 1 ) , irc . PART , [ ] string { channel , pr } } )
cl . write ( s . getAnonymousPrefix ( i - 1 ) , irc . PART , [ ] string { channel , pr } )
reasonShown = true
}
} else {
@ -525,7 +525,7 @@ func (s *Server) sendTopic(channel string, client string, changed bool) {
tprefix = prefixAnonIRC
tcommand = irc . RPL_TOPIC
}
cl . write ( & irc. Message { & tprefix, tcommand , [ ] string { channel , ch . topic } } )
cl . write ( & , tcommand , [ ] string { channel , ch . topic } )
if ! changed {
cl . writeMessage ( strings . Join ( [ ] string { irc . RPL_TOPICWHOTIME , cl . nick , channel , prefixAnonymous . Name , fmt . Sprintf ( "%d" , ch . topictime ) } , " " ) , nil )
@ -627,7 +627,7 @@ func (s *Server) handleMode(c *Client, params []string) {
ch . clients . Range ( func ( k , v interface { } ) bool {
cl := s . getClient ( k . ( string ) )
if cl != nil {
cl . write ( & irc. Message { & prefixAnonymous, irc . MODE , [ ] string { params [ 0 ] , ch . printModes ( addedmodes , removedmodes ) } } )
cl . write ( & , irc . MODE , [ ] string { params [ 0 ] , ch . printModes ( addedmodes , removedmodes ) } )
}
return true
@ -706,18 +706,112 @@ func (s *Server) sendUsage(cl *Client, command string) {
}
sort . Strings ( commands )
var printedLabel bool
var usage [ ] string
for _ , cmd := range commands {
usage = u [ cmd ]
if command == COMMAND_HELP {
// Print all commands
var perms [ ] int
for permission := range permissionLabels {
perms = append ( perms , permission )
}
sort . Ints ( perms )
for i := 0 ; i < 2 ; i ++ {
serverLabel := ""
if i == 1 {
serverLabel = "Server "
}
for _ , permission := range perms {
printedLabel = false
for _ , cmd := range commands {
if cl . permissionRequired ( cmd ) != permission {
continue
} else if ( i == 0 && containsString ( serverCommands , cmd ) ) || ( i == 1 && ! containsString ( serverCommands , cmd ) ) {
continue
}
cl . sendMessage ( cmd + " " + usage [ 0 ] )
for _ , ul := range usage [ 1 : ] {
cl . sendMessage ( " " + ul )
if ! printedLabel {
cl . sendNotice ( serverLabel + permissionLabels [ permission ] + " Commands" )
printedLabel = true
}
usage = u [ cmd ]
cl . sendMessage ( cmd + " " + usage [ 0 ] )
for _ , ul := range usage [ 1 : ] {
cl . sendMessage ( " " + ul )
}
}
}
}
} else {
// TODO: Cleanup/merge
for _ , cmd := range commands {
usage = u [ cmd ]
cl . sendMessage ( cmd + " " + usage [ 0 ] )
for _ , ul := range usage [ 1 : ] {
cl . sendMessage ( " " + ul )
}
}
}
}
func ( s * Server ) ban ( channel string , iphash string , accountid int64 , expires int64 , reason string ) error {
if channel == "" || expires < 0 {
log . Println ( "invalid args" )
return nil
}
b := DBBan { }
if iphash != "" {
b = DBBan { Channel : generateHash ( channel ) , Type : BAN_TYPE_ADDRESS , Target : iphash , Expires : expires }
err := db . AddBan ( b )
if err != nil {
return err
}
}
if accountid > 0 {
b = DBBan { Channel : generateHash ( channel ) , Type : BAN_TYPE_ACCOUNT , Target : fmt . Sprintf ( "%d" , accountid ) , Expires : expires }
err := db . AddBan ( b )
if err != nil {
return err
}
}
if b . Channel == "" {
log . Println ( "blank chan" )
return nil
}
ch := channel
rs := formatAction ( "Banned" , reason )
if channel == CHANNEL_SERVER {
ch = ""
rs = formatAction ( "Killed" , reason )
}
cls := s . getClients ( ch )
for _ , cl := range cls {
if cl == nil {
continue
}
if ( iphash != "" && cl . iphash == iphash ) || ( accountid > 0 && cl . account == accountid ) {
if channel == CHANNEL_SERVER {
s . killClient ( cl , rs )
} else {
s . partChannel ( channel , cl . identifier , rs )
}
}
}
return nil
}
func ( s * Server ) handleUserCommand ( client string , command string , params [ ] string ) {
cl := s . getClient ( client )
if cl == nil {
@ -860,22 +954,28 @@ func (s *Server) handleUserCommand(client string, command string, params []strin
}
page := 1
all := false
if len ( params ) > 1 {
page , err = strconv . Atoi ( params [ 1 ] )
if err != nil || page < - 1 || page == 0 {
cl . sendError ( "Unable to reveal, invalid page specified" )
return
if strings . ToLower ( params [ 1 ] ) == "all" {
page = - 1
all = true
} else {
cl . sendError ( "Unable to reveal, invalid page specified" )
return
}
}
}
full := false
if len ( params ) > 2 {
if strings . ToLower ( params [ 2 ] ) == " fu ll" {
fu ll = true
if strings . ToLower ( params [ 2 ] ) == " a ll" {
a ll = true
}
}
s . revealChannelLog ( params [ 0 ] , cl . identifier , page , fu ll)
s . revealChannelLog ( params [ 0 ] , cl . identifier , page , a ll)
case COMMAND_KICK :
if len ( params ) < 2 {
s . sendUsage ( cl , command )
@ -900,7 +1000,7 @@ func (s *Server) handleUserCommand(client string, command string, params []strin
}
s . partChannel ( ch . identifier , rcl . identifier , reason )
cl . sendMessage ( fmt . Sprintf ( "Kicked %s %s" , params [ 0 ] , params [ 1 ] ) )
case COMMAND_BAN
case COMMAND_BAN , COMMAND_KILL :
if len ( params ) < 3 {
s . sendUsage ( cl , command )
return
@ -908,44 +1008,40 @@ func (s *Server) handleUserCommand(client string, command string, params []strin
ch := s . getChannel ( params [ 0 ] )
if ch == nil {
cl . sendError ( "Unable to ban, invalid channel specified" )
cl . sendError ( fmt . Sprintf ( "Unable to %s, invalid channel specified" , strings . ToLower ( command ) ) )
return
}
rcl := s . revealClient ( params [ 0 ] , params [ 1 ] )
if rcl == nil {
cl . sendError ( "Unable to ban, client not found or no longer connected" )
cl . sendError ( fmt . Sprintf ( "Unable to %s, client not found or no longer connected" , strings . ToLower ( command ) ) )
return
}
reason := strings . Join ( params [ 3 : ] , " " )
expires := parseDuration ( params [ 2 ] )
if expires < 0 {
cl . sendError ( fmt . Sprintf ( "Unable to %s, invalid duration supplied" , strings . ToLower ( command ) ) )
return
} else if expires > 0 {
expires = time . Now ( ) . Unix ( ) + expires
}
partmsg := "Banned"
reason := " "
if len ( params ) > 3 {
partmsg = fmt . Sprintf ( "%s: %s" , partmsg , reason )
}
// TODO: Apply ban in DB
s . partChannel ( ch . identifier , rcl . identifier , partmsg )
cl . sendMessage ( fmt . Sprintf ( "Banned %s %s" , params [ 0 ] , params [ 1 ] ) )
case COMMAND_KILL :
if len ( params ) < 3 {
s . sendUsage ( cl , command )
return
strings . Join ( params [ 3 : ] , " " )
}
rcl := s . revealClient ( params [ 0 ] , params [ 1 ] )
if rcl == nil {
cl . sendError ( "Unable to kill, client not found or no longer connected" )
bch := ch . identifier
if command == COMMAND_KILL {
bch = CHANNEL_SERVER
}
err := s . ban ( bch , rcl . iphash , rcl . account , expires , reason )
if err != nil {
cl . sendError ( fmt . Sprintf ( "Unable to %s, %v" , strings . ToLower ( command ) , err ) )
return
}
reason := "Killed"
if len ( params ) > 3 {
reason = fmt . Sprintf ( "%s: %s" , reason , strings . Join ( params [ 3 : ] , " " ) )
}
s . partAllChannels ( rcl . identifier , reason )
s . killClient ( rcl )
cl . sendMessage ( fmt . Sprintf ( "Killed %s %s" , params [ 0 ] , params [ 1 ] ) )
cl . sendMessage ( fmt . Sprintf ( "%sed %s %s" , strings . ToLower ( command ) , params [ 0 ] , params [ 1 ] ) )
case COMMAND_STATS :
cl . sendMessage ( fmt . Sprintf ( "%d clients in %d channels" , s . clientCount ( ) , s . channelCount ( ) ) )
@ -996,7 +1092,7 @@ func (s *Server) handlePrivmsg(channel string, client string, message string) {
ch . clients . Range ( func ( k , v interface { } ) bool {
chcl := s . getClient ( k . ( string ) )
if chcl != nil && chcl . identifier != client {
chcl . write ( & irc. Message { & prefixAnonymous, irc . PRIVMSG , [ ] string { channel , message } } )
chcl . write ( & , irc . PRIVMSG , [ ] string { channel , message } )
}
return true
@ -1013,14 +1109,14 @@ func (s *Server) handleRead(c *Client) {
c . conn . SetReadDeadline ( time . Now ( ) . Add ( 300 * time . Second ) )
if _ , ok := s . clients . Load ( c . identifier ) ; ! ok {
s . killClient ( c
s . killClient ( c , "" )
return
}
msg , err := c . reader . Decode ( )
if msg == nil || err != nil {
// Error decoding message, client probably disconnected
s . killClient ( c
s . killClient ( c , "" )
return
}
if debugMode && ( verbose || ( len ( msg . Command ) >= 4 && msg . Command [ 0 : 4 ] != irc . PING && msg . Command [ 0 : 4 ] != irc . PONG ) ) {
@ -1065,7 +1161,7 @@ func (s *Server) handleRead(c *Client) {
if ! authSuccess {
c . sendPasswordIncorrect ( )
s . killClient ( c
s . killClient ( c , "" )
}
} else if msg . Command == irc . CAP && len ( msg . Params ) > 0 && len ( msg . Params [ 0 ] ) > 0 && msg . Params [ 0 ] == irc . CAP_LS {
c . writeMessage ( irc . CAP , [ ] string { irc . CAP_LS , "userhost-in-names" } )
@ -1185,7 +1281,7 @@ func (s *Server) handleRead(c *Client) {
s . partChannel ( channel , c . identifier , "" )
}
} else if msg . Command == irc . QUIT {
s . killClient ( c
s . killClient ( c , "" )
} else {
s . handleUserCommand ( c . identifier , msg . Command , msg . Params )
}
@ -1251,10 +1347,10 @@ func (s *Server) handleConnection(conn net.Conn, ssl bool) {
go s . handleWrite ( client )
s . handleRead ( client ) // Block until the connection is closed
s . killClient ( client
s . killClient ( client , "" )
}
func ( s * Server ) killClient ( c * Client {
func ( s * Server ) killClient ( c * Client , reason string ) {
if c == nil || c . state == ENTITY_STATE_TERMINATING {
return
}
@ -1263,7 +1359,7 @@ func (s *Server) killClient(c *Client) {
select {
case c . terminate <- true :
if _ , ok := s . clients . Load ( c . identifier ) ; ok {
s . partAllChannels ( c . identifier , "" )
s . partAllChannels ( c . identifier , reason )
}
c . wg . Wait ( )
default :
@ -1343,7 +1439,7 @@ func (s *Server) pingClients() {
s . clients . Range ( func ( k , v interface { } ) bool {
cl := v . ( * Client )
if cl != nil {
cl . write ( & irc . Message { nil , irc . PING , [ ] string { fmt . Sprintf ( "anonirc%d%d" , int32 ( time . Now ( ) . Unix ( ) ) , rand . Intn ( 1000 ) ) } } )
cl . write ( nil , irc . PING , [ ] string { fmt . Sprintf ( "anonirc%d%d" , int32 ( time . Now ( ) . Unix ( ) ) , rand . Intn ( 1000 ) ) } )
}
return true
Trevor Slocum
5 years ago