Skip to content
This repository has been archived by the owner on Nov 26, 2020. It is now read-only.

Commit

Permalink
code formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@farshidtz
farshidtz committed Jan 21, 2020
1 parent c10aed9 commit 7f400cc
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 61 deletions.
52 changes: 26 additions & 26 deletions agent/zeromq_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,35 +44,35 @@ func startZMQClient(conf *zeromqServerConf, clientPublic string, pipe model.Pipe
// load keys
var clientSecret, serverPublic string

zmq.AuthSetVerbose(true)
clientSecret, err = zeromq.ReadKeyFile(os.Getenv(EnvPrivateKey), DefaultPrivateKeyPath)
if err != nil {
return nil, fmt.Errorf("error reading file: %s", err)
}
// decode
clientSecret, err = zeromq.DecodeKey(clientSecret)
if err != nil {
return nil, fmt.Errorf("error decoding key: %s", err)
}
clientPublic, err = zeromq.DecodeKey(clientPublic)
if err != nil {
return nil, fmt.Errorf("error decoding key: %s", err)
}
serverPublic, err = zeromq.DecodeKey(conf.PublicKey)
if err != nil {
return nil, fmt.Errorf("error decoding key: %s", err)
}
zmq.AuthSetVerbose(true)
clientSecret, err = zeromq.ReadKeyFile(os.Getenv(EnvPrivateKey), DefaultPrivateKeyPath)
if err != nil {
return nil, fmt.Errorf("error reading file: %s", err)
}
// decode
clientSecret, err = zeromq.DecodeKey(clientSecret)
if err != nil {
return nil, fmt.Errorf("error decoding key: %s", err)
}
clientPublic, err = zeromq.DecodeKey(clientPublic)
if err != nil {
return nil, fmt.Errorf("error decoding key: %s", err)
}
serverPublic, err = zeromq.DecodeKey(conf.PublicKey)
if err != nil {
return nil, fmt.Errorf("error decoding key: %s", err)
}

// socket to receive from server
c.subscriber, err = zmq.NewSocket(zmq.SUB)
if err != nil {
return nil, fmt.Errorf("error creating SUB socket: %s", err)
}

err = c.subscriber.ClientAuthCurve(serverPublic, clientPublic, clientSecret)
if err != nil {
return nil, fmt.Errorf("error adding auth keys to SUB socket: %s", err)
}
err = c.subscriber.ClientAuthCurve(serverPublic, clientPublic, clientSecret)
if err != nil {
return nil, fmt.Errorf("error adding auth keys to SUB socket: %s", err)
}

err = c.subscriber.SetReconnectIvlMax(MaxReconnectInterval)
if err != nil {
Expand All @@ -88,10 +88,10 @@ func startZMQClient(conf *zeromqServerConf, clientPublic string, pipe model.Pipe
return nil, fmt.Errorf("error creating PUB socket: %s", err)
}

err = c.publisher.ClientAuthCurve(serverPublic, clientPublic, clientSecret)
if err != nil {
return nil, fmt.Errorf("error adding auth keys to PUB socket: %s", err)
}
err = c.publisher.ClientAuthCurve(serverPublic, clientPublic, clientSecret)
if err != nil {
return nil, fmt.Errorf("error adding auth keys to PUB socket: %s", err)
}

err = c.publisher.SetReconnectIvlMax(MaxReconnectInterval)
if err != nil {
Expand Down
68 changes: 33 additions & 35 deletions manager/zeromq/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
)

const (
EnvPrivateKey = "PRIVATE_KEY"
EnvPublicKey = "PUBLIC_KEY"
EnvPrivateKey = "PRIVATE_KEY"
EnvPublicKey = "PUBLIC_KEY"

DefaultPrivateKeyPath = "./manager.key"
DefaultPublicKeyPath = "./manager.pub"
Expand All @@ -22,18 +22,18 @@ const (
type zmqClient struct {
publisher *zmq.Socket
subscriber *zmq.Socket
conf model.ZeromqServerInfo
conf model.ZeromqServerInfo

Pipe model.Pipe
Pipe model.Pipe
}

func SetupServer(pubPort, subPort string, keys map[string]string) (*zmqClient, error) {
log.Printf("zeromq: Using v%v", strings.Replace(fmt.Sprint(zmq.Version()), " ", ".", -1))

c := &zmqClient{
conf: model.ZeromqServerInfo{
PubPort: os.Getenv(pubPort),
SubPort: os.Getenv(subPort),
PubPort: os.Getenv(pubPort),
SubPort: os.Getenv(subPort),
},
Pipe: model.NewPipe(),
}
Expand All @@ -45,28 +45,27 @@ func SetupServer(pubPort, subPort string, keys map[string]string) (*zmqClient, e
var err error
var serverSecret string

// Start authentication engine
zmq.AuthSetVerbose(true)
err = zmq.AuthStart()
if err != nil {
return nil, fmt.Errorf("error starting auth: %s", err)
}

// load key pair
serverSecret, err = ReadKeyFile(os.Getenv(EnvPrivateKey), DefaultPrivateKeyPath)
if err != nil {
return nil, fmt.Errorf("error reading private key file: %s", err)
}
serverSecret, err = DecodeKey(serverSecret)
if err != nil {
return nil, fmt.Errorf("error decoding key: %s", err)
}
// Start authentication engine
zmq.AuthSetVerbose(true)
err = zmq.AuthStart()
if err != nil {
return nil, fmt.Errorf("error starting auth: %s", err)
}

c.conf.PublicKey, err = ReadKeyFile(os.Getenv(EnvPublicKey), DefaultPublicKeyPath)
if err != nil {
return nil, fmt.Errorf("error reading public key file: %s", err)
}
// load key pair
serverSecret, err = ReadKeyFile(os.Getenv(EnvPrivateKey), DefaultPrivateKeyPath)
if err != nil {
return nil, fmt.Errorf("error reading private key file: %s", err)
}
serverSecret, err = DecodeKey(serverSecret)
if err != nil {
return nil, fmt.Errorf("error decoding key: %s", err)
}

c.conf.PublicKey, err = ReadKeyFile(os.Getenv(EnvPublicKey), DefaultPublicKeyPath)
if err != nil {
return nil, fmt.Errorf("error reading public key file: %s", err)
}

// add client keys
err = c.addKeys(keys)
Expand All @@ -81,10 +80,10 @@ func SetupServer(pubPort, subPort string, keys map[string]string) (*zmqClient, e
return nil, fmt.Errorf("error creating PUB socket: %s", err)
}

err = c.publisher.ServerAuthCurve(DomainAll, serverSecret)
if err != nil {
return nil, fmt.Errorf("error adding server key to PUB socket: %s", err)
}
err = c.publisher.ServerAuthCurve(DomainAll, serverSecret)
if err != nil {
return nil, fmt.Errorf("error adding server key to PUB socket: %s", err)
}

err = c.publisher.Bind(pubEndpoint)
if err != nil {
Expand All @@ -97,17 +96,16 @@ func SetupServer(pubPort, subPort string, keys map[string]string) (*zmqClient, e
return nil, fmt.Errorf("error creating SUB socket: %s", err)
}

err = c.subscriber.ServerAuthCurve(DomainAll, serverSecret)
if err != nil {
return nil, fmt.Errorf("error adding server key to SUB socket: %s", err)
}
err = c.subscriber.ServerAuthCurve(DomainAll, serverSecret)
if err != nil {
return nil, fmt.Errorf("error adding server key to SUB socket: %s", err)
}

err = c.subscriber.Bind(subEndpoint)
if err != nil {
return nil, fmt.Errorf("error connecting to SUB endpoint: %s", err)
}


return c, nil
}

Expand Down

0 comments on commit 7f400cc

Please sign in to comment.