Skip to content

NOISSUE - add certify #1

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

Open
mteodor wants to merge 1 commit into
base: master
Choose a base branch
from
Open

NOISSUE - add certify #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
74 changes: 62 additions & 12 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
package main

import (
"crypto"
"crypto/rand"
"crypto/rsa"
"crypto/tls"
"crypto/x509"
"fmt"
"io/ioutil"
"log"
"net/http"
"net/url"
"os"
"os/signal"
"syscall"
"time"

mqtt "github.com/eclipse/paho.mqtt.golang"
kitprometheus "github.com/go-kit/kit/metrics/prometheus"
"github.com/johanbrandhorst/certify"
"github.com/johanbrandhorst/certify/issuers/vault"
"github.com/mainflux/agent/pkg/agent"
"github.com/mainflux/agent/pkg/agent/api"
"github.com/mainflux/agent/pkg/bootstrap"
Expand Down Expand Up @@ -176,10 +183,12 @@ func loadEnvConfig() (config.Config, error) {
}
file := mainflux.Env(envConfigFile, defConfigFile)
c := config.New(sc, cc, ec, lc, mc, file)
mc, err := loadCertificate(c.Agent.MQTT)
if err != nil {
return c, errors.Wrap(errFailedToSetupMTLS, err.Error())
}
c.Agent.MQTT.MTLS = true
c.Agent.MQTT.CAPath = "ca.crt"
mc, _ = loadCertificate(c.Agent.MQTT)
// if err != nil {
// return c, errors.Wrap(errFailedToSetupMTLS, err.Error())
// }
c.Agent.MQTT = mc
return c, nil
}
Expand All @@ -203,15 +212,24 @@ func loadBootConfig(c config.Config, logger logger.Logger) (bsc config.Config, e
return c, errors.Wrap(errFailedToReadConfig, err.Error())
}

mc, err := loadCertificate(bsc.Agent.MQTT)
if err != nil {
return bsc, errors.Wrap(errFailedToSetupMTLS, err.Error())
}
bsc.Agent.MQTT.MTLS = true
bsc.Agent.MQTT.CAPath = "ca.crt"
mc, _ := loadCertificate(bsc.Agent.MQTT)
// if err != nil {
// return bsc, errors.Wrap(errFailedToSetupMTLS, err.Error())
// }

bsc.Agent.MQTT = mc

return bsc, nil
}

type keyGeneratorFunc func() (crypto.PrivateKey, error)

func (kgf keyGeneratorFunc) Generate() (crypto.PrivateKey, error) {
return kgf()
}

func connectToMQTTBroker(conf config.MQTTConf, logger logger.Logger) (mqtt.Client, error) {
name := fmt.Sprintf("agent-%s", conf.Username)
conn := func(client mqtt.Client) {
Expand All @@ -223,7 +241,7 @@ func connectToMQTTBroker(conf config.MQTTConf, logger logger.Logger) (mqtt.Clien
}

opts := mqtt.NewClientOptions().
AddBroker(conf.URL).
AddBroker("tcps://localhost:8883").
SetClientID(name).
SetCleanSession(true).
SetAutoReconnect(true).
Expand All @@ -235,9 +253,41 @@ func connectToMQTTBroker(conf config.MQTTConf, logger logger.Logger) (mqtt.Clien
opts.SetPassword(conf.Password)
}

// certConf := &certify.CertConfig{
// KeyGenerator: keyGeneratorFunc(func() (crypto.PrivateKey, error) {
// return ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
// }),
// }

iss := &vault.Issuer{
Copy link

@drasko drasko Jun 19, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is vault on the GW becoming mandatory, or it can still be optional?

URL: &url.URL{
Scheme: "http",
Host: "127.0.0.1:8200",
},
Role: "agent",
TimeToLive: time.Minute * 10,
Token: "s.nArgw6xn3uIOfA7nfKk8LFaW",
}

certConf := &certify.CertConfig{
KeyGenerator: keyGeneratorFunc(func() (crypto.PrivateKey, error) {
key, _ := rsa.GenerateKey(rand.Reader, 2048)
return key, nil
}),
}

certify := &certify.Certify{
CommonName: conf.Password,
Issuer: iss,
Cache: certify.NewMemCache(),
RenewBefore: 24 * time.Hour,
CertConfig: certConf,
}

if conf.MTLS {
cfg := &tls.Config{
InsecureSkipVerify: conf.SkipTLSVer,
InsecureSkipVerify: conf.SkipTLSVer,
GetClientCertificate: certify.GetClientCertificate,
}

if conf.CA != nil {
Expand Down Expand Up @@ -278,6 +328,7 @@ func loadCertificate(cfg config.MQTTConf) (config.MQTTConf, error) {
if err != nil {
return c, err
}
c.CA = caByte
clientCert, err := os.Open(cfg.CertPath)
defer clientCert.Close()
if err != nil {
Expand All @@ -294,7 +345,6 @@ func loadCertificate(cfg config.MQTTConf) (config.MQTTConf, error) {
if err != nil {
return c, err
}
cfg.Cert = cert
cfg.CA = caByte
c.Cert = cert
return c, nil
}
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ require (
github.com/edgexfoundry/go-mod-core-contracts v0.1.48
github.com/go-kit/kit v0.9.0
github.com/go-zoo/bone v1.3.0
github.com/johanbrandhorst/certify v1.8.0
github.com/mainflux/export v0.0.0-20200323141637-120ec7179230
github.com/mainflux/mainflux v0.0.0-20200212173448-51cd0524a11e
github.com/mainflux/senml v1.0.0
Expand Down
Loading