CEF/grumble
1
0
Fork 0
forked from External/grumble
Code Pull requests Activity

Make SuperUser a regular user (don't special case it).

Browse source
This commit is contained in:
Mikkel Krautz 2011-04-11 21:18:46 +02:00
parent 91b83edf9c
commit 5607764dfa
5 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
server.go
View file

@ -76,7 +76,6 @@ type Server struct {
Channels map[int]*Channel
// Users
superUserPassword string
Users map[uint32]*User
UserCertMap map[string]*User
UserNameMap map[string]*User
@ -118,7 +117,12 @@ func NewServer(id int64, addr string, port int) (s *Server, err os.Error) {
// Check whether password matches the set SuperUser password.
func (server *Server) CheckSuperUserPassword(password string) bool {
parts := strings.Split(server.superUserPassword, "$", -1)
superUser, exists := server.Users[0]
if !exists {
log.Panicf("Fatal error: No SuperUser for server %v", server.Id)
}
parts := strings.Split(superUser.Password, "$", -1)
if len(parts) != 3 {
return false
}
@ -374,7 +378,11 @@ func (server *Server) handleAuthenticate(client *Client, msg *Message) {
return
} else {
if server.CheckSuperUserPassword(*auth.Password) {
client.superUser = true
client.user, ok = server.UserNameMap[client.Username]
if !ok {
client.RejectAuth("InvalidUsername", "")
return
}
} else {
client.RejectAuth("WrongUserPW", "")
return