Skip to content
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.

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

MPX-24 - Support proxy CoAP #43

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
87 changes: 87 additions & 0 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ import (

mflog "github.com/mainflux/mainflux/logger"
"github.com/mainflux/mproxy/examples/simple"
"github.com/mainflux/mproxy/pkg/coap"
hproxy "github.com/mainflux/mproxy/pkg/http"
"github.com/mainflux/mproxy/pkg/mqtt"
"github.com/mainflux/mproxy/pkg/mqtt/websocket"
"github.com/mainflux/mproxy/pkg/session"
mptls "github.com/mainflux/mproxy/pkg/tls"
"github.com/mainflux/mproxy/pkg/websockets"
"github.com/pion/dtls/v2"
)

const (
Expand Down Expand Up @@ -92,6 +94,17 @@ const (
defHTTPTargetPort = "8081"
defHTTPServerCert = ""
defHTTPServerKey = ""
envCoAPHost = "MPROXY_COAP_HOST"
envCoAPPort = "MPROXY_COAP_PORT"
envCoAPTargetHost = "MPROXY_COAP_TARGET_HOST"
envCoAPTargetPort = "MPROXY_COAP_TARGET_PORT"
envCoAPDTLS = "MPROXY_COAP_DTLS"

defCoAPHost = ""
defCoAPPort = "5683"
defCoAPTargetPort = "5684"
defCoAPTargetHost = ""
defCoAPDTLS = "false"
)

type config struct {
Expand All @@ -104,10 +117,19 @@ type config struct {
mqttConfig MQTTConfig
wsMQTTConfig WSMQTTConfig
wsConfig WSConfig
coapConfig CoapConfig

logLevel string
}

type CoapConfig struct {
host string
port string
DTLS bool
targetHost string
targetPort string
}

type WSConfig struct {
host string
port string
Expand Down Expand Up @@ -192,6 +214,27 @@ func main() {
go proxyHTTP(ctx, cfg.httpConfig, logger, h, errs)
}

switch {
case cfg.coapConfig.DTLS:
tlsCfg, err := mptls.LoadTLSCfg(cfg.caCerts, cfg.serverCert, cfg.serverKey)
if err != nil {
errs <- err
}
dtlsCfg := &dtls.Config{
Certificates: tlsCfg.Certificates,
ClientCAs: tlsCfg.ClientCAs,
}
go proxyCoapDTLS(cfg.coapConfig, dtlsCfg, logger, h, errs)
case cfg.clientTLS:
tlsCfg, err := mptls.LoadTLSCfg(cfg.caCerts, cfg.serverCert, cfg.serverKey)
if err != nil {
errs <- err
}
go proxyCoapTLS(cfg.coapConfig, tlsCfg, logger, h, errs)
default:
go proxyCoap(cfg.coapConfig, logger, h, errs)
}

go func() {
c := make(chan os.Signal, 2)
signal.Notify(c, syscall.SIGINT)
Expand All @@ -215,6 +258,10 @@ func loadConfig() config {
if err != nil {
log.Fatalf("Invalid value passed for %s\n", envClientTLS)
}
dtls, err := strconv.ParseBool(env(envCoAPDTLS, defCoAPDTLS))
if err != nil {
log.Fatalf("Invalid value passed for %s\n", envCoAPDTLS)
}

return config{
// WS
Expand Down Expand Up @@ -260,6 +307,14 @@ func loadConfig() config {
targetHost: env(envWSTargetHost, defWSTargetHost),
targetPort: env(envWSTargetPort, defWSTargetPort),
},
// CoAP
coapConfig: CoapConfig{
host: env(envCoAPHost, defCoAPHost),
port: env(envCoAPPort, defCoAPPort),
DTLS: dtls,
targetHost: env(envCoAPTargetHost, defCoAPTargetHost),
targetPort: env(envCoAPTargetPort, defCoAPTargetPort),
},

// Log
logLevel: env(envLogLevel, defLogLevel),
Expand Down Expand Up @@ -340,3 +395,35 @@ func proxyWSS(ctx context.Context, cfg config, logger mflog.Logger, handler sess
}
errs <- wp.ListenTLS(cfg.serverCert, cfg.serverKey)
}
func proxyCoapTLS(cfg CoapConfig, tlsCfg *tls.Config, logger mflog.Logger, handler session.Handler, errs chan error) {
address := fmt.Sprintf("%s:%s", cfg.host, cfg.port)
target := fmt.Sprintf("%s:%s", cfg.targetHost, cfg.targetPort)
cp, err := coap.NewProxy(address, target, logger, handler)
if err != nil {
errs <- err
}

errs <- cp.ListenTLS(tlsCfg)
}

func proxyCoapDTLS(cfg CoapConfig, dtlsCfg *dtls.Config, logger mflog.Logger, handler session.Handler, errs chan error) {
address := fmt.Sprintf("%s:%s", cfg.host, cfg.port)
target := fmt.Sprintf("%s:%s", cfg.targetHost, cfg.targetPort)
cp, err := coap.NewProxy(address, target, logger, handler)
if err != nil {
errs <- err
}

errs <- cp.ListenDLS(dtlsCfg)
}

func proxyCoap(cfg CoapConfig, logger mflog.Logger, handler session.Handler, errs chan error) {
address := fmt.Sprintf("%s:%s", cfg.host, cfg.port)
target := fmt.Sprintf("%s:%s", cfg.targetHost, cfg.targetPort)
cp, err := coap.NewProxy(address, target, logger, handler)
if err != nil {
errs <- err
}

errs <- cp.Listen()
}
16 changes: 15 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,26 @@ require (
github.com/google/uuid v1.3.0
github.com/gorilla/websocket v1.5.0
github.com/mainflux/mainflux v0.12.0
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
github.com/pion/dtls/v2 v2.2.8-0.20230905141523-2b584af66577
golang.org/x/sync v0.3.0
)

require (
github.com/dsnet/golib/memfile v1.0.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/pion/logging v0.2.2 // indirect
github.com/pion/transport/v3 v3.0.1 // indirect
go.uber.org/atomic v1.11.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/sys v0.13.0 // indirect
)

require (
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-kit/log v0.2.0 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/plgd-dev/go-coap/v3 v3.1.5
golang.org/x/net v0.17.0 // indirect
)
Loading