Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dex
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hdacloud
dex
Commits
a1c71987
Commit
a1c71987
authored
4 years ago
by
seuf
Browse files
Options
Downloads
Patches
Plain Diff
Rename config header to userHeader
Signed-off-by:
seuf
<
seuf76@gmail.com
>
parent
f19bccfc
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
connector/authproxy/authproxy.go
+9
-11
9 additions, 11 deletions
connector/authproxy/authproxy.go
with
9 additions
and
11 deletions
connector/authproxy/authproxy.go
+
9
−
11
View file @
a1c71987
...
...
@@ -15,23 +15,18 @@ import (
// Config holds the configuration parameters for a connector which returns an
// identity with the HTTP header X-Remote-User as verified email.
type
Config
struct
{
HeaderName
string
`json:"headerName"`
Groups
[]
string
`json:"groups"`
UserHeader
string
`json:"userHeader"`
}
// Open returns an authentication strategy which requires no user interaction.
func
(
c
*
Config
)
Open
(
id
string
,
logger
log
.
Logger
)
(
connector
.
Connector
,
error
)
{
if
c
.
HeaderName
==
""
{
c
.
HeaderName
=
"X-Remote-User"
}
return
&
callback
{
headerName
:
c
.
HeaderName
,
logger
:
logger
,
pathSuffix
:
"/"
+
id
,
groups
:
c
.
Groups
},
nil
return
&
callback
{
UserHeader
:
c
.
UserHeader
,
logger
:
logger
,
pathSuffix
:
"/"
+
id
},
nil
}
// Callback is a connector which returns an identity with the HTTP header
// X-Remote-User as verified email.
type
callback
struct
{
headerName
string
groups
[]
string
UserHeader
string
logger
log
.
Logger
pathSuffix
string
}
...
...
@@ -51,9 +46,13 @@ func (m *callback) LoginURL(s connector.Scopes, callbackURL, state string) (stri
// HandleCallback parses the request and returns the user's identity
func
(
m
*
callback
)
HandleCallback
(
s
connector
.
Scopes
,
r
*
http
.
Request
)
(
connector
.
Identity
,
error
)
{
remoteUser
:=
r
.
Header
.
Get
(
m
.
headerName
)
userHeader
:=
"X-Remote-User"
// Default value
if
m
.
UserHeader
!=
""
{
userHeader
=
m
.
UserHeader
}
remoteUser
:=
r
.
Header
.
Get
(
userHeader
)
if
remoteUser
==
""
{
return
connector
.
Identity
{},
fmt
.
Errorf
(
"required HTTP header %s is not set"
,
m
.
h
eader
Name
)
return
connector
.
Identity
{},
fmt
.
Errorf
(
"required HTTP header %s is not set"
,
m
.
UserH
eader
)
}
// TODO: add support for X-Remote-Group, see
// https://kubernetes.io/docs/admin/authentication/#authenticating-proxy
...
...
@@ -61,6 +60,5 @@ func (m *callback) HandleCallback(s connector.Scopes, r *http.Request) (connecto
UserID
:
remoteUser
,
// TODO: figure out if this is a bad ID value.
Email
:
remoteUser
,
EmailVerified
:
true
,
Groups
:
m
.
groups
,
},
nil
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment