stellarproject/heimdall
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

TLS fixes

Browse source 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2019-10-08 02:06:48 -04:00
parent 512655fdb0
commit 6edfb4d93f
No known key found for this signature in database
GPG key ID: A519480096146526
8 changed files with 101 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

24
cmd/heimdall/main.go
View file

@ -113,6 +113,30 @@ func main() {
Value: "darknet",
EnvVar: "HEIMDALL_INTERFACE_NAME",
},
cli.StringFlag{
Name: "cert, c",
Usage: "heimdall server certificate",
Value: "",
},
cli.StringFlag{
Name: "key, k",
Usage: "heimdall server key",
Value: "",
},
cli.StringFlag{
Name: "client-cert",
Usage: "heimdall client certificate",
Value: "",
},
cli.StringFlag{
Name: "client-key",
Usage: "heimdall client key",
Value: "",
},
cli.BoolFlag{
Name: "skip-verify",
Usage: "skip TLS verification",
},
}
app.Before = func(c *cli.Context) error {
if c.Bool("debug") {

27
cmd/heimdall/run.go
View file

@ -41,17 +41,22 @@ import (
func runServer(cx *cli.Context) error {
cfg := &heimdall.Config{
ID: cx.String("id"),
GRPCAddress: cx.String("addr"),
AdvertiseGRPCAddress: cx.String("advertise-grpc-address"),
GRPCPeerAddress: cx.String("peer"),
ClusterKey: cx.String("cluster-key"),
NodeNetwork: cx.String("node-network"),
PeerNetwork: cx.String("peer-network"),
EndpointIP: cx.String("endpoint-ip"),
EndpointPort: cx.Int("endpoint-port"),
InterfaceName: cx.String("interface-name"),
RedisURL: cx.String("redis-url"),
ID: cx.String("id"),
GRPCAddress: cx.String("addr"),
AdvertiseGRPCAddress: cx.String("advertise-grpc-address"),
GRPCPeerAddress: cx.String("peer"),
ClusterKey: cx.String("cluster-key"),
NodeNetwork: cx.String("node-network"),
PeerNetwork: cx.String("peer-network"),
EndpointIP: cx.String("endpoint-ip"),
EndpointPort: cx.Int("endpoint-port"),
InterfaceName: cx.String("interface-name"),
RedisURL: cx.String("redis-url"),
TLSServerCertificate: cx.String("cert"),
TLSServerKey: cx.String("key"),
TLSClientCertificate: cx.String("client-cert"),
TLSClientKey: cx.String("client-key"),
TLSInsecureSkipVerify: cx.Bool("skip-verify"),
}
errCh := make(chan error, 1)

11
cmd/hpeer/run.go
View file

@ -35,10 +35,13 @@ import (
func run(cx *cli.Context) error {
cfg := &heimdall.PeerConfig{
ID: cx.String("id"),
Address: cx.String("addr"),
UpdateInterval: cx.Duration("update-interval"),
InterfaceName: cx.String("interface-name"),
ID: cx.String("id"),
Address: cx.String("addr"),
UpdateInterval: cx.Duration("update-interval"),
InterfaceName: cx.String("interface-name"),
TLSClientCertificate: cx.String("cert"),
TLSClientKey: cx.String("key"),
TLSInsecureSkipVerify: cx.Bool("skip-verify"),
}
p, err := peer.NewPeer(cfg)
if err != nil {