auth

Paddy 2015-07-15 Parent:6f473576c6ae

178:0a2c3d677161 Go to Latest

auth/session_postgres.go

Update to use a generic event emitter. Rather can creating a purpose-built event emitter for each and every event we need to emit (I'm looking at you, login verification event) which is _downright silly_, we're now using a generic event publisher that's based on saying "HEY A MODEL UPDATED". This means we need to change all our setup code in authd to use events.NewNSQPublisher or events.NewStdoutPublisher instead of our homegrown solutions. Which also means updating our config to take an events.Publisher instead of our LoginVerificationNotifier (blergh). Our Context also now uses an events.Publisher instead of a LoginVerificationNotifier. Party all around! We also replaced our SendLoginVerification helper method on Context with a SendModelEvent helper method on Context, which is just a light wrapper around events.PublishModelEvent. Of course, all this means we need to update our email_verification listener to listen to the correct channel (based on the model we want updates about) and filter down to a Created action or our new custom action for "the customer wants their verification resent", which I'm OK making a special case and not generic, because c'mon. But we had a subtle change to all our constants, some of which are unofficial constants now. I'm unsure how I feel about this. We also updated our email_verification listener so that we're unmarshalling to a custom loginEvent, which is just an events.Event that overwrites the Data property to be an auth.Login instance. This is to make sure we don't need to wrangle a map[string]interface{}, which is no fun. I'm also OK with special-casing like this, because it's 1) a tiny amount of code, 2) properly utilising composition, and 3) the only way I can think of to cleanly accomplish what I want. I also added a note about GetLogin's deficient handling of logins, namely that it doesn't recognise admins and return Verification codes to them, which would be a useful property for internal tools to take advantage of. Ah well. I updated the Profile and Login implementations so they're now event.Model instances, mainly by just exporting some strings from them through getters that will let us automatically build an Event from them. This lets us use the PublishModelEvent helper. I updated our CreateProfileHandler to properly mangle the login Verification property, and to fire off the ActionCreated events for the new Login and the new Profile. I updated our GetLoginHandler and UpdateLoginHandler to properly mangle the loginVerification property. God that's annoying. :-/ You'll note I didn't start publishing the events.ActionUpdated or events.ActionDeleted events for Profiles or Logins yet, and didn't bother publishing any events for literally any other type. That's because I'm a lazy piece of crap and will end up publishing them when I absolutely have to. Part of that is because if a channel isn't created/being read for a topic, the messages will just stack up in NSQ, and I don't want that. But mostly I'm lazy. Finally, I got to delete the entire profile_verification.go file, because we're no longer special-casing that. Hooray!

Download raw file
View source Diff to previous Annotate
History
paddy@154 1 package auth
paddy@154 2
paddy@154 3 import (
paddy@154 4 "time"
paddy@154 5
paddy@154 6 "code.secondbit.org/uuid.hg"
paddy@154 7
paddy@154 8 "github.com/lib/pq"
paddy@154 9 "github.com/secondbit/pan"
paddy@154 10 )
paddy@154 11
paddy@154 12 func (s Session) GetSQLTableName() string {
paddy@154 13 return "sessions"
paddy@154 14 }
paddy@154 15
paddy@154 16 func (p *postgres) createSessionSQL(session Session) *pan.Query {
paddy@154 17 fields, values := pan.GetFields(session)
paddy@154 18 query := pan.New(pan.POSTGRES, "INSERT INTO "+pan.GetTableName(session))
paddy@154 19 query.Include("(" + pan.QueryList(fields) + ")")
paddy@154 20 query.Include("VALUES")
paddy@154 21 query.Include("("+pan.VariableList(len(values))+")", values...)
paddy@154 22 return query.FlushExpressions(" ")
paddy@154 23 }
paddy@154 24
paddy@154 25 func (p *postgres) createSession(session Session) error {
paddy@154 26 query := p.createSessionSQL(session)
paddy@154 27 _, err := p.db.Exec(query.String(), query.Args...)
paddy@154 28 if e, ok := err.(*pq.Error); ok && e.Constraint == "sessions_pkey" {
paddy@154 29 err = ErrSessionAlreadyExists
paddy@154 30 }
paddy@154 31 return err
paddy@154 32 }
paddy@154 33
paddy@154 34 func (p *postgres) getSessionSQL(id string) *pan.Query {
paddy@154 35 var session Session
paddy@154 36 fields, _ := pan.GetFields(session)
paddy@154 37 query := pan.New(pan.POSTGRES, "SELECT "+pan.QueryList(fields)+" FROM "+pan.GetTableName(session))
paddy@154 38 query.IncludeWhere()
paddy@154 39 query.Include(pan.GetUnquotedColumn(session, "ID")+" = ?", id)
paddy@154 40 return query.FlushExpressions(" ")
paddy@154 41 }
paddy@154 42
paddy@154 43 func (p *postgres) getSession(id string) (Session, error) {
paddy@154 44 query := p.getSessionSQL(id)
paddy@154 45 rows, err := p.db.Query(query.String(), query.Args...)
paddy@154 46 if err != nil {
paddy@154 47 return Session{}, err
paddy@154 48 }
paddy@154 49 var session Session
paddy@154 50 var found bool
paddy@154 51 for rows.Next() {
paddy@154 52 err := pan.Unmarshal(rows, &session)
paddy@154 53 if err != nil {
paddy@154 54 return session, err
paddy@154 55 }
paddy@154 56 found = true
paddy@154 57 }
paddy@154 58 if err = rows.Err(); err != nil {
paddy@154 59 return session, err
paddy@154 60 }
paddy@154 61 if !found {
paddy@154 62 return session, ErrSessionNotFound
paddy@154 63 }
paddy@154 64 return session, nil
paddy@154 65 }
paddy@154 66
paddy@159 67 func (p *postgres) terminateSessionSQL(id string) *pan.Query {
paddy@159 68 var session Session
paddy@159 69 query := pan.New(pan.POSTGRES, "UPDATE "+pan.GetTableName(session)+" SET")
paddy@159 70 query.Include(pan.GetUnquotedColumn(session, "Active")+" = ?", false)
paddy@159 71 query.IncludeWhere()
paddy@159 72 query.Include(pan.GetUnquotedColumn(session, "ID")+" = ?", id)
paddy@159 73 return query.FlushExpressions(" ")
paddy@159 74 }
paddy@159 75
paddy@159 76 func (p *postgres) terminateSession(id string) error {
paddy@159 77 query := p.terminateSessionSQL(id)
paddy@159 78 res, err := p.db.Exec(query.String(), query.Args...)
paddy@159 79 if err != nil {
paddy@159 80 return err
paddy@159 81 }
paddy@159 82 rows, err := res.RowsAffected()
paddy@159 83 if err != nil {
paddy@159 84 return err
paddy@159 85 }
paddy@159 86 if rows < 1 {
paddy@159 87 return ErrSessionNotFound
paddy@159 88 }
paddy@159 89 return nil
paddy@159 90 }
paddy@159 91
paddy@162 92 func (p *postgres) terminateSessionsByProfileSQL(profile uuid.ID) *pan.Query {
paddy@162 93 var session Session
paddy@162 94 query := pan.New(pan.POSTGRES, "UPDATE "+pan.GetTableName(session)+" SET")
paddy@162 95 query.Include(pan.GetUnquotedColumn(session, "Active")+" = ?", false)
paddy@162 96 query.IncludeWhere()
paddy@162 97 query.Include(pan.GetUnquotedColumn(session, "ProfileID")+" = ?", profile)
paddy@162 98 return query.FlushExpressions(" ")
paddy@162 99 }
paddy@162 100
paddy@162 101 func (p *postgres) terminateSessionsByProfile(profile uuid.ID) error {
paddy@162 102 query := p.terminateSessionsByProfileSQL(profile)
paddy@162 103 res, err := p.db.Exec(query.String(), query.Args...)
paddy@162 104 if err != nil {
paddy@162 105 return err
paddy@162 106 }
paddy@162 107 rows, err := res.RowsAffected()
paddy@162 108 if err != nil {
paddy@162 109 return err
paddy@162 110 }
paddy@162 111 if rows < 1 {
paddy@162 112 return ErrProfileNotFound
paddy@162 113 }
paddy@162 114 return nil
paddy@162 115 }
paddy@162 116
paddy@154 117 func (p *postgres) removeSessionSQL(id string) *pan.Query {
paddy@154 118 var session Session
paddy@154 119 query := pan.New(pan.POSTGRES, "DELETE FROM "+pan.GetTableName(session))
paddy@154 120 query.IncludeWhere()
paddy@154 121 query.Include(pan.GetUnquotedColumn(session, "ID")+" = ?", id)
paddy@154 122 return query.FlushExpressions(" ")
paddy@154 123 }
paddy@154 124
paddy@154 125 func (p *postgres) removeSession(id string) error {
paddy@154 126 query := p.removeSessionSQL(id)
paddy@154 127 res, err := p.db.Exec(query.String(), query.Args...)
paddy@154 128 if err != nil {
paddy@154 129 return err
paddy@154 130 }
paddy@154 131 rows, err := res.RowsAffected()
paddy@154 132 if err != nil {
paddy@154 133 return err
paddy@154 134 }
paddy@154 135 if rows < 1 {
paddy@154 136 return ErrSessionNotFound
paddy@154 137 }
paddy@154 138 return nil
paddy@154 139 }
paddy@154 140
paddy@154 141 func (p *postgres) listSessionsSQL(profile uuid.ID, before time.Time, num int64) *pan.Query {
paddy@154 142 var session Session
paddy@154 143 fields, _ := pan.GetFields(session)
paddy@154 144 query := pan.New(pan.POSTGRES, "SELECT "+pan.QueryList(fields)+" FROM "+pan.GetTableName(session))
paddy@154 145 query.IncludeWhere()
paddy@154 146 query.Include(pan.GetUnquotedColumn(session, "ProfileID")+" = ?", profile)
paddy@154 147 if !before.IsZero() {
paddy@154 148 query.Include(pan.GetUnquotedColumn(session, "Created")+" < ?", before)
paddy@154 149 }
paddy@154 150 query.FlushExpressions(" AND ")
paddy@154 151 if num > 0 {
paddy@154 152 query.IncludeLimit(num)
paddy@154 153 }
paddy@154 154 return query.FlushExpressions(" ")
paddy@154 155 }
paddy@154 156
paddy@154 157 func (p *postgres) listSessions(profile uuid.ID, before time.Time, num int64) ([]Session, error) {
paddy@154 158 query := p.listSessionsSQL(profile, before, num)
paddy@154 159 rows, err := p.db.Query(query.String(), query.Args...)
paddy@154 160 if err != nil {
paddy@154 161 return []Session{}, err
paddy@154 162 }
paddy@154 163 var sessions []Session
paddy@154 164 for rows.Next() {
paddy@154 165 var session Session
paddy@154 166 err := pan.Unmarshal(rows, &session)
paddy@154 167 if err != nil {
paddy@154 168 return sessions, err
paddy@154 169 }
paddy@154 170 sessions = append(sessions, session)
paddy@154 171 }
paddy@154 172 if err = rows.Err(); err != nil {
paddy@154 173 return sessions, err
paddy@154 174 }
paddy@154 175 return sessions, nil
paddy@154 176 }