git.iko.soy/typeable/oauth2-proxy

on master help sign in

htpasswd.go+1−1

compare with master

unifiedsplit

@@ -7,7 +7,7 @@ import (

7 "io"

7 "io"

8 "os"

8 "os"

9

9

10− "github.com/pusher/oauth2_proxy/logger"

10+ "github.com/pusher/oauth2_proxy/pkg/logger"

11 "golang.org/x/crypto/bcrypt"

11 "golang.org/x/crypto/bcrypt"

12)

12)

13

13

http.go+1−1

@@ -7,7 +7,7 @@ import (

7 "strings"

7 "strings"

8 "time"

8 "time"

9

9

10− "github.com/pusher/oauth2_proxy/logger"

10+ "github.com/pusher/oauth2_proxy/pkg/logger"

11)

11)

12

12

13// Server represents an HTTP server

13// Server represents an HTTP server

logging_handler.go+1−1

@@ -10,7 +10,7 @@ import (

10 "net/http"

10 "net/http"

11 "time"

11 "time"

12

12

13− "github.com/pusher/oauth2_proxy/logger"

13+ "github.com/pusher/oauth2_proxy/pkg/logger"

14)

14)

15

15

16// responseLogger is wrapper of http.ResponseWriter that keeps track of its HTTP status

16// responseLogger is wrapper of http.ResponseWriter that keeps track of its HTTP status

logging_handler_test.go+1−1

@@ -9,7 +9,7 @@ import (

9 "testing"

9 "testing"

10 "time"

10 "time"

11

11

12− "github.com/pusher/oauth2_proxy/logger"

12+ "github.com/pusher/oauth2_proxy/pkg/logger"

13)

13)

14

14

15func TestLoggingHandler_ServeHTTP(t *testing.T) {

15func TestLoggingHandler_ServeHTTP(t *testing.T) {

main.go+1−1

@@ -12,7 +12,7 @@ import (

12

12

13 "github.com/BurntSushi/toml"

13 "github.com/BurntSushi/toml"

14 options "github.com/mreiferson/go-options"

14 options "github.com/mreiferson/go-options"

15− "github.com/pusher/oauth2_proxy/logger"

15+ "github.com/pusher/oauth2_proxy/pkg/logger"

16)

16)

17

17

18func main() {

18func main() {

oauthproxy.go+1−1

@@ -14,7 +14,7 @@ import (

14 "time"

14 "time"

15

15

16 "github.com/mbland/hmacauth"

16 "github.com/mbland/hmacauth"

17− "github.com/pusher/oauth2_proxy/logger"

17+ "github.com/pusher/oauth2_proxy/pkg/logger"

18 sessionsapi "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

18 sessionsapi "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

19 "github.com/pusher/oauth2_proxy/pkg/encryption"

19 "github.com/pusher/oauth2_proxy/pkg/encryption"

20 "github.com/pusher/oauth2_proxy/providers"

20 "github.com/pusher/oauth2_proxy/providers"

oauthproxy_test.go+1−1

@@ -15,7 +15,7 @@ import (

15 "time"

15 "time"

16

16

17 "github.com/mbland/hmacauth"

17 "github.com/mbland/hmacauth"

18− "github.com/pusher/oauth2_proxy/logger"

18+ "github.com/pusher/oauth2_proxy/pkg/logger"

19 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

19 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

20 "github.com/pusher/oauth2_proxy/pkg/sessions/cookie"

20 "github.com/pusher/oauth2_proxy/pkg/sessions/cookie"

21 "github.com/pusher/oauth2_proxy/providers"

21 "github.com/pusher/oauth2_proxy/providers"

options.go+1−1

@@ -17,7 +17,7 @@ import (

17 oidc "github.com/coreos/go-oidc"

17 oidc "github.com/coreos/go-oidc"

18 "github.com/dgrijalva/jwt-go"

18 "github.com/dgrijalva/jwt-go"

19 "github.com/mbland/hmacauth"

19 "github.com/mbland/hmacauth"

20− "github.com/pusher/oauth2_proxy/logger"

20+ "github.com/pusher/oauth2_proxy/pkg/logger"

21 "github.com/pusher/oauth2_proxy/pkg/apis/options"

21 "github.com/pusher/oauth2_proxy/pkg/apis/options"

22 sessionsapi "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

22 sessionsapi "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

23 "github.com/pusher/oauth2_proxy/pkg/encryption"

23 "github.com/pusher/oauth2_proxy/pkg/encryption"

pkg/cookies/cookies.go+1−1

@@ -6,7 +6,7 @@ import (

6 "strings"

6 "strings"

7 "time"

7 "time"

8

8

9− "github.com/pusher/oauth2_proxy/logger"

9+ "github.com/pusher/oauth2_proxy/pkg/logger"

10 "github.com/pusher/oauth2_proxy/pkg/apis/options"

10 "github.com/pusher/oauth2_proxy/pkg/apis/options"

11)

11)

12

12

logger/logger.go → pkg/logger/logger.gorenamed

The content is the same.

pkg/requests/requests.go+1−1

@@ -7,7 +7,7 @@ import (

7 "net/http"

7 "net/http"

8

8

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

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

10− "github.com/pusher/oauth2_proxy/logger"

10+ "github.com/pusher/oauth2_proxy/pkg/logger"

11)

11)

12

12

13// Request parses the request body into a simplejson.Json object

13// Request parses the request body into a simplejson.Json object

providers/azure.go+1−1

@@ -7,7 +7,7 @@ import (

7 "net/url"

7 "net/url"

8

8

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

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

10− "github.com/pusher/oauth2_proxy/logger"

10+ "github.com/pusher/oauth2_proxy/pkg/logger"

11 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

11 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

12 "github.com/pusher/oauth2_proxy/pkg/requests"

12 "github.com/pusher/oauth2_proxy/pkg/requests"

13)

13)

providers/github.go+1−1

@@ -10,7 +10,7 @@ import (

10 "strconv"

10 "strconv"

11 "strings"

11 "strings"

12

12

13− "github.com/pusher/oauth2_proxy/logger"

13+ "github.com/pusher/oauth2_proxy/pkg/logger"

14 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

14 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

15)

15)

16

16

providers/gitlab.go+1−1

@@ -4,7 +4,7 @@ import (

4 "net/http"

4 "net/http"

5 "net/url"

5 "net/url"

6

6

7− "github.com/pusher/oauth2_proxy/logger"

7+ "github.com/pusher/oauth2_proxy/pkg/logger"

8 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

8 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

9 "github.com/pusher/oauth2_proxy/pkg/requests"

9 "github.com/pusher/oauth2_proxy/pkg/requests"

10)

10)

providers/google.go+1−1

@@ -13,7 +13,7 @@ import (

13 "strings"

13 "strings"

14 "time"

14 "time"

15

15

16− "github.com/pusher/oauth2_proxy/logger"

16+ "github.com/pusher/oauth2_proxy/pkg/logger"

17 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

17 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

18 "golang.org/x/oauth2"

18 "golang.org/x/oauth2"

19 "golang.org/x/oauth2/google"

19 "golang.org/x/oauth2/google"

providers/internal_util.go+1−1

@@ -5,7 +5,7 @@ import (

5 "net/http"

5 "net/http"

6 "net/url"

6 "net/url"

7

7

8− "github.com/pusher/oauth2_proxy/logger"

8+ "github.com/pusher/oauth2_proxy/pkg/logger"

9 "github.com/pusher/oauth2_proxy/pkg/requests"

9 "github.com/pusher/oauth2_proxy/pkg/requests"

10)

10)

11

11

templates.go+1−1

@@ -4,7 +4,7 @@ import (

4 "html/template"

4 "html/template"

5 "path"

5 "path"

6

6

7− "github.com/pusher/oauth2_proxy/logger"

7+ "github.com/pusher/oauth2_proxy/pkg/logger"

8)

8)

9

9

10func loadTemplates(dir string) *template.Template {

10func loadTemplates(dir string) *template.Template {

validator.go+1−1

@@ -8,7 +8,7 @@ import (

8 "sync/atomic"

8 "sync/atomic"

9 "unsafe"

9 "unsafe"

10

10

11− "github.com/pusher/oauth2_proxy/logger"

11+ "github.com/pusher/oauth2_proxy/pkg/logger"

12)

12)

13

13

14// UserMap holds information from the authenticated emails file

14// UserMap holds information from the authenticated emails file

watcher.go+1−1

@@ -7,7 +7,7 @@ import (

7 "path/filepath"

7 "path/filepath"

8 "time"

8 "time"

9

9

10− "github.com/pusher/oauth2_proxy/logger"

10+ "github.com/pusher/oauth2_proxy/pkg/logger"

11 fsnotify "gopkg.in/fsnotify/fsnotify.v1"

11 fsnotify "gopkg.in/fsnotify/fsnotify.v1"

12)

12)

13

13

watcher_unsupported.go+1−1

@@ -2,7 +2,7 @@

2

2

3package main

3package main

4

4

5−import "github.com/pusher/oauth2_proxy/logger"

5+import "github.com/pusher/oauth2_proxy/pkg/logger"

6

6

7func WatchForUpdates(filename string, done <-chan bool, action func()) {

7func WatchForUpdates(filename string, done <-chan bool, action func()) {

8 logger.Printf("file watching not implemented on this platform")

8 logger.Printf("file watching not implemented on this platform")