Commit Graph

74 Commits (810b75088833223754dbc8389633472b8acf2bc0)

Author SHA1 Message Date
Jared Scheib f1b9ee5c1b partial revert(43c5afe7) to fix GitHub Enterprise via Generic Oauth
The above commit was over-applied in #3168 to Generic Oauth in
addition to GitHub Oauth based on an assumption. It should only
have been applied to GitHub-specific OAuth. This over-application
introduced a bug where GitHub Enterprise did not work anymore.
2018-05-07 11:27:04 -07:00
Jonathan A. Sternberg 18c3c2320e Fix the github oauth2 implementation with multiple emails
If an account had multiple emails, the current implementation would
always select the first one regardless of any other settings. This fixes
it so it only chooses the primary email address that is verified.

This also fixes the generic oauth2 to require verified and primary to be
true if they are present. If they are not present, they are not
required.
2018-04-11 13:27:15 -05:00
Jared Scheib 99ac3c1a3e Fix tests for 0a98d1c7b 2018-03-28 15:27:11 -07:00
Benjamin Schweizer a231ec1108 added USE_ID_TOKEN option, defaulting off 2018-03-28 15:51:10 +02:00
Benjamin Schweizer 041887492e gofmt 2018-03-28 13:34:30 +02:00
Benjamin Schweizer 335d8dbb99 Merge branch 'master' of https://github.com/influxdata/chronograf 2018-03-28 13:30:05 +02:00
Brandon Farmer b1c5dc6cae Fix oauth callback test, broken by 2fe13e
Co-authored-by: Brandon Farmer <bthesorceror@gmail.com>
Co-authored-by: Jared Scheib <jared.scheib@gmail.com>
2018-03-08 14:59:50 -08:00
Jared Scheib 38bf04d081 Log error if Heroku API req responds with non-200-range code 2018-03-02 17:16:03 -06:00
Jared Scheib 77c8bdb138 Fix Heroku OAuth by adding required HTTP req header to API GET 2018-03-02 17:07:03 -06:00
Michael Desa 5da992ae27 Use Generic APIKey for Oauth2 group lookup 2018-02-22 12:54:20 -05:00
Benjamin Schweizer edc05d7409 Merge branch 'master' into master 2018-02-20 09:52:34 +01:00
Benjamin Schweizer 227009723d merged upstream, updated comments, added GroupFromClaims() 2018-02-20 09:47:42 +01:00
Benjamin Schweizer 84360ef143 fixed handling of empty id_tokens 2018-01-12 08:46:25 +01:00
Benjamin Schweizer 1e73251b06 added test case for mux/oauth2 id_token processing 2018-01-12 08:45:18 +01:00
Michael Desa b3f917e56c Use github group login for mapping 2018-01-10 16:38:55 -05:00
Michael Desa b5a0080546 Add group to oauth2.Principal 2018-01-10 15:56:13 -05:00
Benjamin Schweizer 30d03f78b6 added test cases for ValidClaims() 2017-12-13 16:00:21 +01:00
Benjamin Schweizer b17c89f755 updated existing test cases to interface changes 2017-12-13 15:55:21 +01:00
Benjamin Schweizer cd38be3eba fixed initialization, added expressive error message 2017-12-13 15:51:20 +01:00
Benjamin Schweizer 0f9fb94e42 go fmt + got vet 2017-12-13 09:13:11 +01:00
Benjamin Schweizer c291cd01b5 handle extra id_token in callback 2017-12-10 18:33:50 +01:00
Benjamin Schweizer f7c85429ef add support for RS256 signatures using JWKS 2017-12-10 18:26:27 +01:00
Jared Scheib c9e579acb2 Merge remote-tracking branch 'origin/master' into multitenancy 2017-12-05 11:43:23 -08:00
Chris Goller 0e72c0d16b Add GENERIC_API_KEY to override of oauth2 responses to support azure 2017-11-21 16:55:03 -06:00
Michael Desa 94179f8f34 Add comment of how to generate JWT tokens 2017-11-01 16:05:56 -04:00
Michael Desa e7a94c18d6 Add comments throughout codebase 2017-11-01 12:30:42 -04:00
Michael Desa 3bfed5756d Remove setting default org on Principal 2017-11-01 09:21:35 -04:00
Michael Desa 708c37dc67 WIP cleanup 2017-10-31 20:58:40 -04:00
Michael Desa 5e08464ecf Provide route to change current users organization
Add current Organization to JWT.
Use OrganizationUsersStore to retrieve Users that are not me.

Signed-off-by: Michael de Sa <mjdesa@gmail.com>
2017-10-26 18:06:52 -04:00
Tim Raymond 5b5dbee078 Merge master into feature/tr-auth0-organizations
Conflicts were the addition of CLI flags from a concurrent branch.
2017-07-07 16:18:01 -04:00
Tim Raymond 07def02ff7 Add test coverage for Auth0 organizations
This covers cases where users are or are not members of organizations as
well as whether or not they should have access to the application based
on their organization membership.
2017-06-28 16:29:52 -04:00
Tim Raymond 5a4817baf6 Support Organizations in Auth0
It's useful for operators to classify users into separate groups which
we have termed "organizations". For other OAuth providers, the notion of
an organization typically fell along company lines. For example,
MegaCorp might have a "MegaCorp" GitHub organiztion, and all email
addresses would have the domain "megacorp.com".

Auth0 is slightly different in that MegaCorp would likely run their own
Auth0 provider for their internal services, so "organizations" in Auth0
are no longer synonymous with "large organizations" (or companies).
Instead, Auth0 organizations could be used to restrict access to
Chronograf instances based on team membership within an organization.

To make use of Auth0 organizations, operators should modify users'
app_metadata to include the key "organization". Its value should be the
organization which that user belongs to. This can be done automatically
through arbitrary rules using Auth0 Rules.
2017-06-28 16:29:52 -04:00
Jade McGough 9ac59861d2 add email to auth0 required scopes 2017-06-27 16:29:51 -07:00
Tim Raymond 6c8e889b03 Add Auth0 to supported OAuth2 providers
Auth0 is an OpenID Connect compliant OAuth2 provider, so we're able to
re-use the generic OAuth2 provider to implement it. The routes required
by Auth0 have been hardcoded for user convenience.

Also, Auth0 requires users to register a subdomain of auth0.com when
signing up. This must be provided to chronograf through the
`--auth0-domain` parameter (or `AUTH0_DOMAIN` ENV). This is **distinct**
from the `PUBLIC_URL`. For example, for a Chronograf hosted at
`http://www.example.com`, and an Auth0 domain of
`http://oceanic-airlines.auth0.com`, a client-id of `notpennysboat` and a
client-secret of `4-8-15-16-23-42`, the command line options would look
like:

```
chronograf \
  --auth0-domain=http://oceanic-airlines.auth0.com \
  --auth0-client-id=notpennysboat \
  --auth0-secret=4-8-15-16-23-24
  --public-url=http://www.example.com
  -t `uuidgen`
```
2017-06-21 10:20:46 -04:00
Kent Wang a231e9f942 Add redirect url to generic oauth 2017-06-16 17:35:57 +08:00
Tim Raymond 93acebffc6 Remove broken path.Join logic
It is entirely unclear why this doesn't work.
2017-05-08 14:40:50 -07:00
Tim Raymond & Jared Scheib dcbe44d9ce Fix OAuth when using Basepath
Updated the logout link in the UI to use a link provided by the
/chronograf/v1/ endpoint. We also replaced many instances of string
concatenation of URL paths with path.Join, which better handles cases
where prefixed and suffixed "/" characters may be present in provided
basepaths. We also refactored how Basepath was being prefixed when using
Auth. Documentation was also updated to warn users that basepaths should
be applied to the OAuth callback link when configuring OAuth with their
provider.
2017-05-08 14:40:50 -07:00
Chris Goller e098045a92 Fix JWTs for auth-durations less than 5 mins (#1318)
* WIP

* Fix JWTs for auth-durations less than 5 mins

For auth-duration = 0 the JWT now understands that there does not
need to be duration checks.

For auth-duration < 5 minutes > 0 the JWT lifespan will be 1/2
of auth-duration to allow one extension

There is likely a range of very short auth-duration times like, say,
less than 5 seconds that would never allow a person to login simply
because the time of issue and request is longer.

* Update changelog
2017-04-20 17:33:08 -07:00
Chris Goller 9b40e39775 Add tests for token extend 2017-04-17 14:49:05 -05:00
Chris Goller 89ef827f94 Add comment about tokens in extending 2017-04-17 12:22:49 -05:00
Chris Goller 45e9508d31 Update oauth2 Authenticator signatures to use extend 2017-04-17 11:49:45 -05:00
Chris Goller 778cb19f57 Update JWT to use Extended rather than Extend 2017-04-17 10:57:33 -05:00
Chris Goller f6aedc85a0 Update oauth2 now time calculation to ensure UTC time 2017-04-17 10:39:01 -05:00
Chris Goller f95e6f451c Add default now time func to return UTC 2017-04-17 10:38:46 -05:00
Chris Goller 1fabed5039 Update tests for refreshing jwts 2017-04-14 02:35:30 -05:00
Chris Goller 5b692bdef3 Add JWT refresh on validation.
JWTs will only life five minutes into the future.  Any time
the server receives an authenicated request, the JWT's expire at
will be extended into the future.
2017-04-14 02:12:52 -05:00
Chris Goller bbf6c1300c Add configurable scopes to generic oauth2 support 2017-04-07 14:58:35 -05:00
Chris Goller 862e2132b6 Add renaming of generic oauth2 provider 2017-04-06 16:45:13 -05:00
Chris Goller ffd838fc26 Add test for generic oauth2 provider 2017-04-06 15:06:22 -05:00
Chris Goller 0a0753bcd0 Merge branch 'master' into feature/generic-oauth 2017-04-06 14:44:44 -05:00