Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
goSDN
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
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
Terraform modules
Analyze
Contributor analytics
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
danet
goSDN
Commits
f563aa57
Commit
f563aa57
authored
2 years ago
by
Fabian Seidl
Browse files
Options
Downloads
Patches
Plain Diff
updated naming, check for login didn'T make any sense
parent
a294a36a
No related branches found
No related tags found
No related merge requests found
Pipeline
#110216
failed
2 years ago
Stage: build
Stage: test
Stage: analyze
Stage: integration-test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
controller/northbound/server/auth.go
+1
-1
1 addition, 1 deletion
controller/northbound/server/auth.go
controller/rbac/jwtManager.go
+4
-4
4 additions, 4 deletions
controller/rbac/jwtManager.go
with
5 additions
and
5 deletions
controller/northbound/server/auth.go
+
1
−
1
View file @
f563aa57
...
@@ -130,7 +130,7 @@ func (s AuthServer) handleLogout(ctx context.Context, userName string) error {
...
@@ -130,7 +130,7 @@ func (s AuthServer) handleLogout(ctx context.Context, userName string) error {
if
len
(
md
[
"authorize"
])
>
0
{
if
len
(
md
[
"authorize"
])
>
0
{
token
:=
md
[
"authorize"
][
0
]
token
:=
md
[
"authorize"
][
0
]
claims
,
err
:=
s
.
jwtManager
.
GetClaimsFromToken
(
token
,
fals
e
)
claims
,
err
:=
s
.
jwtManager
.
GetClaimsFromToken
(
token
,
tru
e
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
...
...
This diff is collapsed.
Click to expand it.
controller/rbac/jwtManager.go
+
4
−
4
View file @
f563aa57
...
@@ -39,7 +39,7 @@ func (man *JWTManager) GenerateToken(user User) (string, error) {
...
@@ -39,7 +39,7 @@ func (man *JWTManager) GenerateToken(user User) (string, error) {
}
}
// VerifyToken verifies if a given token string is a valid jwt token.
// VerifyToken verifies if a given token string is a valid jwt token.
func
(
man
*
JWTManager
)
VerifyToken
(
accessToken
string
,
log
in
bool
)
(
*
UserClaims
,
error
)
{
func
(
man
*
JWTManager
)
VerifyToken
(
accessToken
string
,
log
out
bool
)
(
*
UserClaims
,
error
)
{
token
,
err
:=
jwt
.
ParseWithClaims
(
token
,
err
:=
jwt
.
ParseWithClaims
(
accessToken
,
accessToken
,
&
UserClaims
{},
&
UserClaims
{},
...
@@ -53,7 +53,7 @@ func (man *JWTManager) VerifyToken(accessToken string, login bool) (*UserClaims,
...
@@ -53,7 +53,7 @@ func (man *JWTManager) VerifyToken(accessToken string, login bool) (*UserClaims,
},
},
)
)
if
err
!=
nil
&&
log
in
{
if
err
!=
nil
&&
!
log
out
{
return
nil
,
status
.
Errorf
(
codes
.
Unauthenticated
,
"invalid token: %v"
,
err
)
return
nil
,
status
.
Errorf
(
codes
.
Unauthenticated
,
"invalid token: %v"
,
err
)
}
}
...
@@ -66,8 +66,8 @@ func (man *JWTManager) VerifyToken(accessToken string, login bool) (*UserClaims,
...
@@ -66,8 +66,8 @@ func (man *JWTManager) VerifyToken(accessToken string, login bool) (*UserClaims,
}
}
// GetClaimsFromToken returns the UserClaims associated to the provided token.
// GetClaimsFromToken returns the UserClaims associated to the provided token.
func
(
man
*
JWTManager
)
GetClaimsFromToken
(
token
string
,
log
in
bool
)
(
*
UserClaims
,
error
)
{
func
(
man
*
JWTManager
)
GetClaimsFromToken
(
token
string
,
log
out
bool
)
(
*
UserClaims
,
error
)
{
claims
,
err
:=
man
.
VerifyToken
(
token
,
log
in
)
claims
,
err
:=
man
.
VerifyToken
(
token
,
log
out
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
...
...
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