Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
D
dex
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
dex
Commits
b7841fb9
Commit
b7841fb9
authored
Oct 07, 2016
by
Eric Chiang
Committed by
GitHub
Oct 07, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #592 from ericchiang/fix-audience-scope
server: fix cross client scope prefix
parents
182f14fb
6dbb5c4d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
126 additions
and
2 deletions
+126
-2
oauth2.go
server/oauth2.go
+2
-2
server_test.go
server/server_test.go
+124
-0
No files found.
server/oauth2.go
View file @
b7841fb9
...
...
@@ -74,7 +74,7 @@ const (
scopeGroups
=
"groups"
scopeEmail
=
"email"
scopeProfile
=
"profile"
scopeCrossClientPrefix
=
"
oauth2
:server:client_id:"
scopeCrossClientPrefix
=
"
audience
:server:client_id:"
)
const
(
...
...
@@ -98,7 +98,7 @@ func (a audience) MarshalJSON() ([]byte, error) {
if
len
(
a
)
==
1
{
return
json
.
Marshal
(
a
[
0
])
}
return
json
.
Marshal
(
a
)
return
json
.
Marshal
(
[]
string
(
a
)
)
}
type
idTokenClaims
struct
{
...
...
server/server_test.go
View file @
b7841fb9
...
...
@@ -10,6 +10,8 @@ import (
"net/http/httptest"
"net/http/httputil"
"net/url"
"reflect"
"sort"
"strings"
"sync"
"testing"
...
...
@@ -384,6 +386,128 @@ func TestOAuth2ImplicitFlow(t *testing.T) {
}
}
func
TestCrossClientScopes
(
t
*
testing
.
T
)
{
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
defer
cancel
()
httpServer
,
s
:=
newTestServer
(
t
,
func
(
c
*
Config
)
{
c
.
Issuer
=
c
.
Issuer
+
"/non-root-path"
})
defer
httpServer
.
Close
()
p
,
err
:=
oidc
.
NewProvider
(
ctx
,
httpServer
.
URL
)
if
err
!=
nil
{
t
.
Fatalf
(
"failed to get provider: %v"
,
err
)
}
var
(
reqDump
,
respDump
[]
byte
gotCode
bool
state
=
"a_state"
)
defer
func
()
{
if
!
gotCode
{
t
.
Errorf
(
"never got a code in callback
\n
%s
\n
%s"
,
reqDump
,
respDump
)
}
}()
testClientID
:=
"testclient"
peerID
:=
"peer"
var
oauth2Config
*
oauth2
.
Config
oauth2Server
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
if
r
.
URL
.
Path
==
"/callback"
{
q
:=
r
.
URL
.
Query
()
if
errType
:=
q
.
Get
(
"error"
);
errType
!=
""
{
if
desc
:=
q
.
Get
(
"error_description"
);
desc
!=
""
{
t
.
Errorf
(
"got error from server %s: %s"
,
errType
,
desc
)
}
else
{
t
.
Errorf
(
"got error from server %s"
,
errType
)
}
w
.
WriteHeader
(
http
.
StatusInternalServerError
)
return
}
if
code
:=
q
.
Get
(
"code"
);
code
!=
""
{
gotCode
=
true
token
,
err
:=
oauth2Config
.
Exchange
(
ctx
,
code
)
if
err
!=
nil
{
t
.
Errorf
(
"failed to exchange code for token: %v"
,
err
)
return
}
rawIDToken
,
ok
:=
token
.
Extra
(
"id_token"
)
.
(
string
)
if
!
ok
{
t
.
Errorf
(
"no id token found: %v"
,
err
)
return
}
idToken
,
err
:=
p
.
NewVerifier
(
ctx
)
.
Verify
(
rawIDToken
)
if
err
!=
nil
{
t
.
Errorf
(
"failed to parse ID Token: %v"
,
err
)
return
}
sort
.
Strings
(
idToken
.
Audience
)
expAudience
:=
[]
string
{
peerID
,
testClientID
}
if
!
reflect
.
DeepEqual
(
idToken
.
Audience
,
expAudience
)
{
t
.
Errorf
(
"expected audience %q, got %q"
,
expAudience
,
idToken
.
Audience
)
}
}
if
gotState
:=
q
.
Get
(
"state"
);
gotState
!=
state
{
t
.
Errorf
(
"state did not match, want=%q got=%q"
,
state
,
gotState
)
}
w
.
WriteHeader
(
http
.
StatusOK
)
return
}
http
.
Redirect
(
w
,
r
,
oauth2Config
.
AuthCodeURL
(
state
),
http
.
StatusSeeOther
)
}))
defer
oauth2Server
.
Close
()
redirectURL
:=
oauth2Server
.
URL
+
"/callback"
client
:=
storage
.
Client
{
ID
:
testClientID
,
Secret
:
"testclientsecret"
,
RedirectURIs
:
[]
string
{
redirectURL
},
}
if
err
:=
s
.
storage
.
CreateClient
(
client
);
err
!=
nil
{
t
.
Fatalf
(
"failed to create client: %v"
,
err
)
}
peer
:=
storage
.
Client
{
ID
:
peerID
,
Secret
:
"foobar"
,
TrustedPeers
:
[]
string
{
"testclient"
},
}
if
err
:=
s
.
storage
.
CreateClient
(
peer
);
err
!=
nil
{
t
.
Fatalf
(
"failed to create client: %v"
,
err
)
}
oauth2Config
=
&
oauth2
.
Config
{
ClientID
:
client
.
ID
,
ClientSecret
:
client
.
Secret
,
Endpoint
:
p
.
Endpoint
(),
Scopes
:
[]
string
{
oidc
.
ScopeOpenID
,
"profile"
,
"email"
,
"audience:server:client_id:"
+
client
.
ID
,
"audience:server:client_id:"
+
peer
.
ID
,
},
RedirectURL
:
redirectURL
,
}
resp
,
err
:=
http
.
Get
(
oauth2Server
.
URL
+
"/login"
)
if
err
!=
nil
{
t
.
Fatalf
(
"get failed: %v"
,
err
)
}
if
reqDump
,
err
=
httputil
.
DumpRequest
(
resp
.
Request
,
false
);
err
!=
nil
{
t
.
Fatal
(
err
)
}
if
respDump
,
err
=
httputil
.
DumpResponse
(
resp
,
true
);
err
!=
nil
{
t
.
Fatal
(
err
)
}
}
func
TestPasswordDB
(
t
*
testing
.
T
)
{
s
:=
memory
.
New
()
conn
:=
newPasswordDB
(
s
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment