mirror of
https://github.com/mainflux/mainflux.git
synced 2025-05-06 19:29:15 +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>
216 lines
5.7 KiB
Go
216 lines
5.7 KiB
Go
package objx
|
|
|
|
import (
|
|
"encoding/base64"
|
|
"encoding/json"
|
|
"errors"
|
|
"io/ioutil"
|
|
"net/url"
|
|
"strings"
|
|
)
|
|
|
|
// MSIConvertable is an interface that defines methods for converting your
|
|
// custom types to a map[string]interface{} representation.
|
|
type MSIConvertable interface {
|
|
// MSI gets a map[string]interface{} (msi) representing the
|
|
// object.
|
|
MSI() map[string]interface{}
|
|
}
|
|
|
|
// Map provides extended functionality for working with
|
|
// untyped data, in particular map[string]interface (msi).
|
|
type Map map[string]interface{}
|
|
|
|
// Value returns the internal value instance
|
|
func (m Map) Value() *Value {
|
|
return &Value{data: m}
|
|
}
|
|
|
|
// Nil represents a nil Map.
|
|
var Nil = New(nil)
|
|
|
|
// New creates a new Map containing the map[string]interface{} in the data argument.
|
|
// If the data argument is not a map[string]interface, New attempts to call the
|
|
// MSI() method on the MSIConvertable interface to create one.
|
|
func New(data interface{}) Map {
|
|
if _, ok := data.(map[string]interface{}); !ok {
|
|
if converter, ok := data.(MSIConvertable); ok {
|
|
data = converter.MSI()
|
|
} else {
|
|
return nil
|
|
}
|
|
}
|
|
return Map(data.(map[string]interface{}))
|
|
}
|
|
|
|
// MSI creates a map[string]interface{} and puts it inside a new Map.
|
|
//
|
|
// The arguments follow a key, value pattern.
|
|
//
|
|
//
|
|
// Returns nil if any key argument is non-string or if there are an odd number of arguments.
|
|
//
|
|
// Example
|
|
//
|
|
// To easily create Maps:
|
|
//
|
|
// m := objx.MSI("name", "Mat", "age", 29, "subobj", objx.MSI("active", true))
|
|
//
|
|
// // creates an Map equivalent to
|
|
// m := objx.Map{"name": "Mat", "age": 29, "subobj": objx.Map{"active": true}}
|
|
func MSI(keyAndValuePairs ...interface{}) Map {
|
|
newMap := Map{}
|
|
keyAndValuePairsLen := len(keyAndValuePairs)
|
|
if keyAndValuePairsLen%2 != 0 {
|
|
return nil
|
|
}
|
|
for i := 0; i < keyAndValuePairsLen; i = i + 2 {
|
|
key := keyAndValuePairs[i]
|
|
value := keyAndValuePairs[i+1]
|
|
|
|
// make sure the key is a string
|
|
keyString, keyStringOK := key.(string)
|
|
if !keyStringOK {
|
|
return nil
|
|
}
|
|
newMap[keyString] = value
|
|
}
|
|
return newMap
|
|
}
|
|
|
|
// ****** Conversion Constructors
|
|
|
|
// MustFromJSON creates a new Map containing the data specified in the
|
|
// jsonString.
|
|
//
|
|
// Panics if the JSON is invalid.
|
|
func MustFromJSON(jsonString string) Map {
|
|
o, err := FromJSON(jsonString)
|
|
if err != nil {
|
|
panic("objx: MustFromJSON failed with error: " + err.Error())
|
|
}
|
|
return o
|
|
}
|
|
|
|
// MustFromJSONSlice creates a new slice of Map containing the data specified in the
|
|
// jsonString. Works with jsons with a top level array
|
|
//
|
|
// Panics if the JSON is invalid.
|
|
func MustFromJSONSlice(jsonString string) []Map {
|
|
slice, err := FromJSONSlice(jsonString)
|
|
if err != nil {
|
|
panic("objx: MustFromJSONSlice failed with error: " + err.Error())
|
|
}
|
|
return slice
|
|
}
|
|
|
|
// FromJSON creates a new Map containing the data specified in the
|
|
// jsonString.
|
|
//
|
|
// Returns an error if the JSON is invalid.
|
|
func FromJSON(jsonString string) (Map, error) {
|
|
var m Map
|
|
err := json.Unmarshal([]byte(jsonString), &m)
|
|
if err != nil {
|
|
return Nil, err
|
|
}
|
|
return m, nil
|
|
}
|
|
|
|
// FromJSONSlice creates a new slice of Map containing the data specified in the
|
|
// jsonString. Works with jsons with a top level array
|
|
//
|
|
// Returns an error if the JSON is invalid.
|
|
func FromJSONSlice(jsonString string) ([]Map, error) {
|
|
var slice []Map
|
|
err := json.Unmarshal([]byte(jsonString), &slice)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return slice, nil
|
|
}
|
|
|
|
// FromBase64 creates a new Obj containing the data specified
|
|
// in the Base64 string.
|
|
//
|
|
// The string is an encoded JSON string returned by Base64
|
|
func FromBase64(base64String string) (Map, error) {
|
|
decoder := base64.NewDecoder(base64.StdEncoding, strings.NewReader(base64String))
|
|
decoded, err := ioutil.ReadAll(decoder)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return FromJSON(string(decoded))
|
|
}
|
|
|
|
// MustFromBase64 creates a new Obj containing the data specified
|
|
// in the Base64 string and panics if there is an error.
|
|
//
|
|
// The string is an encoded JSON string returned by Base64
|
|
func MustFromBase64(base64String string) Map {
|
|
result, err := FromBase64(base64String)
|
|
if err != nil {
|
|
panic("objx: MustFromBase64 failed with error: " + err.Error())
|
|
}
|
|
return result
|
|
}
|
|
|
|
// FromSignedBase64 creates a new Obj containing the data specified
|
|
// in the Base64 string.
|
|
//
|
|
// The string is an encoded JSON string returned by SignedBase64
|
|
func FromSignedBase64(base64String, key string) (Map, error) {
|
|
parts := strings.Split(base64String, SignatureSeparator)
|
|
if len(parts) != 2 {
|
|
return nil, errors.New("objx: Signed base64 string is malformed")
|
|
}
|
|
|
|
sig := HashWithKey(parts[0], key)
|
|
if parts[1] != sig {
|
|
return nil, errors.New("objx: Signature for base64 data does not match")
|
|
}
|
|
return FromBase64(parts[0])
|
|
}
|
|
|
|
// MustFromSignedBase64 creates a new Obj containing the data specified
|
|
// in the Base64 string and panics if there is an error.
|
|
//
|
|
// The string is an encoded JSON string returned by Base64
|
|
func MustFromSignedBase64(base64String, key string) Map {
|
|
result, err := FromSignedBase64(base64String, key)
|
|
if err != nil {
|
|
panic("objx: MustFromSignedBase64 failed with error: " + err.Error())
|
|
}
|
|
return result
|
|
}
|
|
|
|
// FromURLQuery generates a new Obj by parsing the specified
|
|
// query.
|
|
//
|
|
// For queries with multiple values, the first value is selected.
|
|
func FromURLQuery(query string) (Map, error) {
|
|
vals, err := url.ParseQuery(query)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
m := Map{}
|
|
for k, vals := range vals {
|
|
m[k] = vals[0]
|
|
}
|
|
return m, nil
|
|
}
|
|
|
|
// MustFromURLQuery generates a new Obj by parsing the specified
|
|
// query.
|
|
//
|
|
// For queries with multiple values, the first value is selected.
|
|
//
|
|
// Panics if it encounters an error
|
|
func MustFromURLQuery(query string) Map {
|
|
o, err := FromURLQuery(query)
|
|
if err != nil {
|
|
panic("objx: MustFromURLQuery failed with error: " + err.Error())
|
|
}
|
|
return o
|
|
}
|