mirror of
https://github.com/mainflux/mainflux.git
synced 2025-05-02 22:17:10 +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>
185 lines
4.7 KiB
Go
185 lines
4.7 KiB
Go
// Copyright (c) Mainflux
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package apiutil
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/http"
|
|
"strconv"
|
|
|
|
kithttp "github.com/go-kit/kit/transport/http"
|
|
"github.com/go-zoo/bone"
|
|
"github.com/mainflux/mainflux/logger"
|
|
"github.com/mainflux/mainflux/pkg/errors"
|
|
)
|
|
|
|
// LoggingErrorEncoder is a go-kit error encoder logging decorator.
|
|
func LoggingErrorEncoder(logger logger.Logger, enc kithttp.ErrorEncoder) kithttp.ErrorEncoder {
|
|
return func(ctx context.Context, err error, w http.ResponseWriter) {
|
|
switch {
|
|
case errors.Contains(err, ErrBearerToken),
|
|
errors.Contains(err, ErrMissingID),
|
|
errors.Contains(err, ErrBearerKey),
|
|
errors.Contains(err, ErrInvalidAuthKey),
|
|
errors.Contains(err, ErrInvalidIDFormat),
|
|
errors.Contains(err, ErrNameSize),
|
|
errors.Contains(err, ErrLimitSize),
|
|
errors.Contains(err, ErrOffsetSize),
|
|
errors.Contains(err, ErrInvalidOrder),
|
|
errors.Contains(err, ErrInvalidDirection),
|
|
errors.Contains(err, ErrEmptyList),
|
|
errors.Contains(err, ErrMalformedPolicy),
|
|
errors.Contains(err, ErrMissingPolicySub),
|
|
errors.Contains(err, ErrMissingPolicyObj),
|
|
errors.Contains(err, ErrMalformedPolicyAct),
|
|
errors.Contains(err, ErrMissingCertData),
|
|
errors.Contains(err, ErrInvalidTopic),
|
|
errors.Contains(err, ErrInvalidContact),
|
|
errors.Contains(err, ErrMissingEmail),
|
|
errors.Contains(err, ErrMissingHost),
|
|
errors.Contains(err, ErrMissingPass),
|
|
errors.Contains(err, ErrMissingConfPass),
|
|
errors.Contains(err, ErrInvalidResetPass),
|
|
errors.Contains(err, ErrInvalidComparator),
|
|
errors.Contains(err, ErrMissingMemberType),
|
|
errors.Contains(err, ErrMaxLevelExceeded),
|
|
errors.Contains(err, ErrInvalidAPIKey),
|
|
errors.Contains(err, ErrInvalidLevel),
|
|
errors.Contains(err, ErrBootstrapState),
|
|
errors.Contains(err, ErrInvalidQueryParams),
|
|
errors.Contains(err, ErrMalformedEntity):
|
|
logger.Error(err.Error())
|
|
}
|
|
|
|
enc(ctx, err, w)
|
|
}
|
|
}
|
|
|
|
// ReadUintQuery reads the value of uint64 http query parameters for a given key.
|
|
func ReadUintQuery(r *http.Request, key string, def uint64) (uint64, error) {
|
|
vals := bone.GetQuery(r, key)
|
|
if len(vals) > 1 {
|
|
return 0, errors.ErrInvalidQueryParams
|
|
}
|
|
|
|
if len(vals) == 0 {
|
|
return def, nil
|
|
}
|
|
|
|
strval := vals[0]
|
|
val, err := strconv.ParseUint(strval, 10, 64)
|
|
if err != nil {
|
|
return 0, errors.ErrInvalidQueryParams
|
|
}
|
|
|
|
return val, nil
|
|
}
|
|
|
|
// ReadStringQuery reads the value of string http query parameters for a given key.
|
|
func ReadStringQuery(r *http.Request, key string, def string) (string, error) {
|
|
vals := bone.GetQuery(r, key)
|
|
if len(vals) > 1 {
|
|
return "", errors.ErrInvalidQueryParams
|
|
}
|
|
|
|
if len(vals) == 0 {
|
|
return def, nil
|
|
}
|
|
|
|
return vals[0], nil
|
|
}
|
|
|
|
// ReadMetadataQuery reads the value of json http query parameters for a given key.
|
|
func ReadMetadataQuery(r *http.Request, key string, def map[string]interface{}) (map[string]interface{}, error) {
|
|
vals := bone.GetQuery(r, key)
|
|
if len(vals) > 1 {
|
|
return nil, errors.ErrInvalidQueryParams
|
|
}
|
|
|
|
if len(vals) == 0 {
|
|
return def, nil
|
|
}
|
|
|
|
m := make(map[string]interface{})
|
|
err := json.Unmarshal([]byte(vals[0]), &m)
|
|
if err != nil {
|
|
return nil, errors.Wrap(errors.ErrInvalidQueryParams, err)
|
|
}
|
|
|
|
return m, nil
|
|
}
|
|
|
|
// ReadBoolQuery reads boolean query parameters in a given http request.
|
|
func ReadBoolQuery(r *http.Request, key string, def bool) (bool, error) {
|
|
vals := bone.GetQuery(r, key)
|
|
if len(vals) > 1 {
|
|
return false, errors.ErrInvalidQueryParams
|
|
}
|
|
|
|
if len(vals) == 0 {
|
|
return def, nil
|
|
}
|
|
|
|
b, err := strconv.ParseBool(vals[0])
|
|
if err != nil {
|
|
return false, errors.ErrInvalidQueryParams
|
|
}
|
|
|
|
return b, nil
|
|
}
|
|
|
|
// ReadFloatQuery reads the value of float64 http query parameters for a given key.
|
|
func ReadFloatQuery(r *http.Request, key string, def float64) (float64, error) {
|
|
vals := bone.GetQuery(r, key)
|
|
if len(vals) > 1 {
|
|
return 0, errors.ErrInvalidQueryParams
|
|
}
|
|
|
|
if len(vals) == 0 {
|
|
return def, nil
|
|
}
|
|
|
|
fval := vals[0]
|
|
val, err := strconv.ParseFloat(fval, 64)
|
|
if err != nil {
|
|
return 0, errors.ErrInvalidQueryParams
|
|
}
|
|
|
|
return val, nil
|
|
}
|
|
|
|
type number interface {
|
|
int64 | float64 | uint16 | uint64
|
|
}
|
|
|
|
// ReadNumQuery returns a numeric value.
|
|
func ReadNumQuery[N number](r *http.Request, key string, def N) (N, error) {
|
|
vals := bone.GetQuery(r, key)
|
|
if len(vals) > 1 {
|
|
return 0, errors.ErrInvalidQueryParams
|
|
}
|
|
if len(vals) == 0 {
|
|
return def, nil
|
|
}
|
|
val := vals[0]
|
|
|
|
switch any(def).(type) {
|
|
case int64:
|
|
v, err := strconv.ParseInt(val, 10, 64)
|
|
return N(v), err
|
|
case uint64:
|
|
v, err := strconv.ParseUint(val, 10, 64)
|
|
return N(v), err
|
|
case uint16:
|
|
v, err := strconv.ParseUint(val, 10, 16)
|
|
return N(v), err
|
|
case float64:
|
|
v, err := strconv.ParseFloat(val, 64)
|
|
return N(v), err
|
|
default:
|
|
return def, nil
|
|
}
|
|
}
|