source: code/trunk/server.go@ 336

Last change on this file since 336 was 329, checked in by delthas, 5 years ago

Add support for the user create admin service command

This adds support for user create, a new service command only accessible
to admin users. This lets users create other users on the fly and makes
soju start the user routine immediately; unlike sojuctl which currently
requires closing soju, creating the user, and starting soju again.

File size: 3.1 KB
RevLine 
[98]1package soju
[1]2
3import (
4 "fmt"
[37]5 "log"
[1]6 "net"
[323]7 "net/http"
[24]8 "sync"
[323]9 "sync/atomic"
[67]10 "time"
[1]11
12 "gopkg.in/irc.v3"
[323]13 "nhooyr.io/websocket"
[1]14)
15
[67]16// TODO: make configurable
[71]17var retryConnectMinDelay = time.Minute
[206]18var connectTimeout = 15 * time.Second
[205]19var writeTimeout = 10 * time.Second
[67]20
[9]21type Logger interface {
22 Print(v ...interface{})
23 Printf(format string, v ...interface{})
24}
25
[21]26type prefixLogger struct {
27 logger Logger
28 prefix string
29}
30
31var _ Logger = (*prefixLogger)(nil)
32
33func (l *prefixLogger) Print(v ...interface{}) {
34 v = append([]interface{}{l.prefix}, v...)
35 l.logger.Print(v...)
36}
37
38func (l *prefixLogger) Printf(format string, v ...interface{}) {
39 v = append([]interface{}{l.prefix}, v...)
40 l.logger.Printf("%v"+format, v...)
41}
42
[10]43type Server struct {
[319]44 Hostname string
45 Logger Logger
46 RingCap int
47 HistoryLimit int
48 LogPath string
49 Debug bool
[323]50 HTTPOrigins []string
[22]51
[77]52 db *DB
53
[172]54 lock sync.Mutex
55 users map[string]*user
[10]56}
57
[77]58func NewServer(db *DB) *Server {
[37]59 return &Server{
[319]60 Logger: log.New(log.Writer(), "", log.LstdFlags),
61 RingCap: 4096,
62 HistoryLimit: 1000,
63 users: make(map[string]*user),
64 db: db,
[37]65 }
66}
67
[5]68func (s *Server) prefix() *irc.Prefix {
69 return &irc.Prefix{Name: s.Hostname}
70}
71
[77]72func (s *Server) Run() error {
73 users, err := s.db.ListUsers()
74 if err != nil {
75 return err
76 }
[71]77
[77]78 s.lock.Lock()
79 for _, record := range users {
80 s.Logger.Printf("starting bouncer for user %q", record.Username)
81 u := newUser(s, &record)
82 s.users[u.Username] = u
[71]83
[77]84 go u.run()
[71]85 }
[37]86 s.lock.Unlock()
87
[77]88 select {}
[10]89}
90
[329]91func (s *Server) createUser(user *User) (*user, error) {
92 s.lock.Lock()
93 defer s.lock.Unlock()
94
95 if _, ok := s.users[user.Username]; ok {
96 return nil, fmt.Errorf("user %q already exists", user.Username)
97 }
98
99 err := s.db.StoreUser(user)
100 if err != nil {
101 return nil, fmt.Errorf("could not create user in db: %v", err)
102 }
103
104 s.Logger.Printf("starting bouncer for new user %q", user.Username)
105 u := newUser(s, user)
106 s.users[u.Username] = u
107 go u.run()
108 return u, nil
109}
110
[38]111func (s *Server) getUser(name string) *user {
112 s.lock.Lock()
113 u := s.users[name]
114 s.lock.Unlock()
115 return u
116}
117
[323]118var lastDownstreamID uint64 = 0
119
120func (s *Server) handle(ic ircConn, remoteAddr string) {
121 id := atomic.AddUint64(&lastDownstreamID, 1)
122 dc := newDownstreamConn(s, ic, remoteAddr, id)
123 if err := dc.runUntilRegistered(); err != nil {
124 dc.logger.Print(err)
125 } else {
126 dc.user.events <- eventDownstreamConnected{dc}
127 if err := dc.readMessages(dc.user.events); err != nil {
128 dc.logger.Print(err)
129 }
130 dc.user.events <- eventDownstreamDisconnected{dc}
131 }
132 dc.Close()
133}
134
[3]135func (s *Server) Serve(ln net.Listener) error {
[1]136 for {
[323]137 conn, err := ln.Accept()
[1]138 if err != nil {
139 return fmt.Errorf("failed to accept connection: %v", err)
140 }
141
[323]142 go s.handle(newNetIRCConn(conn), conn.RemoteAddr().String())
[1]143 }
144}
[323]145
146func (s *Server) ServeHTTP(w http.ResponseWriter, req *http.Request) {
147 conn, err := websocket.Accept(w, req, &websocket.AcceptOptions{
148 OriginPatterns: s.HTTPOrigins,
149 })
150 if err != nil {
151 s.Logger.Printf("failed to serve HTTP connection: %v", err)
152 return
153 }
154 s.handle(newWebsocketIRCConn(conn), req.RemoteAddr)
155}
Note: See TracBrowser for help on using the repository browser.