aclindsa/go-asink
1
0
Fork 0
Code Releases Activity

Finish adding simple user authentication

Browse Source
This commit is contained in:
Aaron Lindsay
2013-08-28 23:05:28 -04:00
parent 7009b0eda8
commit 9c442254a7
7 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/database.go
View File

@ -64,7 +64,7 @@ func GetAndInitDB() (*AsinkDB, error) {
return ret, nil
}
func (adb *AsinkDB) DatabaseAddEvent(e *asink.Event) (err error) {
func (adb *AsinkDB) DatabaseAddEvent(u *User, e *asink.Event) (err error) {
adb.lock.Lock()
tx, err := adb.db.Begin()
if err != nil {
@ -79,7 +79,7 @@ func (adb *AsinkDB) DatabaseAddEvent(e *asink.Event) (err error) {
adb.lock.Unlock()
}()
result, err := tx.Exec("INSERT INTO events (userid, type, path, hash, predecessor, timestamp, permissions) VALUES (?,?,?,?,?,?,?,?);", e.Type, e.Path, e.Hash, e.Predecessor, e.Timestamp, e.Permissions)
result, err := tx.Exec("INSERT INTO events (userid, type, path, hash, predecessor, timestamp, permissions) VALUES (?,?,?,?,?,?,?);", u.Id, e.Type, e.Path, e.Hash, e.Predecessor, e.Timestamp, e.Permissions)
if err != nil {
return err
}
@ -97,13 +97,13 @@ func (adb *AsinkDB) DatabaseAddEvent(e *asink.Event) (err error) {
return nil
}
func (adb *AsinkDB) DatabaseRetrieveEvents(firstId uint64, maxEvents uint) (events []*asink.Event, err error) {
func (adb *AsinkDB) DatabaseRetrieveEvents(firstId uint64, maxEvents uint, u *User) (events []*asink.Event, err error) {
adb.lock.Lock()
//make sure the database gets unlocked on return
defer func() {
adb.lock.Unlock()
}()
rows, err := adb.db.Query("SELECT id, type, path, hash, predecessor, timestamp, permissions FROM events WHERE id >= ? ORDER BY id ASC LIMIT ?;", firstId, maxEvents)
rows, err := adb.db.Query("SELECT id, type, path, hash, predecessor, timestamp, permissions FROM events WHERE userid = ? AND id >= ? ORDER BY id ASC LIMIT ?;", u.Id, firstId, maxEvents)
if err != nil {
return nil, err
}

8
server/server/longpolling.go
View File

@ -13,17 +13,17 @@ type LongPollGroup struct {
type PollingManager struct {
lock sync.RWMutex
groups map[string]*LongPollGroup
groups map[int64]*LongPollGroup
}
var pm *PollingManager
func init() {
pm = new(PollingManager)
pm.groups = make(map[string]*LongPollGroup)
pm.groups = make(map[int64]*LongPollGroup)
}
func addPoller(uid string, channel *chan *asink.Event) {
func addPoller(uid int64, channel *chan *asink.Event) {
pm.lock.RLock()
group := pm.groups[uid]
@ -57,7 +57,7 @@ func addPoller(uid string, channel *chan *asink.Event) {
})
}
func broadcastToPollers(uid string, event *asink.Event) {
func broadcastToPollers(uid int64, event *asink.Event) {
//store off the long polling group we're trying to send to and remove
//it from PollingManager.groups
pm.lock.Lock()

20
server/server/server.go
View File

@ -62,7 +62,7 @@ func rootHandler(w http.ResponseWriter, r *http.Request) {
fmt.Fprintf(w, "You're probably looking for /events/")
}
func getEvents(w http.ResponseWriter, r *http.Request, nextEvent uint64) {
func getEvents(w http.ResponseWriter, r *http.Request, user *server.User, nextEvent uint64) {
var events []*asink.Event
var error_message string = ""
defer func() {
@ -86,7 +86,7 @@ func getEvents(w http.ResponseWriter, r *http.Request, nextEvent uint64) {
w.Write(b)
}()
events, err := adb.DatabaseRetrieveEvents(nextEvent, 50)
events, err := adb.DatabaseRetrieveEvents(nextEvent, 50, user)
if err != nil {
panic(err)
error_message = err.Error()
@ -96,7 +96,7 @@ func getEvents(w http.ResponseWriter, r *http.Request, nextEvent uint64) {
//long-poll if events is empty
if len(events) == 0 {
c := make(chan *asink.Event)
addPoller("aclindsa", &c) //TODO support more than one user
addPoller(user.Id, &c) //TODO support more than one share per user
e, ok := <-c
if ok {
events = append(events, e)
@ -104,7 +104,7 @@ func getEvents(w http.ResponseWriter, r *http.Request, nextEvent uint64) {
}
}
func putEvents(w http.ResponseWriter, r *http.Request) {
func putEvents(w http.ResponseWriter, r *http.Request, user *server.User) {
var events asink.EventList
var error_message string = ""
defer func() {
@ -138,7 +138,7 @@ func putEvents(w http.ResponseWriter, r *http.Request) {
return
}
for _, event := range events.Events {
err = adb.DatabaseAddEvent(event)
err = adb.DatabaseAddEvent(user, event)
if err != nil {
//TODO should probably do this in a way that the caller knows how many of these have failed and doesn't re-try sending ones that succeeded
//i.e. add this to the return codes or something
@ -148,7 +148,7 @@ func putEvents(w http.ResponseWriter, r *http.Request) {
}
}
broadcastToPollers("aclindsa", events.Events[0]) //TODO support more than one user
broadcastToPollers(user.Id, events.Events[0]) //TODO support more than one user
}
func eventHandler(w http.ResponseWriter, r *http.Request) {
@ -172,15 +172,15 @@ func eventHandler(w http.ResponseWriter, r *http.Request) {
if err != nil {
//TODO display error message here instead
fmt.Printf("ERROR parsing " + sm[1] + "\n")
getEvents(w, r, 0)
getEvents(w, r, user, 0)
} else {
getEvents(w, r, i)
getEvents(w, r, user, i)
}
} else {
getEvents(w, r, 0)
getEvents(w, r, user, 0)
}
} else if r.Method == "POST" {
putEvents(w, r)
putEvents(w, r, user)
} else {
apiresponse := asink.APIResponse{
Status: asink.ERROR,