Commit Graph
100 Commits
Author SHA1 Message Date
Joel Speed 215aeec8b9 Merge pull request #650 from jordancrawfordnz/issue-649
Only set healthcheck user agents when the ping-user-agent is set, and don't check blank user agents against healthcheck user agents
2020-07-06 09:00:13 +01:00
Joel Speed 99481b3a39 Merge pull request #591 from oauth2-proxy/upstream-proxy
Introduce upstream package with new reverse proxy implementation
2020-07-05 20:36:47 +01:00
Joel Speed 37c76b6376 Update changelog to add upstream proxy entry 2020-07-05 10:22:24 +01:00
Joel Speed 5b95ed3033 Add tests for upstream package 2020-07-05 10:21:05 +01:00
Joel Speed fa8e1ee033 Allow file server to handle windows filesystems 2020-07-05 10:21:05 +01:00
Joel Speed e1c3e938cc Add upstream package with Proxy server implementation 2020-07-05 10:21:05 +01:00
Joel Speed b6b5194190 Add Upstreams options struct with validation 2020-07-05 10:21:05 +01:00
Joel Speed fb1bef2757 Merge pull request #576 from oauth2-proxy/cookie-validation
Separate Cookie validation
2020-07-05 09:35:19 +01:00
Joel Speed 3e13f3197f Ensure that cookie names over 256 characters are rejected by validation 2020-07-05 09:18:48 +01:00
Joel Speed eb933cc3f4 Add changelog entry for cookie validation separation 2020-07-05 09:18:45 +01:00
Joel Speed 211fd3a010 Rename CookieOptions to Cookie 2020-07-05 09:18:21 +01:00
Joel Speed 285c65a2d4 Add tests for cookie validation
This also removes the check for the decoded from the valid secret size
check. The code was unreachable because encryption.SecretBytes will only
return the decoded secret if it was the right length after decoding.
2020-07-05 09:17:28 +01:00
Joel Speed 900061b88a Move CookieOptions validation to it's own file 2020-07-05 09:17:28 +01:00
Joel Speed b3ba2594c6 Create Cookie FlagSet and Defaults 2020-07-05 09:17:28 +01:00
Joel Speed c4cf15f3e1 Merge pull request #619 from oauth2-proxy/https-redirect-middleware
Improve Redirect to HTTPs behaviour
2020-07-03 17:25:24 +01:00
Joel Speed 1c1106721e Move RedirectToHTTPS to middleware package
Moves the logic for redirecting to HTTPs to a middleware package and adds tests for this logic.
Also makes the functionality more useful, previously it always redirected to the HTTPS address of the proxy, which may not have been intended, now it will redirect based on if a port is provided in the URL (assume public facing 80 to 443 or 4180 to 8443 for example)
2020-07-03 17:19:09 +01:00
Joel Speed 39c01d5930 Merge pull request #654 from oauth2-proxy/redis-test-client-close
Close client connections after each redis test
2020-07-03 16:43:42 +01:00
Joel Speed 5c8a66bcc9 Close client connections after each redis test 2020-07-03 16:24:47 +01:00
Joel Speed 390d479d28 Update CODEOWNERS to request review from reviewers team (#613)
This means that we can keep the list of reviewers up to date based on team membership, rather than this file. Will make it easier to add and remove people going forward
2020-07-02 21:09:55 +01:00
Joel Speed 4313553122 Merge pull request #542 from oauth2-proxy/refactor-session-tests
Move SessionStore tests to independent package
2020-07-01 23:00:23 +01:00
Joel Speed 34137f7305 Move SessionStore tests to independent package 2020-07-01 06:41:35 +01:00
Joel Speed d9a45a3b47 Merge pull request #577 from oauth2-proxy/session-store-cipher
Move Cipher and Session Store initialisation out of Validation
2020-06-28 18:29:48 +01:00
Joel Speed 6e1b3b9660 Switch to in session store initialisation 2020-06-28 12:50:55 +01:00
Joel Speed 778463906a Update changelog for session storage initialisation move 2020-06-28 12:32:06 +01:00
Joel Speed 5ce9e75c21 Initialise Session Storage in NewOAuthProxy instead of validation 2020-06-28 12:32:06 +01:00
Joel Speed c8dbf1cf60 Move Cipher intialisation to session store initialisation 2020-06-28 12:03:03 +01:00
Joel Speed d9af3ffc5e Merge pull request #641 from oauth2-proxy/release-v6.0.0
Update changelog ready for release v6.0.0
2020-06-27 16:09:26 +01:00
Joel Speed 6b43b41638 Fix tests broken by security advisory 2020-06-27 12:41:46 +01:00
Joel Speed 25154ede41 Update changelog ready for release v6.0.0 2020-06-27 12:10:27 +01:00
Joel Speed ee5662e0f5 Merge pull request from GHSA-5m6c-jp6f-2vcv
* Add more Open Redirect test cases

* Add whitelisted domain to test

* Add more test cases

* Improve invalid redirect regex
2020-06-27 12:07:24 +01:00
Joel Speed daedbbd353 Merge pull request #615 from EvgeniGordeev/helm-example
helm kubernetes example based on kind cluster and nginx ingress
2020-06-26 19:06:50 +01:00
Joel Speed 3686b0b442 Merge pull request #596 from grnhse/extra-jwt-token-session
Verify main vs extra JWT bearers differently
2020-06-25 19:16:49 +01:00
Joel Speed 5817028bb1 Merge pull request #597 from oauth2-proxy/no-log-empty-redirect
Don't log invalid redirect if redirect is empty
2020-06-19 19:40:48 +01:00
Joel Speed dc756b9de3 Don't log invalid redirect if redirect is empty 2020-06-19 18:17:05 +01:00
Joel Speed 713c3927a9 Merge pull request #620 from oauth2-proxy/healthcheck-middleware
Add HealthCheck middleware
2020-06-19 18:15:36 +01:00
Joel Speed ba3e40ab1c Add changelog entry for healthcheck middleware 2020-06-14 21:06:14 +01:00
Joel Speed 9bbd6adce9 Integrate HealthCheck middleware 2020-06-14 21:05:17 +01:00
Joel Speed ca416a2ebb Add HealthCheck middleware 2020-06-14 21:05:17 +01:00
Joel Speed a197a17bc3 Merge pull request #539 from grnhse/encryption-efficiency-improvements
Encryption efficiency improvements
2020-06-14 13:23:14 +01:00
Joel Speed 1683aa5978 Merge pull request #601 from oauth2-proxy/fix-fallback
Ensure decrypted user/email are valid UTF8
2020-06-12 15:47:33 +01:00
Joel Speed 808084b744 Ensure decrypted user/email are valid UTF8 2020-06-12 15:36:55 +01:00
Joel SpeedandHenry Jenkins 160bbaf98e Fallback to UserInfo is User ID claim not present (#560)
Co-authored-by: Henry Jenkins <henry@henryjenkins.name>
2020-06-04 17:41:29 +01:00
Joel Speed a17c48810f Merge pull request #548 from oauth2-proxy/move-logging-options
Separate logging options out of main options structure
2020-05-31 14:15:18 +01:00
Joel Speed 94e31f8b65 Ensure exclude-logging-paths is consistent with other options 2020-05-31 14:09:28 +01:00
Joel Speed f7c88f53d1 Update changelog for logging options move 2020-05-31 14:09:24 +01:00
Joel Speed bbc4eee17e Create Logging FlagSet and Default 2020-05-31 14:08:00 +01:00
Joel Speed 3cbac6122d Move configuration of logger to separate file 2020-05-31 14:08:00 +01:00
Joel Speed 3afcadae76 Move logging options to a struct 2020-05-31 14:08:00 +01:00
Joel SpeedandHenry Jenkins f7b28cb1d3 Improvements to Session State code (#536)
* Drop SessionStateJSON wrapper
* Use EncrpytInto/DecryptInto to reduce sessionstate

Co-authored-by: Henry Jenkins <henry@henryjenkins.name>
2020-05-30 08:53:38 +01:00
Joel Speed 11c8a983c8 Merge pull request #582 from oauth2-proxy/dependabot/bundler/docs/activesupport-6.0.3.1
Bump activesupport from 6.0.2.1 to 6.0.3.1 in /docs
2020-05-27 10:03:56 +01:00
Joel Speed 03a0e1a0e3 Merge pull request #414 from ti-mo/cookie-secret-cipher-xauthrequest
Always encrypt sessions regardless of configuration
2020-05-24 21:27:22 +01:00
Joel SpeedandHenry Jenkins 810a9e9967 Rename cookie-domain config to cookie-domains (#559)
Co-authored-by: Henry Jenkins <henry@henryjenkins.name>
2020-05-24 20:19:56 +01:00
Joel Speed a0085e9015 Add changelog entry for 489 (#572) 2020-05-23 18:49:09 +01:00
Joel Speed 236c7fa60e Merge pull request #489 from oauth2-proxy/move-options
Move Options and Validation to packages
2020-05-23 15:59:29 +01:00
Joel Speed cce2c680d8 Move RealClientIP code to IP packages 2020-05-23 15:17:41 +01:00
Joel Speed c3f9cbeb3d Remove Env tags from Cookie and Session Options 2020-05-21 22:43:42 +01:00
Joel Speed 189ed4de8f Move FlagSet to Options package 2020-05-21 22:43:42 +01:00
Joel Speed 1fd4ebe546 Remove Env tags from Options 2020-05-21 22:43:42 +01:00
Joel Speed 44b27e0208 Move Options and Validation to package 2020-05-21 22:43:42 +01:00
Joel Speed d0cfca4b73 Merge pull request #529 from oauth2-proxy/test-environment
Add local test environments for testing changes and new features
2020-05-12 16:19:27 +01:00
Joel Speed 2e37da4dc4 Update changelog for test environment addition 2020-05-12 16:07:17 +01:00
Joel Speed afef9c7588 Add nginx test environment to demonstrate protecting multiple subdomains 2020-05-12 16:06:17 +01:00
Joel Speed 0ccfc73ab2 Add test environment docker-compose files 2020-05-12 16:06:16 +01:00
Joel Speed 4e3dd09cf2 Drop fallback to email when user is empty (#537) 2020-05-12 16:04:51 +01:00
Joel Speed 53d8e99f05 Remove Syscll as a maintainer (#540) 2020-05-10 11:51:15 +01:00
Joel SpeedandHenry Jenkins de280824de Drop support for pre v3.1 cookies (#535)
Co-authored-by: Henry Jenkins <henry@henryjenkins.name>
2020-05-10 10:09:53 +01:00
Joel Speed 24cdfa68b6 Set up code coverage within Travis for Code Climate (#533)
* Set up code coverage within Travis for Code Climate
* Include CodeClimate badges on ReadMe
2020-05-10 07:29:37 +01:00
Joel SpeedandHenry Jenkins 07df29db37 Drop configure script in favour of native Makefile env and checks (#515)
Co-authored-by: Henry Jenkins <henry@henryjenkins.name>
2020-05-09 16:07:46 +01:00
Joel Speed 8d3de2dc75 Tidy changelog and update releases to v5.1.1 (#526) 2020-05-06 19:00:12 +01:00
Joel Speed 0d5fa211df Merge pull request from GHSA-j7px-6hwj-hpjg 2020-05-06 12:42:02 +01:00
Joel Speed f7c050e7ba Switch flags to PFlag to remove StringArray (#487) 2020-05-03 16:55:20 +01:00
Joel Speed eae652d986 Merge pull request #484 from oauth2-proxy/cookie-options-rename
Replace configuration loading with Viper
2020-05-03 12:14:17 +01:00
Joel Speed 00fed1a31f Return an error when unknown options are found in the config file 2020-04-29 20:00:16 +01:00
Joel Speed c5be09ca48 Replace options loading with viper 2020-04-29 19:51:24 +01:00
Joel Speed 8749cbb424 Add Viper based config loader 2020-04-29 19:51:24 +01:00
Joel Speed e49f8542bc Rename Session Options to improve structure 2020-04-29 19:51:24 +01:00
Joel Speed 458710149c Rename Cookie Options to remove extra 'Cookie' 2020-04-29 19:51:24 +01:00
Joel Speed 581475feec Set-Basic-Auth should default to false 2020-04-13 14:57:24 +01:00
Joel Speed fcd52e042e Warn users when session cookies are split 2020-04-12 12:01:38 +01:00
Joel Speed c02d560bf4 Merge pull request #432 from oauth2-proxy/update-deps
Update ruby dependencies for documentation
2020-03-29 17:41:58 +01:00
Joel Speed c0fb7e81fc Merge pull request #464 from oauth2-proxy/migration
Migrate to oauth2-proxy/oauth2-proxy
2020-03-29 16:32:39 +01:00
Joel Speed f832eb1446 Update changelog and readme to reflect migration 2020-03-29 16:24:41 +01:00
Joel Speed 802754caad Migrate to oauth2-proxy/oauth2-proxy 2020-03-29 15:40:10 +01:00
Joel Speed 4cdedc8f50 Merge pull request #463 from pusher/release-5.1.0
Update Changelog for Release 5.1.0
2020-03-29 13:41:30 +01:00
Joel Speed 9dcd8255bf Update CHANGELOG for v5.1.0 release 2020-03-29 13:19:38 +01:00
Joel Speed 8d69d55de4 Update Go and GolangCI-Lint 2020-03-29 13:17:54 +01:00
Joel Speed e3fb25efe6 Merge pull request #434 from jordancrawfordnz/pass-user-headers-prefer-email
Support the PreferEmailToUser option on PassUserHeaders
2020-03-08 15:31:34 +00:00
Joel Speed 666d4c3db1 Merge pull request #430 from pusher/stale-action
Add GitHub Action to tidy stale issues
2020-03-02 10:34:51 +00:00
Joel Speed 85891a2261 Add GitHub Action to tidy stale issues 2020-03-01 15:59:52 +00:00
Joel Speed 79a0759c10 Merge pull request #358 from pusher/JoelSpeed-codeowners
Add @JoelSpeed to CODEOWNERS
2020-01-23 14:25:28 +00:00
Joel Speed cfc2daa220 Merge pull request #361 from nawa/fix-linting
Fix linting error about const
2020-01-22 12:18:01 +00:00
Joel Speed 14db073807 Add JoelSpeed to CODEOWNERS 2020-01-20 19:39:31 +00:00
Joel Speed 5f86ea5c75 Merge pull request #357 from pusher/dependabot/bundler/docs/rubyzip-2.0.0
Bump rubyzip from 1.2.2 to 2.0.0 in /docs
2020-01-20 19:34:46 +00:00
Joel Speed ec72ee8bf1 Merge pull request #339 from clubhouse/pgroudas/add-samesite-cookie-options
Add SameSite cookie configuration value for session cookie
2020-01-20 19:24:23 +00:00
Joel Speed 17d9961cb9 Merge branch 'master' into pgroudas/add-samesite-cookie-options 2020-01-20 19:21:51 +00:00
Joel Speed 038ee169bd Merge pull request #280 from kamaln7/kamal/whitelist-redirects-with-ports
Allow redirects to whitelisted hosts with ports
2020-01-15 14:44:10 +00:00
Joel Speed 7663565cd3 Merge pull request #332 from pusher/fix-changelog
Fix changelog entry release
2019-12-17 13:35:35 +00:00
Joel Speed effe1e0bdb Fix changelog entry release 2019-12-17 12:17:05 +00:00
Joel Speed bb55b13242 Merge pull request #179 from Ramblurr/nextcloud-provider
Add nextcloud provider
2019-12-17 11:58:46 +00:00
Joel Speed 3a8b33a017 Merge branch 'master' into nextcloud-provider 2019-12-17 11:56:43 +00:00