Skip to content

Fix dev oauth #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Reeywhaar wants to merge 2 commits into from
Closed

Fix dev oauth #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
345d6e4
fix dev auth broken by go interpolation
Reeywhaar Dec 29, 2018
4c984c1
dev auth form test
Reeywhaar Dec 29, 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
4 changes: 2 additions & 2 deletions provider/dev_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func (d *DevAuthServer) Run() {

// first time it will be called without username and will ask for one
if !d.Automatic && (r.ParseForm() != nil || r.Form.Get("username") == "") {
if _, err = w.Write([]byte(fmt.Sprintf(devUserForm, r.URL.RawQuery))); err != nil {
if _, err = w.Write([]byte(strings.Replace(devUserForm, "{urlparams}", r.URL.RawQuery, -1))); err != nil {
log.Printf("[WARN] can't write, %s", err)
}
return
Expand Down Expand Up @@ -268,7 +268,7 @@ var devUserForm = `
</style>
</head>
<body>
<form action="/login/oauth/authorize?%s" method="post">
<form action="/login/oauth/authorize?{urlparams}" method="post">
<header class="form-header">
<h1><a href="https://github.com/go-pkgz/auth">GO-PKGZ/AUTH</a></h1>
<p>Dev Provider</p>
Expand Down
37 changes: 37 additions & 0 deletions provider/dev_provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,40 @@ func TestDevProvider(t *testing.T) {
assert.Equal(t, 985, len(body))
t.Logf("headers: %+v", resp.Header)
}

func TestDevProviderForm(t *testing.T) {
params := Params{Cid: "cid", Csecret: "csecret", URL: "http://127.0.0.1:8080",
JwtService: token.NewService(token.Opts{
SecretReader: token.SecretFunc(func(id string) (string, error) { return "secret", nil }),
TokenDuration: time.Hour,
CookieDuration: time.Hour * 24 * 31,
}),
}
srv := DevAuthServer{Provider: NewDev(params), Automatic: false, username: "dev_user"}

router := http.NewServeMux()
router.Handle("/auth/dev/", http.HandlerFunc(srv.Provider.Handler))

ts := &http.Server{Addr: fmt.Sprintf("127.0.0.1:%d", 8080), Handler: router}
go srv.Run()
go ts.ListenAndServe()
defer func() {
srv.Shutdown()
_ = ts.Shutdown(context.TODO())
}()

time.Sleep(200 * time.Millisecond)

client := &http.Client{Timeout: 5 * time.Second}

resp, err := client.Get("http://127.0.0.1:8080/auth/dev/login?site=my-test-site")
require.Nil(t, err)
assert.Equal(t, 200, resp.StatusCode)
body, err := ioutil.ReadAll(resp.Body)
assert.Nil(t, err)
t.Logf("resp %s", string(body))

// check form contains proper form action
bodyString := string(body)
require.Contains(t, bodyString, "form action=\"/login/oauth/authorize?client_id=cid&redirect_uri=http%3A%2F%2F127.0.0.1%3A8080%2Fauth%2Fdev%2Fcallback&response_type=code&scope=user%3Aemail")
}