adelorenzo/kilo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmg/kgctl: fix peer as-peer

Browse Source
This commit is contained in:
Lucas Servén Marín 2019-05-09 17:12:44 +02:00
parent 47a7cebd35
commit b04264ecc1
No known key found for this signature in database
GPG Key ID: 586FEAF680DA74AD
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
cmd/kgctl/showconf.go
View File

@ -44,11 +44,13 @@ var (
outputFormatWireGuard, outputFormatWireGuard,
outputFormatYAML, outputFormatYAML,
}, ", ") }, ", ")
allowedIPs []string allowedIPs []string
aips []*net.IPNet showConfOpts struct {
asPeer bool allowedIPs []*net.IPNet
output string serializer *json.Serializer
serializer *json.Serializer output string
asPeer bool
}
) )
func showConf() *cobra.Command { func showConf() *cobra.Command {
@ -64,29 +66,29 @@ func showConf() *cobra.Command {
} { } {
cmd.AddCommand(subCmd) cmd.AddCommand(subCmd)
} }
cmd.PersistentFlags().BoolVar(&asPeer, "as-peer", false, "Should the resource be shown as a peer? Useful to configure this resource as a peer of another WireGuard interface.") cmd.PersistentFlags().BoolVar(&showConfOpts.asPeer, "as-peer", false, "Should the resource be shown as a peer? Useful to configure this resource as a peer of another WireGuard interface.")
cmd.PersistentFlags().StringVarP(&output, "output", "o", "wireguard", fmt.Sprintf("The output format of the resource. Only valid when combined with 'as-peer'. Possible values: %s", availableOutputFormats)) cmd.PersistentFlags().StringVarP(&showConfOpts.output, "output", "o", "wireguard", fmt.Sprintf("The output format of the resource. Only valid when combined with 'as-peer'. Possible values: %s", availableOutputFormats))
cmd.PersistentFlags().StringSliceVar(&allowedIPs, "allowed-ips", []string{}, "Override the allowed IPs of the configuration. Only valid when combined with 'as-peer'.") cmd.PersistentFlags().StringSliceVar(&allowedIPs, "allowed-ips", []string{}, "Override the allowed IPs of the configuration. Only valid when combined with 'as-peer'.")
return cmd return cmd
} }
func runShowConf(c *cobra.Command, args []string) error { func runShowConf(c *cobra.Command, args []string) error {
switch output { switch showConfOpts.output {
case outputFormatJSON: case outputFormatJSON:
serializer = json.NewSerializer(json.DefaultMetaFactory, peerCreatorTyper{}, peerCreatorTyper{}, true) showConfOpts.serializer = json.NewSerializer(json.DefaultMetaFactory, peerCreatorTyper{}, peerCreatorTyper{}, true)
case outputFormatWireGuard: case outputFormatWireGuard:
case outputFormatYAML: case outputFormatYAML:
serializer = json.NewYAMLSerializer(json.DefaultMetaFactory, peerCreatorTyper{}, peerCreatorTyper{}) showConfOpts.serializer = json.NewYAMLSerializer(json.DefaultMetaFactory, peerCreatorTyper{}, peerCreatorTyper{})
default: default:
return fmt.Errorf("output format %v unknown; posible values are: %s", output, availableOutputFormats) return fmt.Errorf("output format %v unknown; posible values are: %s", showConfOpts.output, availableOutputFormats)
} }
for i := range allowedIPs { for i := range allowedIPs {
_, aip, err := net.ParseCIDR(allowedIPs[i]) _, aip, err := net.ParseCIDR(allowedIPs[i])
if err != nil { if err != nil {
return fmt.Errorf("allowed-ips must contain only valid CIDRs; got %q", allowedIPs[i]) return fmt.Errorf("allowed-ips must contain only valid CIDRs; got %q", allowedIPs[i])
} }
aips = append(aips, aip) showConfOpts.allowedIPs = append(showConfOpts.allowedIPs, aip)
} }
return runRoot(c, args) return runRoot(c, args)
} }
@ -144,7 +146,7 @@ func runShowConfNode(_ *cobra.Command, args []string) error {
return fmt.Errorf("failed to create topology: %v", err) return fmt.Errorf("failed to create topology: %v", err)
} }
if !asPeer { if !showConfOpts.asPeer {
c, err := t.Conf().Bytes() c, err := t.Conf().Bytes()
if err != nil { if err != nil {
return fmt.Errorf("failed to generate configuration: %v", err) return fmt.Errorf("failed to generate configuration: %v", err)
@ -153,20 +155,20 @@ func runShowConfNode(_ *cobra.Command, args []string) error {
return err return err
} }
switch output { switch showConfOpts.output {
case outputFormatJSON: case outputFormatJSON:
fallthrough fallthrough
case outputFormatYAML: case outputFormatYAML:
p := translatePeer(t.AsPeer()) p := translatePeer(t.AsPeer())
p.Name = hostname p.Name = hostname
if len(aips) != 0 { if len(showConfOpts.allowedIPs) != 0 {
p.Spec.AllowedIPs = allowedIPs p.Spec.AllowedIPs = allowedIPs
} }
return serializer.Encode(p, os.Stdout) return showConfOpts.serializer.Encode(p, os.Stdout)
case outputFormatWireGuard: case outputFormatWireGuard:
p := t.AsPeer() p := t.AsPeer()
if len(aips) != 0 { if len(showConfOpts.allowedIPs) != 0 {
p.AllowedIPs = aips p.AllowedIPs = showConfOpts.allowedIPs
} }
c, err := (&wireguard.Conf{ c, err := (&wireguard.Conf{
Peers: []*wireguard.Peer{p}, Peers: []*wireguard.Peer{p},
@ -216,7 +218,7 @@ func runShowConfPeer(_ *cobra.Command, args []string) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to create topology: %v", err) return fmt.Errorf("failed to create topology: %v", err)
} }
if !asPeer { if !showConfOpts.asPeer {
c, err := t.PeerConf(peer).Bytes() c, err := t.PeerConf(peer).Bytes()
if err != nil { if err != nil {
return fmt.Errorf("failed to generate configuration: %v", err) return fmt.Errorf("failed to generate configuration: %v", err)
@ -225,21 +227,20 @@ func runShowConfPeer(_ *cobra.Command, args []string) error {
return err return err
} }
switch output { switch showConfOpts.output {
case outputFormatJSON: case outputFormatJSON:
fallthrough fallthrough
case outputFormatYAML: case outputFormatYAML:
p := translatePeer(t.AsPeer()) p := translatePeer(&peers[peer].Peer)
p.Name = peer p.Name = peer
p.Name = hostname if len(showConfOpts.allowedIPs) != 0 {
if len(aips) != 0 {
p.Spec.AllowedIPs = allowedIPs p.Spec.AllowedIPs = allowedIPs
} }
return serializer.Encode(p, os.Stdout) return showConfOpts.serializer.Encode(p, os.Stdout)
case outputFormatWireGuard: case outputFormatWireGuard:
p := &peers[peer].Peer p := &peers[peer].Peer
if len(aips) != 0 { if len(showConfOpts.allowedIPs) != 0 {
p.AllowedIPs = aips p.AllowedIPs = showConfOpts.allowedIPs
} }
c, err := (&wireguard.Conf{ c, err := (&wireguard.Conf{
Peers: []*wireguard.Peer{p}, Peers: []*wireguard.Peer{p},