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
dd5ae4fd
Commit
dd5ae4fd
authored
Dec 19, 2017
by
Janos Guljas
Browse files
Options
Downloads
Patches
Plain Diff
cmd/swarm: add validation for EnsAPIs configuration parameter
parent
0d6a735a
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/swarm/config.go
+35
-0
35 additions, 0 deletions
cmd/swarm/config.go
cmd/swarm/config_test.go
+95
-0
95 additions, 0 deletions
cmd/swarm/config_test.go
with
130 additions
and
0 deletions
cmd/swarm/config.go
+
35
−
0
View file @
dd5ae4fd
...
...
@@ -102,6 +102,8 @@ func buildConfig(ctx *cli.Context) (config *bzzapi.Config, err error) {
config
=
envVarsOverride
(
config
)
//override settings provided by command line
config
=
cmdLineOverride
(
config
,
ctx
)
//validate configuration parameters
err
=
validateConfig
(
config
)
return
}
...
...
@@ -319,6 +321,39 @@ func checkDeprecated(ctx *cli.Context) {
}
}
//validate configuration parameters
func
validateConfig
(
cfg
*
bzzapi
.
Config
)
(
err
error
)
{
for
_
,
ensAPI
:=
range
cfg
.
EnsAPIs
{
if
ensAPI
!=
""
{
if
err
:=
validateEnsAPIs
(
ensAPI
);
err
!=
nil
{
return
fmt
.
Errorf
(
"invalid format [tld:][contract-addr@]url for ENS API endpoint configuration %q: %v"
,
ensAPI
,
err
)
}
}
}
return
nil
}
//validate EnsAPIs configuration parameter
func
validateEnsAPIs
(
s
string
)
(
err
error
)
{
// missing contract address
if
strings
.
HasPrefix
(
s
,
"@"
)
{
return
errors
.
New
(
"missing contract address"
)
}
// missing url
if
strings
.
HasSuffix
(
s
,
"@"
)
{
return
errors
.
New
(
"missing url"
)
}
// missing tld
if
strings
.
HasPrefix
(
s
,
":"
)
{
return
errors
.
New
(
"missing tld"
)
}
// missing url
if
strings
.
HasSuffix
(
s
,
":"
)
{
return
errors
.
New
(
"missing url"
)
}
return
nil
}
//print a Config as string
func
printConfig
(
config
*
bzzapi
.
Config
)
string
{
out
,
err
:=
tomlSettings
.
Marshal
(
&
config
)
...
...
This diff is collapsed.
Click to expand it.
cmd/swarm/config_test.go
+
95
−
0
View file @
dd5ae4fd
...
...
@@ -457,3 +457,98 @@ func TestCmdLineOverridesFile(t *testing.T) {
node
.
Shutdown
()
}
func
TestValidateConfig
(
t
*
testing
.
T
)
{
for
_
,
c
:=
range
[]
struct
{
cfg
*
api
.
Config
err
string
}{
{
cfg
:
&
api
.
Config
{
EnsAPIs
:
[]
string
{
"/data/testnet/geth.ipc"
,
}},
},
{
cfg
:
&
api
.
Config
{
EnsAPIs
:
[]
string
{
"http://127.0.0.1:1234"
,
}},
},
{
cfg
:
&
api
.
Config
{
EnsAPIs
:
[]
string
{
"ws://127.0.0.1:1234"
,
}},
},
{
cfg
:
&
api
.
Config
{
EnsAPIs
:
[]
string
{
"test:/data/testnet/geth.ipc"
,
}},
},
{
cfg
:
&
api
.
Config
{
EnsAPIs
:
[]
string
{
"test:ws://127.0.0.1:1234"
,
}},
},
{
cfg
:
&
api
.
Config
{
EnsAPIs
:
[]
string
{
"314159265dD8dbb310642f98f50C066173C1259b@/data/testnet/geth.ipc"
,
}},
},
{
cfg
:
&
api
.
Config
{
EnsAPIs
:
[]
string
{
"314159265dD8dbb310642f98f50C066173C1259b@http://127.0.0.1:1234"
,
}},
},
{
cfg
:
&
api
.
Config
{
EnsAPIs
:
[]
string
{
"314159265dD8dbb310642f98f50C066173C1259b@ws://127.0.0.1:1234"
,
}},
},
{
cfg
:
&
api
.
Config
{
EnsAPIs
:
[]
string
{
"test:314159265dD8dbb310642f98f50C066173C1259b@/data/testnet/geth.ipc"
,
}},
},
{
cfg
:
&
api
.
Config
{
EnsAPIs
:
[]
string
{
"eth:314159265dD8dbb310642f98f50C066173C1259b@http://127.0.0.1:1234"
,
}},
},
{
cfg
:
&
api
.
Config
{
EnsAPIs
:
[]
string
{
"eth:314159265dD8dbb310642f98f50C066173C1259b@ws://127.0.0.1:12344"
,
}},
},
{
cfg
:
&
api
.
Config
{
EnsAPIs
:
[]
string
{
"eth:"
,
}},
err
:
"invalid format [tld:][contract-addr@]url for ENS API endpoint configuration
\"
eth:
\"
: missing url"
,
},
{
cfg
:
&
api
.
Config
{
EnsAPIs
:
[]
string
{
"314159265dD8dbb310642f98f50C066173C1259b@"
,
}},
err
:
"invalid format [tld:][contract-addr@]url for ENS API endpoint configuration
\"
314159265dD8dbb310642f98f50C066173C1259b@
\"
: missing url"
,
},
{
cfg
:
&
api
.
Config
{
EnsAPIs
:
[]
string
{
":314159265dD8dbb310642f98f50C066173C1259"
,
}},
err
:
"invalid format [tld:][contract-addr@]url for ENS API endpoint configuration
\"
:314159265dD8dbb310642f98f50C066173C1259
\"
: missing tld"
,
},
{
cfg
:
&
api
.
Config
{
EnsAPIs
:
[]
string
{
"@/data/testnet/geth.ipc"
,
}},
err
:
"invalid format [tld:][contract-addr@]url for ENS API endpoint configuration
\"
@/data/testnet/geth.ipc
\"
: missing contract address"
,
},
}
{
err
:=
validateConfig
(
c
.
cfg
)
if
c
.
err
!=
""
&&
err
.
Error
()
!=
c
.
err
{
t
.
Errorf
(
"expected error %q, got %q"
,
c
.
err
,
err
)
}
if
c
.
err
==
""
&&
err
!=
nil
{
t
.
Errorf
(
"unexpected error %q"
,
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