good morning!!!!
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
bor
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
Harbor 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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open
bor
Commits
95bbd46e
Unverified
Commit
95bbd46e
authored
Aug 2, 2021
by
baptiste-b-pegasys
Committed by
GitHub
Aug 2, 2021
Browse files
Options
Downloads
Patches
Plain Diff
node, cmd/clef: remove term "whitelist" (#23296)
* node: remove term "whitelist" * include cmd/clef
parent
85afdeef
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmd/clef/main.go
+1
-1
1 addition, 1 deletion
cmd/clef/main.go
node/rpcstack.go
+8
-8
8 additions, 8 deletions
node/rpcstack.go
with
9 additions
and
9 deletions
cmd/clef/main.go
+
1
−
1
View file @
95bbd46e
...
@@ -657,7 +657,7 @@ func signer(c *cli.Context) error {
...
@@ -657,7 +657,7 @@ func signer(c *cli.Context) error {
cors
:=
utils
.
SplitAndTrim
(
c
.
GlobalString
(
utils
.
HTTPCORSDomainFlag
.
Name
))
cors
:=
utils
.
SplitAndTrim
(
c
.
GlobalString
(
utils
.
HTTPCORSDomainFlag
.
Name
))
srv
:=
rpc
.
NewServer
()
srv
:=
rpc
.
NewServer
()
err
:=
node
.
RegisterApis
FromWhitelist
(
rpcAPI
,
[]
string
{
"account"
},
srv
,
false
)
err
:=
node
.
RegisterApis
(
rpcAPI
,
[]
string
{
"account"
},
srv
,
false
)
if
err
!=
nil
{
if
err
!=
nil
{
utils
.
Fatalf
(
"Could not register API: %w"
,
err
)
utils
.
Fatalf
(
"Could not register API: %w"
,
err
)
}
}
...
...
This diff is collapsed.
Click to expand it.
node/rpcstack.go
+
8
−
8
View file @
95bbd46e
...
@@ -280,7 +280,7 @@ func (h *httpServer) enableRPC(apis []rpc.API, config httpConfig) error {
...
@@ -280,7 +280,7 @@ func (h *httpServer) enableRPC(apis []rpc.API, config httpConfig) error {
// Create RPC server and handler.
// Create RPC server and handler.
srv
:=
rpc
.
NewServer
()
srv
:=
rpc
.
NewServer
()
if
err
:=
RegisterApis
FromWhitelist
(
apis
,
config
.
Modules
,
srv
,
false
);
err
!=
nil
{
if
err
:=
RegisterApis
(
apis
,
config
.
Modules
,
srv
,
false
);
err
!=
nil
{
return
err
return
err
}
}
h
.
httpConfig
=
config
h
.
httpConfig
=
config
...
@@ -312,7 +312,7 @@ func (h *httpServer) enableWS(apis []rpc.API, config wsConfig) error {
...
@@ -312,7 +312,7 @@ func (h *httpServer) enableWS(apis []rpc.API, config wsConfig) error {
// Create RPC server and handler.
// Create RPC server and handler.
srv
:=
rpc
.
NewServer
()
srv
:=
rpc
.
NewServer
()
if
err
:=
RegisterApis
FromWhitelist
(
apis
,
config
.
Modules
,
srv
,
false
);
err
!=
nil
{
if
err
:=
RegisterApis
(
apis
,
config
.
Modules
,
srv
,
false
);
err
!=
nil
{
return
err
return
err
}
}
h
.
wsConfig
=
config
h
.
wsConfig
=
config
...
@@ -515,20 +515,20 @@ func (is *ipcServer) stop() error {
...
@@ -515,20 +515,20 @@ func (is *ipcServer) stop() error {
return
err
return
err
}
}
// RegisterApis
FromWhitelist
checks the given modules' availability, generates a
white
list based on the allowed modules,
// RegisterApis checks the given modules' availability, generates a
n allow
list based on the allowed modules,
// and then registers all of the APIs exposed by the services.
// and then registers all of the APIs exposed by the services.
func
RegisterApis
FromWhitelist
(
apis
[]
rpc
.
API
,
modules
[]
string
,
srv
*
rpc
.
Server
,
exposeAll
bool
)
error
{
func
RegisterApis
(
apis
[]
rpc
.
API
,
modules
[]
string
,
srv
*
rpc
.
Server
,
exposeAll
bool
)
error
{
if
bad
,
available
:=
checkModuleAvailability
(
modules
,
apis
);
len
(
bad
)
>
0
{
if
bad
,
available
:=
checkModuleAvailability
(
modules
,
apis
);
len
(
bad
)
>
0
{
log
.
Error
(
"Unavailable modules in HTTP API list"
,
"unavailable"
,
bad
,
"available"
,
available
)
log
.
Error
(
"Unavailable modules in HTTP API list"
,
"unavailable"
,
bad
,
"available"
,
available
)
}
}
// Generate the
white
list based on the allowed modules
// Generate the
allow
list based on the allowed modules
whitel
ist
:=
make
(
map
[
string
]
bool
)
allowL
ist
:=
make
(
map
[
string
]
bool
)
for
_
,
module
:=
range
modules
{
for
_
,
module
:=
range
modules
{
whitel
ist
[
module
]
=
true
allowL
ist
[
module
]
=
true
}
}
// Register all the APIs exposed by the services
// Register all the APIs exposed by the services
for
_
,
api
:=
range
apis
{
for
_
,
api
:=
range
apis
{
if
exposeAll
||
whitel
ist
[
api
.
Namespace
]
||
(
len
(
whitel
ist
)
==
0
&&
api
.
Public
)
{
if
exposeAll
||
allowL
ist
[
api
.
Namespace
]
||
(
len
(
allowL
ist
)
==
0
&&
api
.
Public
)
{
if
err
:=
srv
.
RegisterName
(
api
.
Namespace
,
api
.
Service
);
err
!=
nil
{
if
err
:=
srv
.
RegisterName
(
api
.
Namespace
,
api
.
Service
);
err
!=
nil
{
return
err
return
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