Skip to content
This repository has been archived by the owner on Jan 24, 2019. It is now read-only.

Add support for a list of Whitelisted domains #464

Closed
wants to merge 36 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
bfdccf6
Add Fork notice
JoelSpeed Nov 27, 2018
847cf25
Move imports from bitly to pusher
JoelSpeed Nov 27, 2018
bc93198
Update CI to separate linting and testing
JoelSpeed Nov 27, 2018
d41089d
Update README to reflect new repo ownership
JoelSpeed Nov 27, 2018
fa21208
Fix fsnotify import
JoelSpeed Nov 27, 2018
990873e
Exit on first failure for travis
JoelSpeed Nov 27, 2018
8ee802d
Lint for non-comment linter errors
JoelSpeed Nov 29, 2018
ee913fb
Add comments to exported methods for root package
JoelSpeed Dec 20, 2018
a65ceb2
Add comments to exported methods for api package
JoelSpeed Dec 20, 2018
e200bd5
Add comments to exported methods for providers package
JoelSpeed Dec 20, 2018
d37cc28
Fix err declaration shadowing
JoelSpeed Dec 20, 2018
7fa913e
Add Dockerfile
JoelSpeed Dec 20, 2018
8564ab6
Add Issue and Pull Request templates
JoelSpeed Dec 20, 2018
3253bef
Add CONTRIBUTING guide
JoelSpeed Dec 20, 2018
52f27f7
Add docker image note to README
JoelSpeed Dec 20, 2018
39d11b4
Fix Quay link
JoelSpeed Dec 20, 2018
381e878
Add CODEOWNERS file
JoelSpeed Jan 2, 2019
9096c70
Remove Go v1.8.x from Travis CI
JoelSpeed Jan 3, 2019
372ecd0
Introduce Makefile
JoelSpeed Jan 4, 2019
eded761
Fix CI after make introduction
JoelSpeed Jan 4, 2019
1dddd81
Move dep to GoPath in CI setup
JoelSpeed Jan 4, 2019
85d76be
Disable make parallelism
JoelSpeed Jan 7, 2019
2eb2754
Remove .env file
JoelSpeed Jan 7, 2019
f80ce24
Fix repo link
JoelSpeed Jan 7, 2019
e1f45dd
Merge pull request #7 from pusher/migration
JoelSpeed Jan 14, 2019
d472cf1
Release v3.0.0
JoelSpeed Jan 14, 2019
d085944
Update release target
JoelSpeed Jan 14, 2019
9e9b1f9
Fix changelog PR link
JoelSpeed Jan 14, 2019
7887272
Merge pull request #13 from pusher/release-3.0.0
JoelSpeed Jan 14, 2019
fb49e68
Add whitelist domains flag
JoelSpeed Sep 29, 2017
d1ad95d
Test IsValidRedirect method
JoelSpeed Oct 2, 2017
c8bcd9b
Make option name singular
JoelSpeed Dec 11, 2017
a925187
Remove duplicated logic
JoelSpeed Dec 11, 2017
ddf1ded
Test explicit subdomain whitelisting
JoelSpeed Dec 11, 2017
e74d43c
Add env option
JoelSpeed Jan 18, 2018
d795222
Add note on subdomain behaviour
JoelSpeed Jun 20, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Default owner should be a Pusher cloud-team member unless overridden by later
# rules in this file
* @pusher/cloud-team
37 changes: 37 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<!--- Provide a general summary of the issue in the Title above -->

## Expected Behavior

<!--- If you're describing a bug, tell us what should happen -->
<!--- If you're suggesting a change/improvement, tell us how it should work -->

## Current Behavior

<!--- If describing a bug, tell us what happens instead of the expected behavior -->
<!--- If suggesting a change/improvement, explain the difference from current behavior -->

## Possible Solution

<!--- Not obligatory, but suggest a fix/reason for the bug, -->
<!--- or ideas how to implement the addition or change -->

## Steps to Reproduce (for bugs)

<!--- Provide a link to a live example, or an unambiguous set of steps to -->
<!--- reproduce this bug. Include code to reproduce, if relevant -->

1. <!--- Step 1 --->
2. <!--- Step 2 --->
3. <!--- Step 3 --->
4. <!--- Step 4 --->

## Context

<!--- How has this issue affected you? What are you trying to accomplish? -->
<!--- Providing context helps us come up with a solution that is most useful in the real world -->

## Your Environment

<!--- Include as many relevant details about the environment you experienced the bug in -->

- Version used:
25 changes: 25 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<!--- Provide a general summary of your changes in the Title above -->

## Description

<!--- Describe your changes in detail -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->
<!--- If it fixes an open issue, please link to the issue here. -->

## How Has This Been Tested?

<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran to -->
<!--- see how your change affects other areas of the code, etc. -->

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->

- [ ] My change requires a change to the documentation or CHANGELOG.
- [ ] I have updated the documentation/CHANGELOG accordingly.
- [ ] I have created a feature (non-master) branch for my PR.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ vendor
dist
.godeps
*.exe

.env

# Go.gitignore
# Compiled Object files, Static and Dynamic libs (Shared Objects)
Expand Down
12 changes: 8 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
language: go
go:
- 1.8.x
- 1.9.x
script:
- 1.10.x
install:
# Fetch dependencies
- wget -O dep https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64
- chmod +x dep
- ./dep ensure
- ./test.sh
- mv dep $GOPATH/bin/dep
script:
- ./configure
# Run tests
- make test
sudo: false
notifications:
email: false
32 changes: 32 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Vx.x.x (Pre-release)

## Changes since v3.0.0

# v3.0.0

Adoption of OAuth2_Proxy by Pusher.
Project was hard forked and tidied however no logical changes have occurred since
v2.2 as released by Bitly.

## Changes since v2.2:

- [#7](https://github.com/pusher/oauth2_proxy/pull/7) Migration to Pusher (@joelspeed)
- Move automated build to debian base image
- Add Makefile
- Update CI to run `make test`
- Update Dockerfile to use `make clean oauth2_proxy`
- Update `VERSION` parameter to be set by `ldflags` from Git Status
- Remove lint and test scripts
- Remove Go v1.8.x from Travis CI testing
- Add CODEOWNERS file
- Add CONTRIBUTING guide
- Add Issue and Pull Request templates
- Add Dockerfile
- Fix fsnotify import
- Update README to reflect new repository ownership
- Update CI scripts to separate linting and testing
- Now using `gometalinter` for linting
- Move Go import path from `github.com/bitly/oauth2_proxy` to `github.com/pusher/oauth2_proxy`
- Repository forked on 27/11/18
- README updated to include note that this repository is forked
- CHANGLOG created to track changes to repository from original fork
22 changes: 22 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Contributing

To develop on this project, please fork the repo and clone into your `$GOPATH`.

Dependencies are **not** checked in so please download those separately.
Download the dependencies using [`dep`](https://github.com/golang/dep).

```bash
cd $GOPATH/src/github.com # Create this directory if it doesn't exist
git clone git@github.com:<YOUR_FORK>/oauth2_proxy pusher/oauth2_proxy
make dep
```

## Pull Requests and Issues

We track bugs and issues using Github.

If you find a bug, please open an Issue.

If you want to fix a bug, please fork, create a feature branch, fix the bug and
open a PR back to this repo.
Please mention the open bug issue number within your PR if applicable.
16 changes: 16 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
FROM golang:1.10 AS builder
WORKDIR /go/src/github.com/pusher/oauth2_proxy
COPY . .

# Fetch dependencies
RUN go get -u github.com/golang/dep/cmd/dep
RUN dep ensure --vendor-only

# Build image
RUN ./configure && make clean oauth2_proxy

# Copy binary to debian
FROM debian:stretch
COPY --from=builder /go/src/github.com/pusher/oauth2_proxy/oauth2_proxy /bin/oauth2_proxy

ENTRYPOINT ["/bin/oauth2_proxy"]
67 changes: 58 additions & 9 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
# for detailed Gopkg.toml documentation.
#

[[constraint]]
name = "github.com/18F/hmacauth"
version = "~1.0.1"

[[constraint]]
name = "github.com/BurntSushi/toml"
version = "~0.3.0"
Expand Down Expand Up @@ -36,7 +32,7 @@
name = "google.golang.org/api"

[[constraint]]
name = "gopkg.in/fsnotify.v1"
name = "gopkg.in/fsnotify/fsnotify.v1"
version = "~1.2.0"

[[constraint]]
Expand Down
Loading