Commit Graph

1012 Commits

Author SHA1 Message Date
Josh Michielsen c0bfe0357a
Confirm that the proto is not empty, and change condition to OR
Co-Authored-By: Joel Speed <Joel.speed@hotmail.co.uk>
2019-10-22 14:21:06 +01:00
Josh Michielsen fe9efba0c5
Documentation change
Co-Authored-By: Joel Speed <Joel.speed@hotmail.co.uk>
2019-10-22 14:19:39 +01:00
Josh Michielsen 8d1a4c527f
Merge branch 'master' into Issue#259-RedirectToHTTPS 2019-10-21 23:23:48 +01:00
Josh Michielsen dcc430f6f1 Check `X-Forwared-Proto` for https (via another reverse proxy)
Signed-off-by: Josh Michielsen <github@mickey.dev>
2019-10-21 23:21:35 +01:00
Joel Speed 535f6b8e63
Merge branch 'master' into ap-gh-pagination-with-lastpage 2019-10-21 10:21:10 +01:00
toshi-miura e34f18ef2c
Update CHANGELOG.md
Co-Authored-By: Joel Speed <Joel.speed@hotmail.co.uk>
2019-10-21 18:14:01 +09:00
Dan Bond 9d0a0c7426
remove unnecessary validator tests (#288)
* remove unnecessary validator tests

* fix WriteString error
2019-10-18 08:49:33 -07:00
Josh Michielsen 052451edef Merge branch 'Issue#259-RedirectToHTTPS' of github.com:jmickey/oauth2_proxy into Issue#259-RedirectToHTTPS 2019-10-17 22:20:21 +01:00
Josh Michielsen 56d195a433 Docs and changelog
Signed-off-by: Josh Michielsen <github@mickey.dev>
2019-10-17 22:20:15 +01:00
Josh Michielsen 9cecc01aac
Merge branch 'master' into Issue#259-RedirectToHTTPS 2019-10-17 22:13:07 +01:00
Josh Michielsen bed0336608 Add SSL check and test no redirect when HTTPS
Signed-off-by: Josh Michielsen <github@mickey.dev>
2019-10-17 22:04:24 +01:00
Joel Speed 86977f7c7f
Merge pull request #258 from leyshon/feature/azure-idtoken
Add IDToken for Azure provider
2019-10-17 20:49:08 +01:00
Josh Michielsen 271efe776e Added tests
Signed-off-by: Josh Michielsen <github@mickey.dev>
2019-10-17 16:37:36 +01:00
Josh Michielsen aae91b0ad6 Add new handler to redirect to HTTPS if flag is set
Signed-off-by: Josh Michielsen <github@mickey.dev>
2019-10-17 16:30:48 +01:00
Josh Michielsen e24e4ef880 Add force-https option and flag
Signed-off-by: Josh Michielsen <github@mickey.dev>
2019-10-17 16:30:18 +01:00
leyshon c3cdcae49b
Merge branch 'master' into feature/azure-idtoken 2019-10-14 11:04:04 +01:00
Alex e04411a789 Update README - add more badges (#281) 2019-10-13 15:33:18 -07:00
Kamal Nasser ae4e9155d2 implicit/explicit redirect port matching 2019-10-12 23:47:23 +03:00
toshi-miura 610ee6d0ec Fix typo. 2019-10-12 02:30:58 +09:00
Kamal Nasser bfb22506ff allow redirects to whitelisted hosts with ports 2019-10-11 15:39:57 +03:00
Joel Speed eb1d64a666
Merge branch 'master' into ap-gh-pagination-with-lastpage 2019-10-11 12:02:31 +01:00
toshi-miura 0d256a329f add change log. 2019-10-11 19:49:08 +09:00
toshi-miura e71797b409 ReadAll() & Close()  close together. 2019-10-11 16:02:04 +09:00
Christian Groschupp f570fb9f58
Update changelog 2019-10-10 10:15:04 +02:00
Christian Groschupp 3d17159c5c
replace getRootEndpoint by getEndpointWithCookie 2019-10-10 10:14:01 +02:00
Christian Groschupp a46ee952a6
Move responceCode out of HandleFunc. 2019-10-10 10:14:01 +02:00
Christian Groschupp dc36836800
Add tests for static upstream 2019-10-10 10:14:01 +02:00
Christian Groschupp 1295f87b33
Add static upstream 2019-10-10 10:14:00 +02:00
toshi-miura 31d7b61cc4 Added handling of link header in githubAPI paging process
======================================================
changelog note

[#274](https://github.com/pusher/oauth2_proxy/pull/274)  Add github api pagination support (@toshi-miura ,@apratina)

======================================================

I didn't edit CHANGELOG.md.
Since # 102 was taken over and the change difference of CHANGELOG.md was large
2019-10-10 05:35:00 +09:00
Christian Franke 62bf233682 Update CONTRIBUTING.md (#277)
Commit e245ef4854 switched dependency management from dep to go module.

This should be reflected in `CONTRIBUTING.md`.
2019-10-09 09:57:59 -07:00
Joel Speed 1afaf46656
Merge pull request #276 from sosiska/patch-1
Some code improvements
2019-10-09 17:41:36 +01:00
Kirill Motkov e64e6fa514 Some code improvements
* Remove shadowing of predeclared identifier: new.
* strings.ReplaceAll instead of strings.Replace with -1.
* Change strings.ToLower comparison to strings.EqualFold.
* Rewrite if-else-if-else chain as a switch.
2019-10-09 15:44:26 +03:00
Joel Speed 63da5c64db
Merge pull request #275 from syscll/debian-buster
docker: build from debian buster
2019-10-08 11:22:36 +01:00
Dan Bond 486521da96 fix previous CHANGELOG error 2019-10-07 17:11:38 -07:00
Dan Bond a97710d3d2 update CHANGELOG 2019-10-07 17:11:14 -07:00
Dan Bond e270dd0066 docker: build from debian buster 2019-10-07 17:03:15 -07:00
Dhi Aurrahman de16df232d Support Go 1.13.x and allow to override REGISTRY (#273)
Signed-off-by: Dhi Aurrahman <dio@tetrate.io>
2019-10-07 13:53:46 -07:00
leyshon ef22a0f4b6
Merge branch 'master' into feature/azure-idtoken 2019-10-04 13:32:29 +01:00
Joel Speed ac10bc04ed
Merge pull request #272 from pusher/fix-links
Fix permalinks for configuration and sessions
2019-10-03 17:19:37 +01:00
toshi-miura 1c36b5e2e9 Merge branch 'ap-gh-paginate' of https://github.com/apratina/oauth2_proxy into ap-gh-pagination-with-lastpage 2019-10-03 22:34:56 +09:00
leyshon 0b2eb91fa4
Update docs/2_auth.md
Co-Authored-By: Joel Speed <Joel.speed@hotmail.co.uk>
2019-10-03 11:46:04 +01:00
Joel Speed b515b90b34
Fix permalinks for configuration and sessions 2019-10-03 11:10:06 +01:00
leyshon d8d4c687df
Merge branch 'master' into feature/azure-idtoken 2019-10-02 10:33:08 +01:00
Joel Speed 49f1320be6
Merge pull request #269 from YenTheFirst/escape-k8s-auth-signin
Escape original request URI in sample kubernetes ingress configuration
2019-10-02 09:33:54 +01:00
T S 513af9b714 Escape original request URI in sample kubernetes ingress configuration
The current sample configuration for kubernetes ingress demonstrates
using the `auth-signin` annotation to redirect a user to oauth2_proxy's
signin page. It constructs the link to do so by directly concatenating
`$request_uri` as the `rd` parameter, so the sign-in page knows where to
send the user after signin is complete.

However, this does not work correctly if the original request URI
contains multiple query parameters separated by an ampersand, as that
ampersand is interpereted as separating query parameters of the
`/oauth2/start` URI. For example:

If the user requests a URL:
  https://example.com/foo?q1=v1&q2=v2
they may be redirected to the signin url
  https://example.com/oauth2/start?rd=https://example.com/foo?q1=v1&q2=v2
and after completing signin, oauth2_proxy will redirect them to
  https://example.com/foo?q1=v1

nginx-ingress added an $escaped_request_uri variable about a year ago,
to help resolve this kind of issue
(https://github.com/kubernetes/ingress-nginx/pull/2811)
2019-10-01 12:28:00 -07:00
Joel Speed 721d28bd4f
Merge pull request #248 from VidAngel/support-x-auth-request-redirect
More fully support X-Auth-Request-Redirect header
2019-09-30 17:53:26 +01:00
Joel Speed ac0d010371
Merge branch 'master' into support-x-auth-request-redirect 2019-09-30 17:21:05 +01:00
Joel Speed 44cdcc79c3
Merge pull request #227 from Ofinka/keycloak-provider
Add keycloak provider
2019-09-25 21:39:11 +01:00
Dan Bond a122ac60e4
Fix CHANGELOG errors 2019-09-25 13:33:58 -07:00
Dan Bond 85a1ed5135
Merge branch 'master' into keycloak-provider 2019-09-25 13:21:46 -07:00