1
0
mirror of https://github.com/mainflux/mainflux.git synced 2025-04-27 13:48:49 +08:00
Mainflux.mainflux/mqtt/handler.go

257 lines
7.1 KiB
Go
Raw Normal View History

MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
package mqtt
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
import (
"context"
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
"fmt"
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
"net/url"
"regexp"
"strings"
"time"
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
"github.com/mainflux/mainflux/logger"
"github.com/mainflux/mainflux/mqtt/redis"
"github.com/mainflux/mainflux/pkg/auth"
"github.com/mainflux/mainflux/pkg/errors"
"github.com/mainflux/mainflux/pkg/messaging"
"github.com/mainflux/mproxy/pkg/session"
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
)
var _ session.Handler = (*handler)(nil)
const protocol = "mqtt"
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
const (
LogInfoSubscribed = "subscribed with client_id %s to topics %s"
LogInfoUnsubscribed = "unsubscribed client_id %s from topics %s"
LogInfoConnected = "connected with client_id %s"
LogInfoDisconnected = "disconnected client_id %s and username %s"
LogInfoPublished = "published with client_id %s to the topic %s"
LogErrFailedConnect = "failed to connect: "
LogErrFailedSubscribe = "failed to subscribe: "
LogErrFailedUnsubscribe = "failed to unsubscribe: "
LogErrFailedPublish = "failed to publish: "
LogErrFailedDisconnect = "failed to disconnect: "
LogErrFailedPublishDisconnectEvent = "failed to publish disconnect event: "
logErrFailedParseSubtopic = "failed to parse subtopic: "
LogErrFailedPublishConnectEvent = "failed to publish connect event: "
LogErrFailedPublishToMsgBroker = "failed to publish to mainflux message broker: "
)
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
var (
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
channelRegExp = regexp.MustCompile(`^\/?channels\/([\w\-]+)\/messages(\/[^?]*)?(\?.*)?$`)
ErrMalformedSubtopic = errors.New("malformed subtopic")
ErrClientNotInitialized = errors.New("client is not initialized")
ErrMalformedTopic = errors.New("malformed topic")
ErrMissingClientID = errors.New("client_id not found")
ErrMissingTopicPub = errors.New("failed to publish due to missing topic")
ErrMissingTopicSub = errors.New("failed to subscribe due to missing topic")
ErrAuthentication = errors.New("failed to perform authentication over the entity")
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
)
// Event implements events.Event interface
type handler struct {
NOISSUE - Refactor messaging (#1141) * Refactor messaging Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename SubscribeHandler to MessageHandler Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove `Auth` event logs Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update message pubsub APi Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix topics handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update CoAP adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Twins service Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update LoRa adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update OPC UA adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove broker package Package `broker` is conceptually renamed to package `nats`. Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update makefile Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add comment explanation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix MQTT adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move NATS pub/sub implementation to pubsub pkg Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove an empty line in main methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move messaging-related code to messaging package Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix Twins mocks Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change Occurred back to Created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix tranformer test Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix message proto commands Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Replace string literal with constant Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove alias from main method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change messaging pubsub alias Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename occured to created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Handle NATS connection in the NATS PubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename n to pub/pubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-04-28 11:02:35 +02:00
publishers []messaging.Publisher
auth auth.Client
NOISSUE - Refactor messaging (#1141) * Refactor messaging Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename SubscribeHandler to MessageHandler Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove `Auth` event logs Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update message pubsub APi Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix topics handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update CoAP adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Twins service Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update LoRa adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update OPC UA adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove broker package Package `broker` is conceptually renamed to package `nats`. Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update makefile Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add comment explanation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix MQTT adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move NATS pub/sub implementation to pubsub pkg Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove an empty line in main methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move messaging-related code to messaging package Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix Twins mocks Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change Occurred back to Created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix tranformer test Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix message proto commands Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Replace string literal with constant Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove alias from main method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change messaging pubsub alias Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename occured to created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Handle NATS connection in the NATS PubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename n to pub/pubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-04-28 11:02:35 +02:00
logger logger.Logger
es redis.EventStore
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
}
2020-05-07 09:34:09 +02:00
// NewHandler creates new Handler entity
func NewHandler(publishers []messaging.Publisher, es redis.EventStore,
logger logger.Logger, auth auth.Client) session.Handler {
return &handler{
NOISSUE - Refactor messaging (#1141) * Refactor messaging Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename SubscribeHandler to MessageHandler Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove `Auth` event logs Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update message pubsub APi Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix topics handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update CoAP adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Twins service Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update LoRa adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update OPC UA adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove broker package Package `broker` is conceptually renamed to package `nats`. Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update makefile Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add comment explanation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix MQTT adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move NATS pub/sub implementation to pubsub pkg Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove an empty line in main methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move messaging-related code to messaging package Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix Twins mocks Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change Occurred back to Created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix tranformer test Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix message proto commands Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Replace string literal with constant Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove alias from main method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change messaging pubsub alias Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename occured to created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Handle NATS connection in the NATS PubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename n to pub/pubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-04-28 11:02:35 +02:00
es: es,
logger: logger,
publishers: publishers,
auth: auth,
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
}
}
// AuthConnect is called on device connection,
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
// prior forwarding to the MQTT broker
NOISSUE - Refactor messaging (#1141) * Refactor messaging Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename SubscribeHandler to MessageHandler Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove `Auth` event logs Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update message pubsub APi Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix topics handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update CoAP adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Twins service Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update LoRa adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update OPC UA adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove broker package Package `broker` is conceptually renamed to package `nats`. Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update makefile Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add comment explanation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix MQTT adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move NATS pub/sub implementation to pubsub pkg Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove an empty line in main methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move messaging-related code to messaging package Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix Twins mocks Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change Occurred back to Created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix tranformer test Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix message proto commands Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Replace string literal with constant Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove alias from main method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change messaging pubsub alias Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename occured to created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Handle NATS connection in the NATS PubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename n to pub/pubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-04-28 11:02:35 +02:00
func (h *handler) AuthConnect(c *session.Client) error {
if c == nil {
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
return ErrClientNotInitialized
}
if c.ID == "" {
return ErrMissingClientID
}
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
thid, err := h.auth.Identify(context.Background(), string(c.Password))
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
if err != nil {
return err
}
if thid != c.Username {
MF-1261 - Use StatusUnauthorized for authn and StatusForbidden for authz (#1538) * MF-1261 - Use StatusUnauthorized for authn and StatusForbidden for authz Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * ErrExternalKey typo Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Rename ErrUnauthorizedAcces -> ErrAuthentication Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix bootstrap error Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix status code in openapi Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix test description Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix test description Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix test description Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Add errors cases Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix status codes Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Add gRPC stutus code Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix tests description Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix openapi and encodeError Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix grpc message Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix test descriptions Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Revert sdk error Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix typo Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2022-02-01 17:33:23 +01:00
return errors.ErrAuthentication
}
NOISSUE - Refactor messaging (#1141) * Refactor messaging Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename SubscribeHandler to MessageHandler Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove `Auth` event logs Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update message pubsub APi Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix topics handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update CoAP adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Twins service Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update LoRa adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update OPC UA adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove broker package Package `broker` is conceptually renamed to package `nats`. Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update makefile Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add comment explanation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix MQTT adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move NATS pub/sub implementation to pubsub pkg Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove an empty line in main methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move messaging-related code to messaging package Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix Twins mocks Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change Occurred back to Created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix tranformer test Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix message proto commands Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Replace string literal with constant Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove alias from main method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change messaging pubsub alias Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename occured to created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Handle NATS connection in the NATS PubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename n to pub/pubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-04-28 11:02:35 +02:00
if err := h.es.Connect(c.Username); err != nil {
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
h.logger.Error(LogErrFailedPublishConnectEvent + err.Error())
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
}
return nil
}
// AuthPublish is called on device publish,
// prior forwarding to the MQTT broker
NOISSUE - Refactor messaging (#1141) * Refactor messaging Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename SubscribeHandler to MessageHandler Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove `Auth` event logs Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update message pubsub APi Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix topics handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update CoAP adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Twins service Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update LoRa adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update OPC UA adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove broker package Package `broker` is conceptually renamed to package `nats`. Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update makefile Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add comment explanation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix MQTT adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move NATS pub/sub implementation to pubsub pkg Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove an empty line in main methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move messaging-related code to messaging package Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix Twins mocks Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change Occurred back to Created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix tranformer test Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix message proto commands Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Replace string literal with constant Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove alias from main method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change messaging pubsub alias Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename occured to created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Handle NATS connection in the NATS PubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename n to pub/pubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-04-28 11:02:35 +02:00
func (h *handler) AuthPublish(c *session.Client, topic *string, payload *[]byte) error {
if c == nil {
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
return ErrClientNotInitialized
}
if topic == nil {
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
return ErrMissingTopicPub
}
NOISSUE - Refactor messaging (#1141) * Refactor messaging Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename SubscribeHandler to MessageHandler Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove `Auth` event logs Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update message pubsub APi Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix topics handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update CoAP adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Twins service Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update LoRa adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update OPC UA adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove broker package Package `broker` is conceptually renamed to package `nats`. Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update makefile Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add comment explanation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix MQTT adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move NATS pub/sub implementation to pubsub pkg Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove an empty line in main methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move messaging-related code to messaging package Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix Twins mocks Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change Occurred back to Created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix tranformer test Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix message proto commands Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Replace string literal with constant Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove alias from main method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change messaging pubsub alias Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename occured to created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Handle NATS connection in the NATS PubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename n to pub/pubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-04-28 11:02:35 +02:00
return h.authAccess(c.Username, *topic)
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
}
// AuthSubscribe is called on device publish,
// prior forwarding to the MQTT broker
NOISSUE - Refactor messaging (#1141) * Refactor messaging Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename SubscribeHandler to MessageHandler Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove `Auth` event logs Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update message pubsub APi Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix topics handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update CoAP adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Twins service Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update LoRa adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update OPC UA adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove broker package Package `broker` is conceptually renamed to package `nats`. Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update makefile Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add comment explanation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix MQTT adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move NATS pub/sub implementation to pubsub pkg Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove an empty line in main methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move messaging-related code to messaging package Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix Twins mocks Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change Occurred back to Created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix tranformer test Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix message proto commands Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Replace string literal with constant Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove alias from main method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change messaging pubsub alias Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename occured to created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Handle NATS connection in the NATS PubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename n to pub/pubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-04-28 11:02:35 +02:00
func (h *handler) AuthSubscribe(c *session.Client, topics *[]string) error {
if c == nil {
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
return ErrClientNotInitialized
}
if topics == nil || *topics == nil {
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
return ErrMissingTopicSub
}
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
for _, v := range *topics {
NOISSUE - Refactor messaging (#1141) * Refactor messaging Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename SubscribeHandler to MessageHandler Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove `Auth` event logs Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update message pubsub APi Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix topics handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update CoAP adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Twins service Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update LoRa adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update OPC UA adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove broker package Package `broker` is conceptually renamed to package `nats`. Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update makefile Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add comment explanation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix MQTT adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move NATS pub/sub implementation to pubsub pkg Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove an empty line in main methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move messaging-related code to messaging package Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix Twins mocks Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change Occurred back to Created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix tranformer test Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix message proto commands Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Replace string literal with constant Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove alias from main method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change messaging pubsub alias Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename occured to created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Handle NATS connection in the NATS PubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename n to pub/pubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-04-28 11:02:35 +02:00
if err := h.authAccess(c.Username, v); err != nil {
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
return err
}
}
return nil
}
NOISSUE - Refactor messaging (#1141) * Refactor messaging Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename SubscribeHandler to MessageHandler Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove `Auth` event logs Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update message pubsub APi Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix topics handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update CoAP adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Twins service Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update LoRa adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update OPC UA adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove broker package Package `broker` is conceptually renamed to package `nats`. Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update makefile Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add comment explanation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix MQTT adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move NATS pub/sub implementation to pubsub pkg Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove an empty line in main methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move messaging-related code to messaging package Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix Twins mocks Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change Occurred back to Created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix tranformer test Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix message proto commands Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Replace string literal with constant Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove alias from main method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change messaging pubsub alias Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename occured to created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Handle NATS connection in the NATS PubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename n to pub/pubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-04-28 11:02:35 +02:00
// Connect - after client successfully connected
func (h *handler) Connect(c *session.Client) {
if c == nil {
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
h.logger.Error(LogErrFailedConnect + (ErrClientNotInitialized).Error())
return
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
}
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
h.logger.Info(fmt.Sprintf(LogInfoConnected, c.ID))
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
}
NOISSUE - Refactor messaging (#1141) * Refactor messaging Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename SubscribeHandler to MessageHandler Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove `Auth` event logs Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update message pubsub APi Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix topics handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update CoAP adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Twins service Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update LoRa adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update OPC UA adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove broker package Package `broker` is conceptually renamed to package `nats`. Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update makefile Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add comment explanation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix MQTT adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move NATS pub/sub implementation to pubsub pkg Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove an empty line in main methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move messaging-related code to messaging package Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix Twins mocks Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change Occurred back to Created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix tranformer test Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix message proto commands Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Replace string literal with constant Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove alias from main method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change messaging pubsub alias Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename occured to created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Handle NATS connection in the NATS PubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename n to pub/pubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-04-28 11:02:35 +02:00
// Publish - after client successfully published
func (h *handler) Publish(c *session.Client, topic *string, payload *[]byte) {
if c == nil {
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
h.logger.Error(LogErrFailedPublish + ErrClientNotInitialized.Error())
return
}
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
h.logger.Info(fmt.Sprintf(LogInfoPublished, c.ID, *topic))
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
// Topics are in the format:
// channels/<channel_id>/messages/<subtopic>/.../ct/<content_type>
channelParts := channelRegExp.FindStringSubmatch(*topic)
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
if len(channelParts) < 2 {
h.logger.Error(LogErrFailedPublish + (ErrMalformedTopic).Error())
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
return
}
chanID := channelParts[1]
subtopic := channelParts[2]
subtopic, err := parseSubtopic(subtopic)
if err != nil {
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
h.logger.Error(logErrFailedParseSubtopic + err.Error())
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
return
}
NOISSUE - Refactor messaging (#1141) * Refactor messaging Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename SubscribeHandler to MessageHandler Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove `Auth` event logs Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update message pubsub APi Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix topics handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update CoAP adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Twins service Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update LoRa adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update OPC UA adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove broker package Package `broker` is conceptually renamed to package `nats`. Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update makefile Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add comment explanation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix MQTT adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move NATS pub/sub implementation to pubsub pkg Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove an empty line in main methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move messaging-related code to messaging package Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix Twins mocks Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change Occurred back to Created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix tranformer test Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix message proto commands Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Replace string literal with constant Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove alias from main method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change messaging pubsub alias Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename occured to created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Handle NATS connection in the NATS PubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename n to pub/pubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-04-28 11:02:35 +02:00
msg := messaging.Message{
Protocol: protocol,
Channel: chanID,
Subtopic: subtopic,
Publisher: c.Username,
Payload: *payload,
Created: time.Now().UnixNano(),
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
}
NOISSUE - Refactor messaging (#1141) * Refactor messaging Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename SubscribeHandler to MessageHandler Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove `Auth` event logs Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update message pubsub APi Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix topics handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update CoAP adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Twins service Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update LoRa adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update OPC UA adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove broker package Package `broker` is conceptually renamed to package `nats`. Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update makefile Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add comment explanation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix MQTT adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move NATS pub/sub implementation to pubsub pkg Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove an empty line in main methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move messaging-related code to messaging package Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix Twins mocks Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change Occurred back to Created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix tranformer test Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix message proto commands Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Replace string literal with constant Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove alias from main method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change messaging pubsub alias Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename occured to created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Handle NATS connection in the NATS PubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename n to pub/pubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-04-28 11:02:35 +02:00
for _, pub := range h.publishers {
if err := pub.Publish(msg.Channel, &msg); err != nil {
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
h.logger.Error(LogErrFailedPublishToMsgBroker + err.Error())
NOISSUE - Refactor messaging (#1141) * Refactor messaging Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename SubscribeHandler to MessageHandler Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove `Auth` event logs Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update message pubsub APi Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix topics handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update CoAP adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Twins service Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update LoRa adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update OPC UA adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove broker package Package `broker` is conceptually renamed to package `nats`. Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update makefile Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add comment explanation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix MQTT adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move NATS pub/sub implementation to pubsub pkg Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove an empty line in main methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move messaging-related code to messaging package Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix Twins mocks Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change Occurred back to Created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix tranformer test Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix message proto commands Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Replace string literal with constant Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove alias from main method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change messaging pubsub alias Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename occured to created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Handle NATS connection in the NATS PubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename n to pub/pubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-04-28 11:02:35 +02:00
}
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
}
}
NOISSUE - Refactor messaging (#1141) * Refactor messaging Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename SubscribeHandler to MessageHandler Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove `Auth` event logs Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update message pubsub APi Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix topics handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update CoAP adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Twins service Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update LoRa adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update OPC UA adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove broker package Package `broker` is conceptually renamed to package `nats`. Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update makefile Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add comment explanation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix MQTT adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move NATS pub/sub implementation to pubsub pkg Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove an empty line in main methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move messaging-related code to messaging package Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix Twins mocks Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change Occurred back to Created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix tranformer test Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix message proto commands Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Replace string literal with constant Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove alias from main method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change messaging pubsub alias Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename occured to created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Handle NATS connection in the NATS PubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename n to pub/pubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-04-28 11:02:35 +02:00
// Subscribe - after client successfully subscribed
func (h *handler) Subscribe(c *session.Client, topics *[]string) {
if c == nil {
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
h.logger.Error(LogErrFailedSubscribe + (ErrClientNotInitialized).Error())
return
}
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
h.logger.Info(fmt.Sprintf(LogInfoSubscribed, c.ID, strings.Join(*topics, ",")))
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
}
// Unsubscribe - after client unsubscribed
NOISSUE - Refactor messaging (#1141) * Refactor messaging Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename SubscribeHandler to MessageHandler Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove `Auth` event logs Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update message pubsub APi Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix topics handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update CoAP adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Twins service Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update LoRa adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update OPC UA adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove broker package Package `broker` is conceptually renamed to package `nats`. Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update makefile Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add comment explanation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix MQTT adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move NATS pub/sub implementation to pubsub pkg Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove an empty line in main methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move messaging-related code to messaging package Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix Twins mocks Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change Occurred back to Created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix tranformer test Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix message proto commands Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Replace string literal with constant Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove alias from main method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change messaging pubsub alias Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename occured to created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Handle NATS connection in the NATS PubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename n to pub/pubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-04-28 11:02:35 +02:00
func (h *handler) Unsubscribe(c *session.Client, topics *[]string) {
if c == nil {
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
h.logger.Error(LogErrFailedUnsubscribe + (ErrClientNotInitialized).Error())
return
}
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
h.logger.Info(fmt.Sprintf(LogInfoUnsubscribed, c.ID, strings.Join(*topics, ",")))
}
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
// Disconnect - connection with broker or client lost
NOISSUE - Refactor messaging (#1141) * Refactor messaging Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename SubscribeHandler to MessageHandler Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove `Auth` event logs Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update message pubsub APi Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix topics handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update CoAP adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Twins service Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update LoRa adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update OPC UA adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove broker package Package `broker` is conceptually renamed to package `nats`. Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update makefile Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add comment explanation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix MQTT adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move NATS pub/sub implementation to pubsub pkg Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove an empty line in main methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move messaging-related code to messaging package Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix Twins mocks Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change Occurred back to Created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix tranformer test Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix message proto commands Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Replace string literal with constant Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove alias from main method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change messaging pubsub alias Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename occured to created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Handle NATS connection in the NATS PubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename n to pub/pubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-04-28 11:02:35 +02:00
func (h *handler) Disconnect(c *session.Client) {
if c == nil {
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
h.logger.Error(LogErrFailedDisconnect + (ErrClientNotInitialized).Error())
return
}
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
h.logger.Error(fmt.Sprintf(LogInfoDisconnected, c.ID, c.Username))
NOISSUE - Refactor messaging (#1141) * Refactor messaging Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename SubscribeHandler to MessageHandler Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove `Auth` event logs Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update message pubsub APi Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix topics handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update CoAP adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Twins service Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update LoRa adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update OPC UA adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove broker package Package `broker` is conceptually renamed to package `nats`. Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update makefile Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add comment explanation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix MQTT adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move NATS pub/sub implementation to pubsub pkg Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove an empty line in main methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move messaging-related code to messaging package Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix Twins mocks Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change Occurred back to Created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix tranformer test Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix message proto commands Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Replace string literal with constant Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove alias from main method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change messaging pubsub alias Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename occured to created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Handle NATS connection in the NATS PubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename n to pub/pubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-04-28 11:02:35 +02:00
if err := h.es.Disconnect(c.Username); err != nil {
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
h.logger.Error(LogErrFailedPublishDisconnectEvent + err.Error())
}
MF-415 - Merge mProxy support (#1045) * NOISSUE - Add mProxy support (#1017) * Add mproxy Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix docker and add EMQ compose Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Fix EMQX name Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Add nats, auth and es Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> * Removed unucessary vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Update vendoring Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> * Fix mproxy interface implementation Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com> NOISSUE - Aligned Event interface method signatures with new spec (#1025) * Aligned Event interface method signatures with new spec Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Updated deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> NOISSUE - Update mproxy dependency (#1038) Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update Vendor with new mProxy (#1043) Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins merge conflict reverted Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Twins fixed nats import Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Update deps Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> Resolved GolangCI remarks Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Fixed Event interface Unsubscribe() typo Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com> * Update vendors Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Upgrade CI script Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Co-authored-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-02-26 17:14:16 +01:00
}
NOISSUE - Refactor messaging (#1141) * Refactor messaging Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename SubscribeHandler to MessageHandler Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove `Auth` event logs Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update message pubsub APi Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix topics handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update CoAP adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Twins service Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update LoRa adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update OPC UA adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove broker package Package `broker` is conceptually renamed to package `nats`. Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update makefile Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add comment explanation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix MQTT adapter Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move NATS pub/sub implementation to pubsub pkg Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove an empty line in main methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Move messaging-related code to messaging package Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix Twins mocks Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change Occurred back to Created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix tranformer test Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix message proto commands Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Replace string literal with constant Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove alias from main method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Change messaging pubsub alias Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename occured to created Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Handle NATS connection in the NATS PubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Rename n to pub/pubSub Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2020-04-28 11:02:35 +02:00
func (h *handler) authAccess(username string, topic string) error {
// Topics are in the format:
// channels/<channel_id>/messages/<subtopic>/.../ct/<content_type>
if !channelRegExp.Match([]byte(topic)) {
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
return ErrMalformedTopic
}
channelParts := channelRegExp.FindStringSubmatch(topic)
if len(channelParts) < 1 {
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
return ErrMalformedTopic
}
chanID := channelParts[1]
return h.auth.Authorize(context.Background(), chanID, username)
}
func parseSubtopic(subtopic string) (string, error) {
if subtopic == "" {
return subtopic, nil
}
subtopic, err := url.QueryUnescape(subtopic)
if err != nil {
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
return "", ErrMalformedSubtopic
}
subtopic = strings.Replace(subtopic, "/", ".", -1)
elems := strings.Split(subtopic, ".")
filteredElems := []string{}
for _, elem := range elems {
if elem == "" {
continue
}
if len(elem) > 1 && (strings.Contains(elem, "*") || strings.Contains(elem, ">")) {
MF-1197 - Add MQTT adapter tests (#1622) * MF-1197 - add mqtt tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - add test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test names.Add const Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add mocks. Add publish test Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add buffer to logger Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add redis mock.Change logger error Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test cases Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix session fields Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix bad logs. Fix tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add new test case.Fix names. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix test name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactoring tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Fix logs level Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Wrap errors. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix var names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-888 - Add clientID err check.Refactor tests Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Fix info and err names Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove redundant log and channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Revert channel parts check Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add authorize test case Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add missing test case.Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Add err case. Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 -Change var name Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logMsg for all logs Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use logs instead of errors Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use redis mock Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Return interface in constructor Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add missing test cases. Create consts Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Add global vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor code Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unused var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Remove unnecessary var Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Use created session client Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Refactor vars Signed-off-by: zzokki81 <zoran.rebic@outlook.com> * MF-1197 - Separate constant Signed-off-by: zzokki81 <zoran.rebic@outlook.com> Signed-off-by: zzokki81 <zoran.rebic@outlook.com>
2022-11-21 14:40:19 +01:00
return "", ErrMalformedSubtopic
}
filteredElems = append(filteredElems, elem)
}
subtopic = strings.Join(filteredElems, ".")
return subtopic, nil
}