Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cmd/faucet/main: adds flag use audit checks and refactors logic #276

Merged
merged 2 commits into from
Jan 8, 2021
Merged

cmd/faucet/main: adds flag use audit checks and refactors logic #276

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43cae49
main: adds flag use audit checks and refactors logic
meowsbits Jan 5, 2021
b7db5a2
main: remove ethPort vs. attach flag exclusive check
meowsbits Jan 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 65 additions & 15 deletions cmd/faucet/faucet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
"net/url"
"os"
"path/filepath"
"reflect"
"regexp"
"strconv"
"strings"
Expand Down Expand Up @@ -209,28 +210,77 @@ func parseChainFlags() (gs *genesisT.Genesis, bs string, netid uint64) {

// auditFlagUse ensures that exclusive/incompatible flag values are not set.
// If invalid use if found, the program exits with log.Crit.
func auditFlagUse(genesis *genesisT.Genesis) {
if genesis == nil && *attachFlag == "" {
log.Crit("no -chain.<identity> configured and no attach target; use either -chain.<identity> or -attach.")
}
if *statsFlag != "" && *attachFlag != "" {
log.Crit("flags are incompatible", "flags", []string{"ethstats", "attach"}, "values", []*string{statsFlag, attachFlag})
}
var activeChainFlag *bool
func auditFlagUse() {
var (
ffalse = false
activeChainFlag = &ffalse
)
for _, f := range chainFlags {
if *f {
if activeChainFlag != nil {
if *activeChainFlag {
log.Crit("cannot use two -chain.* flags simultaneously")
}
activeChainFlag = f
}
}
if activeChainFlag != nil && *attachFlag != "" {
log.Crit("cannot use -chain.* with -attach")

if !*activeChainFlag && *genesisFlag == "" && *attachFlag == "" {
log.Crit("missing chain configuration option; use one of -chain.<identity>, -genesis, or -attach")
}
if *genesisFlag != "" && *attachFlag != "" {
log.Crit("cannot use -genesis flag with -attach")

type fflag struct {
name string
value interface{}
}
exclusiveOrCrit := func(a, b fflag) {
didSetOne := false
for _, f := range []fflag{a, b} {
isSet := false
switch t := f.value.(type) {
case *string:
isSet = *t != ""
case *bool:
isSet = *t
case bool:
isSet = t
case *int64:
isSet = *t != 0
case *uint64:
isSet = *t != 0
case *int:
isSet = *t != 0
default:
panic(fmt.Sprintf("unhandled flag type case: %v %t %s", t, t, f.name))
}
if didSetOne && isSet {
var av, bv interface{}
av = a.value
bv = b.value
if reflect.TypeOf(a.value).Kind() == reflect.Ptr {
av = reflect.ValueOf(a.value).Elem()
}
if reflect.TypeOf(b.value).Kind() == reflect.Ptr {
bv = reflect.ValueOf(b.value).Elem()
}
log.Crit("flags are exclusive", "flags", []string{a.name, b.name}, "values", []interface{}{av, bv})
}
didSetOne = isSet
}
}
for _, exclusivePair := range [][]fflag{
{{"attach", attachFlag}, {"chain.<identity>", activeChainFlag}},
{{"attach", attachFlag}, {"genesis", genesisFlag}},
{{"attach", attachFlag}, {"ethstats", statsFlag}},
{{"attach", attachFlag}, {"network", netFlag}},
{{"attach", attachFlag}, {"bootnodes", bootFlag}},
} {
exclusiveOrCrit(exclusivePair[0], exclusivePair[1])
}

if *attachFlag == "" && *attachChainID != 0 {
log.Crit("must use -attach when using -attach.chainid")
}

if *syncmodeFlag != "" {
allowedModes := []string{"light", "fast", "full"}
var ok bool
Expand All @@ -251,16 +301,16 @@ func main() {
flag.Parse()
log.Root().SetHandler(log.LvlFilterHandler(log.Lvl(*logFlag), log.StreamHandler(os.Stderr, log.TerminalFormat(true))))

auditFlagUse()

// Load and parse the genesis block requested by the user
var genesis *genesisT.Genesis
var enodes []*discv5.Node
var blob []byte

// client will be used if the faucet is attaching. If not it won't be touched.
var client *ethclient.Client

genesis, *bootFlag, *netFlag = parseChainFlags()
auditFlagUse(genesis)

// Construct the payout tiers
amounts := make([]string, *tiersFlag)
Expand Down