auth
auth/config.go
Fix tests for scopeStore. Update all our tests to use the PG_TEST_DB environment variable if set, and use that to control whether or not the postgres tests get run. testing.Short() just wasn't working. Update ErrScopeNotFound and ErrScopeAlreadyExists to be variables instead of types, because PostgreSQL (annoyingly) offers no way to determine which specific row insertion caused the problem, and I anticipate this being a problem that is ongoing. So it's really just not worth it. Stop getScopes from returning an ErrScopeNotFound. Let's return what we find, and let the absence of what we didn't find speak for itself. Fix an error with generating the SQL for the postgres.createScopes call. We used to generate it in a way that was invalid (not joining values with ",") when more than one set of values was supplied. Hooray, testing! Update the postgres scopeStore to return ErrScopeNotFound and ErrScopeAlreadyExists errors, as appropriate. Update our tests to reflect that ErrScopeNotFound and ErrScopeAlreadyExists are now variables, not types.
| paddy@96 | 1 package auth |
| paddy@96 | 2 |
| paddy@96 | 3 import ( |
| paddy@96 | 4 "errors" |
| paddy@96 | 5 "html/template" |
| paddy@101 | 6 "log" |
| paddy@96 | 7 ) |
| paddy@96 | 8 |
| paddy@96 | 9 var ( |
| paddy@96 | 10 // ErrInvalidLoginURI is returned when a Context is instantiated with a Config object that specifies a LoginURI that can't be parsed as a URL. |
| paddy@96 | 11 ErrInvalidLoginURI = errors.New("invalid login URI") |
| paddy@102 | 12 // ErrConfigNotInitialized is returned when a Context is instantiated with a Config object that hasn't had its Init function called. |
| paddy@102 | 13 ErrConfigNotInitialized = errors.New("config not initialized") |
| paddy@96 | 14 ) |
| paddy@96 | 15 |
| paddy@96 | 16 // Config holds the configuration values necessary to run a server. A Config |
| paddy@96 | 17 // instance is the only way to instantiate a Context variable. |
| paddy@96 | 18 type Config struct { |
| paddy@96 | 19 ClientStore clientStore |
| paddy@96 | 20 AuthCodeStore authorizationCodeStore |
| paddy@96 | 21 ProfileStore profileStore |
| paddy@96 | 22 TokenStore tokenStore |
| paddy@96 | 23 SessionStore sessionStore |
| paddy@134 | 24 ScopeStore scopeStore |
| paddy@96 | 25 Template *template.Template |
| paddy@96 | 26 LoginURI string |
| paddy@96 | 27 iterations int |
| paddy@132 | 28 secureCookie bool |
| paddy@96 | 29 } |
| paddy@101 | 30 |
| paddy@102 | 31 // Init is a function that preps the Config object to be used for Context creation, setting variables |
| paddy@102 | 32 // that are determined at the beginning of program execution. |
| paddy@101 | 33 func (c *Config) Init() error { |
| paddy@101 | 34 scheme, ok := passphraseSchemes[CurPassphraseScheme] |
| paddy@101 | 35 if !ok { |
| paddy@101 | 36 return ErrInvalidPassphraseScheme |
| paddy@101 | 37 } |
| paddy@101 | 38 var err error |
| paddy@101 | 39 c.iterations, err = scheme.calculateIterations() |
| paddy@101 | 40 if err != nil { |
| paddy@101 | 41 return err |
| paddy@101 | 42 } |
| paddy@101 | 43 log.Printf("Generating passphrases with %d iterations...\n", c.iterations) |
| paddy@101 | 44 return nil |
| paddy@101 | 45 } |