mirror of
https://github.com/mainflux/mainflux.git
synced 2025-04-29 13:49:28 +08:00

* Move Things and Users to Clients Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Update Add and Delete Policies (#1792) * Remove Policy Action Ranks Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Rebase Issues Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix CI Test Errors Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Adding Check on Subject For Clients Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Remove Check Client Exists Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Check When Sharing Clients Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Only Add User to Group When Sharing Things Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Remove clientType Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Minor Fix on ShareClient and Fix Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Policies Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Clean Up Things Authorization Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Tests on RetrieveAll Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Test ShareThing Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Merge Conflicts Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Remove Adding Policies. Only Use Ownership Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Check If Subject is same as Object Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Move Back To Union As Sometimes Policy is Empty and Fails to Evaluate on Ownership Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Entity Type For Failing Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix BUG in policy evaluation Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Comments Regarding checkAdmin Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Tests On Rebase Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Combine Authorize For Things and Users Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Tests On Rebase Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Error on Things SVC `unsupported protocol scheme` Signed-off-by: rodneyosodo <blackd0t@protonmail.com> --------- Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Fix Bug on Things Authorization Cache (#1810) Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Use Password instead of username in MQTT handler Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Simplify MQTT authorization Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Fix MQTT tests Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Add More Functions to SDK (#1811) * Add More Functions to SDK Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Examples to GoDoc Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Update Unassign Interface Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Pass Subject as ID and Not Token on List Channels By Thing Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Bootstrap Errors For Element Check Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add empty line Before Return Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Reorder URLS in things mux Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Listing Things Policies Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Share Thing Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Examples to CLI Docs Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Update Identity To Update Another User Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Identify an Update Policies on Things Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Update Things Policies Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix GoDocs on Disconnect Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Change Authorize To Use AccessRequest Signed-off-by: rodneyosodo <blackd0t@protonmail.com> --------- Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * For Evaluate Policy Use AccessRequest (#1814) Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Add SDK Tests (#1812) * Add Things Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Channel Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Certs Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Consumer Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Enrich Group Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Tests For Health Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Tests For Tokens Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Rename SDK for Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Policies Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Linter Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Make Variable Defination Inline Signed-off-by: rodneyosodo <blackd0t@protonmail.com> --------- Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Make Cache Key Duration Configurable (#1815) * Make Cache Key Duration Configurable Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Rename ENV Var Signed-off-by: rodneyosodo <blackd0t@protonmail.com> --------- Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Update GoDocs (#1816) * Add GoDocs Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Missing GoDoc Files Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Enable godot Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add License Information Signed-off-by: rodneyosodo <blackd0t@protonmail.com> --------- Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Add Call Home Client to Mainflux services (#1751) * Move Things and Users to Clients Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: SammyOina <sammyoina@gmail.com> * collect and send data package Signed-off-by: SammyOina <sammyoina@gmail.com> * create telemetry migrations Signed-off-by: SammyOina <sammyoina@gmail.com> * add telemetry endpoints Signed-off-by: SammyOina <sammyoina@gmail.com> * add transport Signed-off-by: SammyOina <sammyoina@gmail.com> * create service Signed-off-by: SammyOina <sammyoina@gmail.com> * remove homing server Signed-off-by: SammyOina <sammyoina@gmail.com> * add call home to adapters Signed-off-by: SammyOina <sammyoina@gmail.com> * add last seen Signed-off-by: SammyOina <sammyoina@gmail.com> * rename logger Signed-off-by: SammyOina <sammyoina@gmail.com> * remove homing client Signed-off-by: SammyOina <sammyoina@gmail.com> * use unmerged repo Signed-off-by: SammyOina <sammyoina@gmail.com> * use renamed module Signed-off-by: SammyOina <sammyoina@gmail.com> * update call home version Signed-off-by: SammyOina <sammyoina@gmail.com> * edit documentation Signed-off-by: SammyOina <sammyoina@gmail.com> * align table Signed-off-by: SammyOina <sammyoina@gmail.com> * use alias for call home client Signed-off-by: SammyOina <sammyoina@gmail.com> * update callhome Signed-off-by: SammyOina <sammyoina@gmail.com> * update call home pkg Signed-off-by: SammyOina <sammyoina@gmail.com> * update call home Signed-off-by: SammyOina <sammyoina@gmail.com> * fix modules Signed-off-by: SammyOina <sammyoina@gmail.com> * use mf build version Signed-off-by: SammyOina <sammyoina@gmail.com> * use mf build version Signed-off-by: SammyOina <sammyoina@gmail.com> * restore default Signed-off-by: SammyOina <sammyoina@gmail.com> * add call home for users and things Signed-off-by: SammyOina <sammyoina@gmail.com> * enable opting on call home Signed-off-by: SammyOina <sammyoina@gmail.com> * remove full stops Signed-off-by: SammyOina <sammyoina@gmail.com> * update callhome client Signed-off-by: SammyOina <sammyoina@gmail.com> * add call home to all services Signed-off-by: SammyOina <sammyoina@gmail.com> * fix build Signed-off-by: SammyOina <sammyoina@gmail.com> * restore sdk tests Signed-off-by: SammyOina <sammyoina@gmail.com> * remove unnecessary changes Signed-off-by: SammyOina <sammyoina@gmail.com> * restore health_test.go Signed-off-by: SammyOina <sammyoina@gmail.com> --------- Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: SammyOina <sammyoina@gmail.com> Co-authored-by: b1ackd0t <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> --------- Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: SammyOina <sammyoina@gmail.com> Co-authored-by: b1ackd0t <blackd0t@protonmail.com> Co-authored-by: Sammy Kerata Oina <44265300+SammyOina@users.noreply.github.com>
238 lines
4.9 KiB
Go
238 lines
4.9 KiB
Go
// Copyright (c) Mainflux
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package producer
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/go-redis/redis/v8"
|
|
"github.com/mainflux/mainflux/bootstrap"
|
|
"github.com/mainflux/mainflux/pkg/errors"
|
|
)
|
|
|
|
const (
|
|
streamID = "mainflux.bootstrap"
|
|
streamLen = 1000
|
|
)
|
|
|
|
var _ bootstrap.Service = (*eventStore)(nil)
|
|
|
|
type eventStore struct {
|
|
svc bootstrap.Service
|
|
client *redis.Client
|
|
}
|
|
|
|
// NewEventStoreMiddleware returns wrapper around bootstrap service that sends
|
|
// events to event store.
|
|
func NewEventStoreMiddleware(svc bootstrap.Service, client *redis.Client) bootstrap.Service {
|
|
return eventStore{
|
|
svc: svc,
|
|
client: client,
|
|
}
|
|
}
|
|
|
|
func (es eventStore) Add(ctx context.Context, token string, cfg bootstrap.Config) (bootstrap.Config, error) {
|
|
saved, err := es.svc.Add(ctx, token, cfg)
|
|
if err != nil {
|
|
return saved, err
|
|
}
|
|
|
|
ev := configEvent{
|
|
saved, configCreate,
|
|
}
|
|
|
|
if err1 := es.add(ctx, ev); err1 != nil {
|
|
return saved, errors.Wrap(err, err1)
|
|
}
|
|
|
|
return saved, err
|
|
}
|
|
|
|
func (es eventStore) View(ctx context.Context, token, id string) (bootstrap.Config, error) {
|
|
cfg, err := es.svc.View(ctx, token, id)
|
|
if err != nil {
|
|
return cfg, err
|
|
}
|
|
ev := configEvent{
|
|
cfg, configList,
|
|
}
|
|
|
|
if err1 := es.add(ctx, ev); err1 != nil {
|
|
return cfg, errors.Wrap(err, err1)
|
|
}
|
|
|
|
return cfg, err
|
|
}
|
|
|
|
func (es eventStore) Update(ctx context.Context, token string, cfg bootstrap.Config) error {
|
|
if err := es.svc.Update(ctx, token, cfg); err != nil {
|
|
return err
|
|
}
|
|
|
|
ev := configEvent{
|
|
cfg, configUpdate,
|
|
}
|
|
|
|
return es.add(ctx, ev)
|
|
}
|
|
|
|
func (es eventStore) UpdateCert(ctx context.Context, token, thingKey, clientCert, clientKey, caCert string) error {
|
|
if err := es.svc.UpdateCert(ctx, token, thingKey, clientCert, clientKey, caCert); err != nil {
|
|
return err
|
|
}
|
|
|
|
ev := updateCertEvent{
|
|
thingKey: thingKey,
|
|
clientCert: clientCert,
|
|
clientKey: clientKey,
|
|
caCert: caCert,
|
|
}
|
|
|
|
return es.add(ctx, ev)
|
|
}
|
|
|
|
func (es eventStore) UpdateConnections(ctx context.Context, token, id string, connections []string) error {
|
|
if err := es.svc.UpdateConnections(ctx, token, id, connections); err != nil {
|
|
return err
|
|
}
|
|
|
|
ev := updateConnectionsEvent{
|
|
mfThing: id,
|
|
mfChannels: connections,
|
|
}
|
|
|
|
return es.add(ctx, ev)
|
|
}
|
|
|
|
func (es eventStore) List(ctx context.Context, token string, filter bootstrap.Filter, offset, limit uint64) (bootstrap.ConfigsPage, error) {
|
|
bp, err := es.svc.List(ctx, token, filter, offset, limit)
|
|
if err != nil {
|
|
return bp, err
|
|
}
|
|
|
|
ev := listConfigsEvent{
|
|
offset: offset,
|
|
limit: limit,
|
|
fullMatch: filter.FullMatch,
|
|
partialMatch: filter.PartialMatch,
|
|
}
|
|
|
|
if err1 := es.add(ctx, ev); err1 != nil {
|
|
return bp, errors.Wrap(err, err1)
|
|
}
|
|
|
|
return bp, nil
|
|
}
|
|
|
|
func (es eventStore) Remove(ctx context.Context, token, id string) error {
|
|
if err := es.svc.Remove(ctx, token, id); err != nil {
|
|
return err
|
|
}
|
|
|
|
ev := removeConfigEvent{
|
|
mfThing: id,
|
|
}
|
|
|
|
return es.add(ctx, ev)
|
|
}
|
|
|
|
func (es eventStore) Bootstrap(ctx context.Context, externalKey, externalID string, secure bool) (bootstrap.Config, error) {
|
|
cfg, err := es.svc.Bootstrap(ctx, externalKey, externalID, secure)
|
|
|
|
ev := bootstrapEvent{
|
|
cfg,
|
|
externalID,
|
|
true,
|
|
}
|
|
|
|
if err != nil {
|
|
ev.success = false
|
|
}
|
|
|
|
if err1 := es.add(ctx, ev); err1 != nil {
|
|
return cfg, err1
|
|
}
|
|
|
|
return cfg, err
|
|
}
|
|
|
|
func (es eventStore) ChangeState(ctx context.Context, token, id string, state bootstrap.State) error {
|
|
if err := es.svc.ChangeState(ctx, token, id, state); err != nil {
|
|
return err
|
|
}
|
|
|
|
ev := changeStateEvent{
|
|
mfThing: id,
|
|
state: state,
|
|
}
|
|
|
|
return es.add(ctx, ev)
|
|
}
|
|
|
|
func (es eventStore) RemoveConfigHandler(ctx context.Context, id string) error {
|
|
if err := es.svc.RemoveConfigHandler(ctx, id); err != nil {
|
|
return err
|
|
}
|
|
|
|
ev := removeHandlerEvent{
|
|
id: id,
|
|
operation: configHandlerRemove,
|
|
}
|
|
|
|
return es.add(ctx, ev)
|
|
}
|
|
|
|
func (es eventStore) RemoveChannelHandler(ctx context.Context, id string) error {
|
|
if err := es.svc.RemoveChannelHandler(ctx, id); err != nil {
|
|
return err
|
|
}
|
|
|
|
ev := removeHandlerEvent{
|
|
id: id,
|
|
operation: channelHandlerRemove,
|
|
}
|
|
|
|
return es.add(ctx, ev)
|
|
}
|
|
|
|
func (es eventStore) UpdateChannelHandler(ctx context.Context, channel bootstrap.Channel) error {
|
|
if err := es.svc.UpdateChannelHandler(ctx, channel); err != nil {
|
|
return err
|
|
}
|
|
|
|
ev := updateChannelHandlerEvent{
|
|
channel,
|
|
}
|
|
|
|
return es.add(ctx, ev)
|
|
}
|
|
|
|
func (es eventStore) DisconnectThingHandler(ctx context.Context, channelID, thingID string) error {
|
|
if err := es.svc.DisconnectThingHandler(ctx, channelID, thingID); err != nil {
|
|
return err
|
|
}
|
|
|
|
ev := disconnectThingEvent{
|
|
channelID,
|
|
thingID,
|
|
}
|
|
|
|
return es.add(ctx, ev)
|
|
}
|
|
|
|
func (es eventStore) add(ctx context.Context, ev event) error {
|
|
values, err := ev.encode()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
record := &redis.XAddArgs{
|
|
Stream: streamID,
|
|
MaxLenApprox: streamLen,
|
|
Values: values,
|
|
}
|
|
|
|
return es.client.XAdd(ctx, record).Err()
|
|
}
|