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
a810dc40
Commit
a810dc40
authored
11 months ago
by
Fabian Seidl
Committed by
Matthias Feyll
11 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Resolve "Add generic app role to controller"
See merge request
!921
parent
504e6fa1
No related branches found
No related tags found
1 merge request
!1005
Draft: feature-ui-361_setup-project
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
controller/controller.go
+54
-2
54 additions, 2 deletions
controller/controller.go
integration-tests/application_tests/application_test.go
+1
-0
1 addition, 0 deletions
integration-tests/application_tests/application_test.go
with
55 additions
and
2 deletions
controller/controller.go
+
54
−
2
View file @
a810dc40
...
@@ -164,7 +164,7 @@ func initialize() error {
...
@@ -164,7 +164,7 @@ func initialize() error {
c
.
networkElementWatcher
=
nucleus
.
NewNetworkElementWatcher
(
c
.
mneService
,
c
.
eventService
)
c
.
networkElementWatcher
=
nucleus
.
NewNetworkElementWatcher
(
c
.
mneService
,
c
.
eventService
)
c
.
networkElementWatcher
.
SubscribeToNetworkElements
(
nil
)
c
.
networkElementWatcher
.
SubscribeToNetworkElements
(
nil
)
if
err
:=
ensureDefaultRoleExist
s
();
err
!=
nil
{
if
err
:=
ensureDefaultRole
s
Exist
();
err
!=
nil
{
return
err
return
err
}
}
...
@@ -287,7 +287,21 @@ func createPrincipalNetworkDomain() error {
...
@@ -287,7 +287,21 @@ func createPrincipalNetworkDomain() error {
return
nil
return
nil
}
}
func
ensureDefaultRoleExists
()
error
{
func
ensureDefaultRolesExist
()
error
{
err
:=
ensureAdminRoleExists
()
if
err
!=
nil
{
return
err
}
err
=
ensureGenericAppRoleExists
()
if
err
!=
nil
{
return
err
}
return
nil
}
func
ensureAdminRoleExists
()
error
{
defaultAdminRoleName
:=
"admin"
defaultAdminRoleName
:=
"admin"
adminRole
,
err
:=
c
.
roleService
.
Get
(
store
.
Query
{
ID
:
uuid
.
Nil
,
Name
:
defaultAdminRoleName
})
adminRole
,
err
:=
c
.
roleService
.
Get
(
store
.
Query
{
ID
:
uuid
.
Nil
,
Name
:
defaultAdminRoleName
})
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -347,6 +361,44 @@ func ensureDefaultRoleExists() error {
...
@@ -347,6 +361,44 @@ func ensureDefaultRoleExists() error {
return
nil
return
nil
}
}
func
ensureGenericAppRoleExists
()
error
{
defaultAppRoleName
:=
"app"
appRole
,
err
:=
c
.
roleService
.
Get
(
store
.
Query
{
ID
:
uuid
.
Nil
,
Name
:
defaultAppRoleName
})
if
err
!=
nil
{
log
.
Info
(
err
)
}
if
appRole
==
nil
{
err
:=
c
.
roleService
.
Add
(
rbacImpl
.
NewRole
(
uuid
.
New
(),
defaultAppRoleName
,
"generic app role"
,
[]
string
{
"/gosdn.pnd.PndService/GetPnd"
,
"/gosdn.pnd.PndService/GetPndList"
,
"/gosdn.networkelement.NetworkElementService/Get"
,
"/gosdn.networkelement.NetworkElementService/GetFlattened"
,
"/gosdn.networkelement.NetworkElementService/GetAll"
,
"/gosdn.networkelement.NetworkElementService/GetAllFlattened"
,
"/gosdn.networkelement.NetworkElementService/GetPath"
,
"/gosdn.networkelement.NetworkElementService/GetIntendedPath"
,
"/gosdn.networkelement.NetworkElementService/GetChange"
,
"/gosdn.networkelement.NetworkElementService/GetChangeList"
,
"/gosdn.networkelement.NetworkElementService/AddList"
,
"/gosdn.networkelement.NetworkElementService/SetChangeList"
,
"/gosdn.networkelement.NetworkElementService/SetPathList"
,
"/gosdn.networkelement.NetworkElementService/DeviceSchema"
,
"/gosdn.networkelement.NetworkElementService/Delete"
,
"/gosdn.networkelement.NetworkElementService/SubscribePath"
,
"/gosdn.plugin_internal.PluginInternalService/AvailablePlugins"
,
"/gosdn.plugin_internal.PluginInternalService/GetPluginSchema"
,
"/gosdn.app.AppService/Register"
,
"/gosdn.app.AppService/Deregister"
,
}))
if
err
!=
nil
{
return
err
}
}
return
nil
}
func
ensureDefaultUserExists
()
error
{
func
ensureDefaultUserExists
()
error
{
defaultUserName
:=
"admin"
defaultUserName
:=
"admin"
adminUser
,
err
:=
c
.
userService
.
Get
(
store
.
Query
{
ID
:
uuid
.
Nil
,
Name
:
defaultUserName
})
adminUser
,
err
:=
c
.
userService
.
Get
(
store
.
Query
{
ID
:
uuid
.
Nil
,
Name
:
defaultUserName
})
...
...
This diff is collapsed.
Click to expand it.
integration-tests/application_tests/application_test.go
+
1
−
0
View file @
a810dc40
...
@@ -100,6 +100,7 @@ func TestMain(m *testing.M) {
...
@@ -100,6 +100,7 @@ func TestMain(m *testing.M) {
// a user and role and update the user because of the login. After then only logins are done, no user and role creations.
// a user and role and update the user because of the login. After then only logins are done, no user and role creations.
// This means that this will block after trying once, because of the three attempts to read from eventChannels.
// This means that this will block after trying once, because of the three attempts to read from eventChannels.
_
=
<-
application
.
addEventChannel
_
=
<-
application
.
addEventChannel
_
=
<-
application
.
addEventChannel
_
=
<-
application
.
addEventChannel
_
=
<-
application
.
addEventChannel
_
=
<-
application
.
updateEventChannel
_
=
<-
application
.
updateEventChannel
...
...
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