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>
281 lines
6.9 KiB
Go
281 lines
6.9 KiB
Go
package objx
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/base64"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"net/url"
|
|
"strconv"
|
|
)
|
|
|
|
// SignatureSeparator is the character that is used to
|
|
// separate the Base64 string from the security signature.
|
|
const SignatureSeparator = "_"
|
|
|
|
// URLValuesSliceKeySuffix is the character that is used to
|
|
// specify a suffic for slices parsed by URLValues.
|
|
// If the suffix is set to "[i]", then the index of the slice
|
|
// is used in place of i
|
|
// Ex: Suffix "[]" would have the form a[]=b&a[]=c
|
|
// OR Suffix "[i]" would have the form a[0]=b&a[1]=c
|
|
// OR Suffix "" would have the form a=b&a=c
|
|
var urlValuesSliceKeySuffix = "[]"
|
|
|
|
const (
|
|
URLValuesSliceKeySuffixEmpty = ""
|
|
URLValuesSliceKeySuffixArray = "[]"
|
|
URLValuesSliceKeySuffixIndex = "[i]"
|
|
)
|
|
|
|
// SetURLValuesSliceKeySuffix sets the character that is used to
|
|
// specify a suffic for slices parsed by URLValues.
|
|
// If the suffix is set to "[i]", then the index of the slice
|
|
// is used in place of i
|
|
// Ex: Suffix "[]" would have the form a[]=b&a[]=c
|
|
// OR Suffix "[i]" would have the form a[0]=b&a[1]=c
|
|
// OR Suffix "" would have the form a=b&a=c
|
|
func SetURLValuesSliceKeySuffix(s string) error {
|
|
if s == URLValuesSliceKeySuffixEmpty || s == URLValuesSliceKeySuffixArray || s == URLValuesSliceKeySuffixIndex {
|
|
urlValuesSliceKeySuffix = s
|
|
return nil
|
|
}
|
|
|
|
return errors.New("objx: Invalid URLValuesSliceKeySuffix provided.")
|
|
}
|
|
|
|
// JSON converts the contained object to a JSON string
|
|
// representation
|
|
func (m Map) JSON() (string, error) {
|
|
for k, v := range m {
|
|
m[k] = cleanUp(v)
|
|
}
|
|
|
|
result, err := json.Marshal(m)
|
|
if err != nil {
|
|
err = errors.New("objx: JSON encode failed with: " + err.Error())
|
|
}
|
|
return string(result), err
|
|
}
|
|
|
|
func cleanUpInterfaceArray(in []interface{}) []interface{} {
|
|
result := make([]interface{}, len(in))
|
|
for i, v := range in {
|
|
result[i] = cleanUp(v)
|
|
}
|
|
return result
|
|
}
|
|
|
|
func cleanUpInterfaceMap(in map[interface{}]interface{}) Map {
|
|
result := Map{}
|
|
for k, v := range in {
|
|
result[fmt.Sprintf("%v", k)] = cleanUp(v)
|
|
}
|
|
return result
|
|
}
|
|
|
|
func cleanUpStringMap(in map[string]interface{}) Map {
|
|
result := Map{}
|
|
for k, v := range in {
|
|
result[k] = cleanUp(v)
|
|
}
|
|
return result
|
|
}
|
|
|
|
func cleanUpMSIArray(in []map[string]interface{}) []Map {
|
|
result := make([]Map, len(in))
|
|
for i, v := range in {
|
|
result[i] = cleanUpStringMap(v)
|
|
}
|
|
return result
|
|
}
|
|
|
|
func cleanUpMapArray(in []Map) []Map {
|
|
result := make([]Map, len(in))
|
|
for i, v := range in {
|
|
result[i] = cleanUpStringMap(v)
|
|
}
|
|
return result
|
|
}
|
|
|
|
func cleanUp(v interface{}) interface{} {
|
|
switch v := v.(type) {
|
|
case []interface{}:
|
|
return cleanUpInterfaceArray(v)
|
|
case []map[string]interface{}:
|
|
return cleanUpMSIArray(v)
|
|
case map[interface{}]interface{}:
|
|
return cleanUpInterfaceMap(v)
|
|
case Map:
|
|
return cleanUpStringMap(v)
|
|
case []Map:
|
|
return cleanUpMapArray(v)
|
|
default:
|
|
return v
|
|
}
|
|
}
|
|
|
|
// MustJSON converts the contained object to a JSON string
|
|
// representation and panics if there is an error
|
|
func (m Map) MustJSON() string {
|
|
result, err := m.JSON()
|
|
if err != nil {
|
|
panic(err.Error())
|
|
}
|
|
return result
|
|
}
|
|
|
|
// Base64 converts the contained object to a Base64 string
|
|
// representation of the JSON string representation
|
|
func (m Map) Base64() (string, error) {
|
|
var buf bytes.Buffer
|
|
|
|
jsonData, err := m.JSON()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
encoder := base64.NewEncoder(base64.StdEncoding, &buf)
|
|
_, _ = encoder.Write([]byte(jsonData))
|
|
_ = encoder.Close()
|
|
|
|
return buf.String(), nil
|
|
}
|
|
|
|
// MustBase64 converts the contained object to a Base64 string
|
|
// representation of the JSON string representation and panics
|
|
// if there is an error
|
|
func (m Map) MustBase64() string {
|
|
result, err := m.Base64()
|
|
if err != nil {
|
|
panic(err.Error())
|
|
}
|
|
return result
|
|
}
|
|
|
|
// SignedBase64 converts the contained object to a Base64 string
|
|
// representation of the JSON string representation and signs it
|
|
// using the provided key.
|
|
func (m Map) SignedBase64(key string) (string, error) {
|
|
base64, err := m.Base64()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
sig := HashWithKey(base64, key)
|
|
return base64 + SignatureSeparator + sig, nil
|
|
}
|
|
|
|
// MustSignedBase64 converts the contained object to a Base64 string
|
|
// representation of the JSON string representation and signs it
|
|
// using the provided key and panics if there is an error
|
|
func (m Map) MustSignedBase64(key string) string {
|
|
result, err := m.SignedBase64(key)
|
|
if err != nil {
|
|
panic(err.Error())
|
|
}
|
|
return result
|
|
}
|
|
|
|
/*
|
|
URL Query
|
|
------------------------------------------------
|
|
*/
|
|
|
|
// URLValues creates a url.Values object from an Obj. This
|
|
// function requires that the wrapped object be a map[string]interface{}
|
|
func (m Map) URLValues() url.Values {
|
|
vals := make(url.Values)
|
|
|
|
m.parseURLValues(m, vals, "")
|
|
|
|
return vals
|
|
}
|
|
|
|
func (m Map) parseURLValues(queryMap Map, vals url.Values, key string) {
|
|
useSliceIndex := false
|
|
if urlValuesSliceKeySuffix == "[i]" {
|
|
useSliceIndex = true
|
|
}
|
|
|
|
for k, v := range queryMap {
|
|
val := &Value{data: v}
|
|
switch {
|
|
case val.IsObjxMap():
|
|
if key == "" {
|
|
m.parseURLValues(val.ObjxMap(), vals, k)
|
|
} else {
|
|
m.parseURLValues(val.ObjxMap(), vals, key+"["+k+"]")
|
|
}
|
|
case val.IsObjxMapSlice():
|
|
sliceKey := k
|
|
if key != "" {
|
|
sliceKey = key + "[" + k + "]"
|
|
}
|
|
|
|
if useSliceIndex {
|
|
for i, sv := range val.MustObjxMapSlice() {
|
|
sk := sliceKey + "[" + strconv.FormatInt(int64(i), 10) + "]"
|
|
m.parseURLValues(sv, vals, sk)
|
|
}
|
|
} else {
|
|
sliceKey = sliceKey + urlValuesSliceKeySuffix
|
|
for _, sv := range val.MustObjxMapSlice() {
|
|
m.parseURLValues(sv, vals, sliceKey)
|
|
}
|
|
}
|
|
case val.IsMSISlice():
|
|
sliceKey := k
|
|
if key != "" {
|
|
sliceKey = key + "[" + k + "]"
|
|
}
|
|
|
|
if useSliceIndex {
|
|
for i, sv := range val.MustMSISlice() {
|
|
sk := sliceKey + "[" + strconv.FormatInt(int64(i), 10) + "]"
|
|
m.parseURLValues(New(sv), vals, sk)
|
|
}
|
|
} else {
|
|
sliceKey = sliceKey + urlValuesSliceKeySuffix
|
|
for _, sv := range val.MustMSISlice() {
|
|
m.parseURLValues(New(sv), vals, sliceKey)
|
|
}
|
|
}
|
|
case val.IsStrSlice(), val.IsBoolSlice(),
|
|
val.IsFloat32Slice(), val.IsFloat64Slice(),
|
|
val.IsIntSlice(), val.IsInt8Slice(), val.IsInt16Slice(), val.IsInt32Slice(), val.IsInt64Slice(),
|
|
val.IsUintSlice(), val.IsUint8Slice(), val.IsUint16Slice(), val.IsUint32Slice(), val.IsUint64Slice():
|
|
|
|
sliceKey := k
|
|
if key != "" {
|
|
sliceKey = key + "[" + k + "]"
|
|
}
|
|
|
|
if useSliceIndex {
|
|
for i, sv := range val.StringSlice() {
|
|
sk := sliceKey + "[" + strconv.FormatInt(int64(i), 10) + "]"
|
|
vals.Set(sk, sv)
|
|
}
|
|
} else {
|
|
sliceKey = sliceKey + urlValuesSliceKeySuffix
|
|
vals[sliceKey] = val.StringSlice()
|
|
}
|
|
|
|
default:
|
|
if key == "" {
|
|
vals.Set(k, val.String())
|
|
} else {
|
|
vals.Set(key+"["+k+"]", val.String())
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// URLQuery gets an encoded URL query representing the given
|
|
// Obj. This function requires that the wrapped object be a
|
|
// map[string]interface{}
|
|
func (m Map) URLQuery() (string, error) {
|
|
return m.URLValues().Encode(), nil
|
|
}
|