601ae6f · typeable/oauth2-proxy

git.iko.soy/typeable/oauth2-proxy

Merge pull request #60 from tomtaylor/gofmt-fixes

Run gofmt over source

commit601ae6f4ece2287854b21e23678fadf99fb3664b authorJehiah Czebotar <jehiah@gmail.com> dateMon 19 Jan 2015, 12:48 (12 years ago) parent1f8797e 5201f26

2 files changed+5−5

compare with master

unifiedsplit

oauthproxy.go+2−2 options.go+3−3

oauthproxy.go+2−2

@@ -10,9 +10,9 @@ import (

1010 "net/http"

1111 "net/http/httputil"

1212 "net/url"

13+ "regexp"

1314 "strings"

1415 "time"

15− "regexp"

1616

1717 "github.com/bitly/go-simplejson"

1818)

@@ -86,7 +86,7 @@ func NewOauthProxy(opts *Options, validator func(string) bool) *OauthProxy {

8686 serveMux: serveMux,

8787 redirectUrl: redirectUrl,

8888 skipAuthRegex: opts.SkipAuthRegex,

89− compiledRegex: opts.CompiledRegex,

89+ compiledRegex: opts.CompiledRegex,

9090 PassBasicAuth: opts.PassBasicAuth,

9191 }

9292}

options.go+3−3

@@ -4,8 +4,8 @@ import (

44 "errors"

55 "fmt"

66 "net/url"

7− "time"

87 "regexp"

8+ "time"

99)

1010

1111// Configuration Options that can be set by Command Line Flag, or Config File

@@ -28,8 +28,8 @@ type Options struct {

2828 SkipAuthRegex []string `flag:"skip-auth-regex" cfg:"skip_auth_regex"`

2929

3030 // internal values that are set after config validation

31− redirectUrl *url.URL

32− proxyUrls []*url.URL

31+ redirectUrl *url.URL

32+ proxyUrls []*url.URL

3333 CompiledRegex []*regexp.Regexp

3434}

3535