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
b78b8aee
Commit
b78b8aee
authored
6 years ago
by
Haines Chan
Committed by
Haines Chan
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Replace "GET", "POST" to http.MethodGet and http.MethodPost
parent
4329f407
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cmd/example-app/main.go
+2
-2
2 additions, 2 deletions
cmd/example-app/main.go
server/handlers.go
+8
-8
8 additions, 8 deletions
server/handlers.go
storage/kubernetes/client.go
+1
-1
1 addition, 1 deletion
storage/kubernetes/client.go
with
11 additions
and
11 deletions
cmd/example-app/main.go
+
2
−
2
View file @
b78b8aee
...
...
@@ -261,7 +261,7 @@ func (a *app) handleCallback(w http.ResponseWriter, r *http.Request) {
ctx
:=
oidc
.
ClientContext
(
r
.
Context
(),
a
.
client
)
oauth2Config
:=
a
.
oauth2Config
(
nil
)
switch
r
.
Method
{
case
"GET"
:
case
http
.
MethodGet
:
// Authorization redirect callback from OAuth2 auth flow.
if
errMsg
:=
r
.
FormValue
(
"error"
);
errMsg
!=
""
{
http
.
Error
(
w
,
errMsg
+
": "
+
r
.
FormValue
(
"error_description"
),
http
.
StatusBadRequest
)
...
...
@@ -277,7 +277,7 @@ func (a *app) handleCallback(w http.ResponseWriter, r *http.Request) {
return
}
token
,
err
=
oauth2Config
.
Exchange
(
ctx
,
code
)
case
"POST"
:
case
http
.
MethodPost
:
// Form request from frontend to refresh a token.
refresh
:=
r
.
FormValue
(
"refresh_token"
)
if
refresh
==
""
{
...
...
This diff is collapsed.
Click to expand it.
server/handlers.go
+
8
−
8
View file @
b78b8aee
...
...
@@ -240,7 +240,7 @@ func (s *Server) handleConnectorLogin(w http.ResponseWriter, r *http.Request) {
showBacklink
:=
len
(
s
.
connectors
)
>
1
switch
r
.
Method
{
case
"GET"
:
case
http
.
MethodGet
:
switch
conn
:=
conn
.
Connector
.
(
type
)
{
case
connector
.
CallbackConnector
:
// Use the auth request ID as the "state" token.
...
...
@@ -285,7 +285,7 @@ func (s *Server) handleConnectorLogin(w http.ResponseWriter, r *http.Request) {
default
:
s
.
renderError
(
w
,
http
.
StatusBadRequest
,
"Requested resource does not exist."
)
}
case
"POST"
:
case
http
.
MethodPost
:
passwordConnector
,
ok
:=
conn
.
Connector
.
(
connector
.
PasswordConnector
)
if
!
ok
{
s
.
renderError
(
w
,
http
.
StatusBadRequest
,
"Requested resource does not exist."
)
...
...
@@ -323,12 +323,12 @@ func (s *Server) handleConnectorLogin(w http.ResponseWriter, r *http.Request) {
func
(
s
*
Server
)
handleConnectorCallback
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
var
authID
string
switch
r
.
Method
{
case
"GET"
:
// OAuth2 callback
case
http
.
MethodGet
:
// OAuth2 callback
if
authID
=
r
.
URL
.
Query
()
.
Get
(
"state"
);
authID
==
""
{
s
.
renderError
(
w
,
http
.
StatusBadRequest
,
"User session error."
)
return
}
case
"POST"
:
// SAML POST binding
case
http
.
MethodPost
:
// SAML POST binding
if
authID
=
r
.
PostFormValue
(
"RelayState"
);
authID
==
""
{
s
.
renderError
(
w
,
http
.
StatusBadRequest
,
"User session error."
)
return
...
...
@@ -366,14 +366,14 @@ func (s *Server) handleConnectorCallback(w http.ResponseWriter, r *http.Request)
var
identity
connector
.
Identity
switch
conn
:=
conn
.
Connector
.
(
type
)
{
case
connector
.
CallbackConnector
:
if
r
.
Method
!=
"GET"
{
if
r
.
Method
!=
http
.
MethodGet
{
s
.
logger
.
Errorf
(
"SAML request mapped to OAuth2 connector"
)
s
.
renderError
(
w
,
http
.
StatusBadRequest
,
"Invalid request"
)
return
}
identity
,
err
=
conn
.
HandleCallback
(
parseScopes
(
authReq
.
Scopes
),
r
)
case
connector
.
SAMLConnector
:
if
r
.
Method
!=
"POST"
{
if
r
.
Method
!=
http
.
MethodPost
{
s
.
logger
.
Errorf
(
"OAuth2 request mapped to SAML connector"
)
s
.
renderError
(
w
,
http
.
StatusBadRequest
,
"Invalid request"
)
return
...
...
@@ -446,7 +446,7 @@ func (s *Server) handleApproval(w http.ResponseWriter, r *http.Request) {
}
switch
r
.
Method
{
case
"GET"
:
case
http
.
MethodGet
:
if
s
.
skipApproval
{
s
.
sendCodeResponse
(
w
,
r
,
authReq
)
return
...
...
@@ -460,7 +460,7 @@ func (s *Server) handleApproval(w http.ResponseWriter, r *http.Request) {
if
err
:=
s
.
templates
.
approval
(
w
,
authReq
.
ID
,
authReq
.
Claims
.
Username
,
client
.
Name
,
authReq
.
Scopes
);
err
!=
nil
{
s
.
logger
.
Errorf
(
"Server template error: %v"
,
err
)
}
case
"POST"
:
case
http
.
MethodPost
:
if
r
.
FormValue
(
"approval"
)
!=
"approve"
{
s
.
renderError
(
w
,
http
.
StatusInternalServerError
,
"Approval rejected."
)
return
...
...
This diff is collapsed.
Click to expand it.
storage/kubernetes/client.go
+
1
−
1
View file @
b78b8aee
...
...
@@ -137,7 +137,7 @@ func checkHTTPErr(r *http.Response, validStatusCodes ...int) error {
if
r
.
StatusCode
==
http
.
StatusNotFound
{
return
storage
.
ErrNotFound
}
if
r
.
Request
.
Method
==
"POST"
&&
r
.
StatusCode
==
http
.
StatusConflict
{
if
r
.
Request
.
Method
==
http
.
MethodPost
&&
r
.
StatusCode
==
http
.
StatusConflict
{
return
storage
.
ErrAlreadyExists
}
...
...
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