george.bartolomey/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#979] adm/subnet: Fix notary issues

Browse source 
Only `subnet create` command can generate notary requests.

Remove global `non-notary` flag. Add `notary` flag to `create` cmd.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-12-01 13:37:07 +03:00 committed by LeL
parent 98e0792b08
commit 4d79195ede
1 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
cmd/neofs-adm/internal/modules/morph/subnet.go
View file

@ -28,8 +28,6 @@ const (
flagSubnetKey = "key" flagSubnetKey = "key"
// contract address // contract address
flagSubnetContract = "contract" flagSubnetContract = "contract"
// disable notary
flagSubnetNonNotary = "non-notary"
) )
func viperBindFlags(cmd *cobra.Command, flags ...string) { func viperBindFlags(cmd *cobra.Command, flags ...string) {
@ -47,7 +45,6 @@ var cmdSubnet = &cobra.Command{
flagSubnetEndpoint, flagSubnetEndpoint,
flagSubnetKey, flagSubnetKey,
flagSubnetContract, flagSubnetContract,
flagSubnetNonNotary,
) )
}, },
} }
@ -84,13 +81,19 @@ func readSubnetKey(key *keys.PrivateKey) error {
return nil return nil
} }
// calls initSubnetClientCheckNotary with unset checkNotary.
func initSubnetClient(c *morphsubnet.Client, key *keys.PrivateKey) error {
return initSubnetClientCheckNotary(c, key, false)
}
// initializes morph subnet client with the specified private key. // initializes morph subnet client with the specified private key.
// //
// Parameters are read from: // Parameters are read from:
// * contract address: flagSubnetContract; // * contract address: flagSubnetContract;
// * endpoint: flagSubnetEndpoint; // * endpoint: flagSubnetEndpoint.
// * non-notary mode: flagSubnetNonNotary. //
func initSubnetClient(c *morphsubnet.Client, key *keys.PrivateKey) error { // If checkNotary is set, non-notary mode is read from flagSubnetNonNotary.
func initSubnetClientCheckNotary(c *morphsubnet.Client, key *keys.PrivateKey, checkNotary bool) error {
// read endpoint // read endpoint
endpoint := viper.GetString(flagSubnetEndpoint) endpoint := viper.GetString(flagSubnetEndpoint)
if endpoint == "" { if endpoint == "" {
@ -109,20 +112,16 @@ func initSubnetClient(c *morphsubnet.Client, key *keys.PrivateKey) error {
return err return err
} }
nonNotary := viper.GetBool(flagSubnetNonNotary) // calc client mode
cMode := morphsubnet.NonNotary
if !nonNotary { if checkNotary && viper.GetBool(flagSubnetNotary) {
err = cMorph.EnableNotarySupport() err = cMorph.EnableNotarySupport()
if err != nil { if err != nil {
return fmt.Errorf("enable notary support: %w", err) return fmt.Errorf("enable notary support: %w", err)
} }
}
// calc client mode cMode = morphsubnet.NotaryNonAlphabet
cMode := morphsubnet.NotaryNonAlphabet
if nonNotary {
cMode = morphsubnet.NonNotary
} }
// init subnet morph client // init subnet morph client
@ -139,10 +138,20 @@ func initSubnetClient(c *morphsubnet.Client, key *keys.PrivateKey) error {
return nil return nil
} }
const (
// enable notary
flagSubnetNotary = "notary"
)
// create subnet command. // create subnet command.
var cmdSubnetCreate = &cobra.Command{ var cmdSubnetCreate = &cobra.Command{
Use: "create", Use: "create",
Short: "Create NeoFS subnet.", Short: "Create NeoFS subnet.",
PreRun: func(cmd *cobra.Command, _ []string) {
viperBindFlags(cmd,
flagSubnetNotary,
)
},
RunE: func(cmd *cobra.Command, _ []string) error { RunE: func(cmd *cobra.Command, _ []string) error {
// read private key // read private key
var key keys.PrivateKey var key keys.PrivateKey
@ -196,7 +205,7 @@ var cmdSubnetCreate = &cobra.Command{
// initialize morph subnet client // initialize morph subnet client
var cSubnet morphsubnet.Client var cSubnet morphsubnet.Client
err = initSubnetClient(&cSubnet, &key) err = initSubnetClientCheckNotary(&cSubnet, &key, true)
if err != nil { if err != nil {
return fmt.Errorf("init subnet client: %w", err) return fmt.Errorf("init subnet client: %w", err)
} }
@ -783,6 +792,8 @@ func addCommandInheritPreRun(par *cobra.Command, subs ...*cobra.Command) {
// registers flags and binds sub-commands for subnet commands. // registers flags and binds sub-commands for subnet commands.
func init() { func init() {
cmdSubnetCreate.Flags().Bool(flagSubnetNotary, false, "Flag to create subnet in notary environment")
// get subnet flags // get subnet flags
cmdSubnetGet.Flags().String(flagSubnetGetID, "", "ID of the subnet to read") cmdSubnetGet.Flags().String(flagSubnetGetID, "", "ID of the subnet to read")
_ = cmdSubnetAdminAdd.MarkFlagRequired(flagSubnetGetID) _ = cmdSubnetAdminAdd.MarkFlagRequired(flagSubnetGetID)
@ -849,8 +860,6 @@ func init() {
cmdSubnetFlags.StringP(flagSubnetKey, "k", "", "Path to file with private key") cmdSubnetFlags.StringP(flagSubnetKey, "k", "", "Path to file with private key")
_ = cmdSubnet.MarkFlagRequired(flagSubnetKey) _ = cmdSubnet.MarkFlagRequired(flagSubnetKey)
cmdSubnetFlags.StringP(flagSubnetContract, "a", "", "Subnet contract address (string LE)") cmdSubnetFlags.StringP(flagSubnetContract, "a", "", "Subnet contract address (string LE)")
_ = cmdSubnet.MarkFlagRequired(flagSubnetContract)
cmdSubnetFlags.Bool(flagSubnetNonNotary, false, "Flag to work in non-notary environment")
// add all subnet commands to corresponding command section // add all subnet commands to corresponding command section
addCommandInheritPreRun(cmdSubnet, addCommandInheritPreRun(cmdSubnet,