Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
K
konnektbox-edgex-go
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ELASTIC-H2020
ELASTIC-SA
Fog-Platform
konnektbox-edgex-go
Commits
ab3e7d35
Commit
ab3e7d35
authored
Jul 10, 2019
by
Marco Gonzalez Hierro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added support for CA certs and changed default location of certs to /cert/cert.*
parent
1c2449f7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
5 deletions
+26
-5
cmd/export-distro/res/configuration.toml
cmd/export-distro/res/configuration.toml
+2
-2
internal/export/distro/mqtt.go
internal/export/distro/mqtt.go
+15
-3
make-konnekt-docker.sh
make-konnekt-docker.sh
+9
-0
No files found.
cmd/export-distro/res/configuration.toml
View file @
ab3e7d35
...
...
@@ -40,8 +40,8 @@ File = './logs/edgex-export-distro.log'
[Certificates]
[Certificates.MQTTS]
Cert
=
'
dummy
.crt'
Key
=
'
dummy
.key'
Cert
=
'
/certs/export
.crt'
Key
=
'
/certs/export
.key'
[Certificates.AWS]
Cert
=
'dummy.crt'
...
...
internal/export/distro/mqtt.go
View file @
ab3e7d35
...
...
@@ -15,6 +15,8 @@ import (
"fmt"
"strconv"
"strings"
"io/ioutil"
"crypto/x509"
MQTT
"github.com/eclipse/paho.mqtt.golang"
contract
"github.com/edgexfoundry/go-mod-core-contracts/models"
...
...
@@ -41,12 +43,22 @@ func newMqttSender(addr contract.Addressable, cert string, key string) sender {
cert
,
err
:=
tls
.
LoadX509KeyPair
(
cert
,
key
)
if
err
!=
nil
{
LoggingClient
.
Error
(
"Failed loading x509 data"
)
LoggingClient
.
Error
(
fmt
.
Sprintf
(
"Failed loading x509 data: %v"
,
err
)
)
return
nil
}
tlsConfig
:=
&
tls
.
Config
{
ClientCAs
:
nil
,
// Add support for custom CA
certpool
:=
x509
.
NewCertPool
()
pem
,
err
:=
ioutil
.
ReadFile
(
"/certs/ca.pem"
)
if
err
!=
nil
{
LoggingClient
.
Error
(
fmt
.
Sprintf
(
"Failed to read client certificate authority: %v"
,
err
))
}
if
!
certpool
.
AppendCertsFromPEM
(
pem
)
{
LoggingClient
.
Error
(
"Can't parse client certificate authority"
)
}
tlsConfig
:=
&
tls
.
Config
{
ClientCAs
:
certpool
,
InsecureSkipVerify
:
true
,
Certificates
:
[]
tls
.
Certificate
{
cert
},
}
...
...
make-konnekt-docker.sh
0 → 100755
View file @
ab3e7d35
#!/bin/sh
docker build
\
-f
cmd/export-distro/Dockerfile
\
--label
"git_sha=1c2449f73fa961aa7634dfaed45422a7c979d68e"
\
-t
edgexfoundry/docker-export-distro-go:1c2449f73fa961aa7634dfaed45422a7c979d68e
\
-t
edgexfoundry/docker-export-distro-go:1.0.0-dev
\
-t
registry.bda.ikerlan.es/konnektbox/docker-export-distro-go:1.0.0
\
.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment