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>
209 lines
6.6 KiB
Go
209 lines
6.6 KiB
Go
/*
|
|
*
|
|
* Copyright 2018 gRPC authors.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*
|
|
*/
|
|
|
|
package binarylog
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"regexp"
|
|
"strconv"
|
|
"strings"
|
|
)
|
|
|
|
// NewLoggerFromConfigString reads the string and build a logger. It can be used
|
|
// to build a new logger and assign it to binarylog.Logger.
|
|
//
|
|
// Example filter config strings:
|
|
// - "" Nothing will be logged
|
|
// - "*" All headers and messages will be fully logged.
|
|
// - "*{h}" Only headers will be logged.
|
|
// - "*{m:256}" Only the first 256 bytes of each message will be logged.
|
|
// - "Foo/*" Logs every method in service Foo
|
|
// - "Foo/*,-Foo/Bar" Logs every method in service Foo except method /Foo/Bar
|
|
// - "Foo/*,Foo/Bar{m:256}" Logs the first 256 bytes of each message in method
|
|
// /Foo/Bar, logs all headers and messages in every other method in service
|
|
// Foo.
|
|
//
|
|
// If two configs exist for one certain method or service, the one specified
|
|
// later overrides the previous config.
|
|
func NewLoggerFromConfigString(s string) Logger {
|
|
if s == "" {
|
|
return nil
|
|
}
|
|
l := newEmptyLogger()
|
|
methods := strings.Split(s, ",")
|
|
for _, method := range methods {
|
|
if err := l.fillMethodLoggerWithConfigString(method); err != nil {
|
|
grpclogLogger.Warningf("failed to parse binary log config: %v", err)
|
|
return nil
|
|
}
|
|
}
|
|
return l
|
|
}
|
|
|
|
// fillMethodLoggerWithConfigString parses config, creates TruncatingMethodLogger and adds
|
|
// it to the right map in the logger.
|
|
func (l *logger) fillMethodLoggerWithConfigString(config string) error {
|
|
// "" is invalid.
|
|
if config == "" {
|
|
return errors.New("empty string is not a valid method binary logging config")
|
|
}
|
|
|
|
// "-service/method", blacklist, no * or {} allowed.
|
|
if config[0] == '-' {
|
|
s, m, suffix, err := parseMethodConfigAndSuffix(config[1:])
|
|
if err != nil {
|
|
return fmt.Errorf("invalid config: %q, %v", config, err)
|
|
}
|
|
if m == "*" {
|
|
return fmt.Errorf("invalid config: %q, %v", config, "* not allowed in blacklist config")
|
|
}
|
|
if suffix != "" {
|
|
return fmt.Errorf("invalid config: %q, %v", config, "header/message limit not allowed in blacklist config")
|
|
}
|
|
if err := l.setBlacklist(s + "/" + m); err != nil {
|
|
return fmt.Errorf("invalid config: %v", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// "*{h:256;m:256}"
|
|
if config[0] == '*' {
|
|
hdr, msg, err := parseHeaderMessageLengthConfig(config[1:])
|
|
if err != nil {
|
|
return fmt.Errorf("invalid config: %q, %v", config, err)
|
|
}
|
|
if err := l.setDefaultMethodLogger(&MethodLoggerConfig{Header: hdr, Message: msg}); err != nil {
|
|
return fmt.Errorf("invalid config: %v", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
s, m, suffix, err := parseMethodConfigAndSuffix(config)
|
|
if err != nil {
|
|
return fmt.Errorf("invalid config: %q, %v", config, err)
|
|
}
|
|
hdr, msg, err := parseHeaderMessageLengthConfig(suffix)
|
|
if err != nil {
|
|
return fmt.Errorf("invalid header/message length config: %q, %v", suffix, err)
|
|
}
|
|
if m == "*" {
|
|
if err := l.setServiceMethodLogger(s, &MethodLoggerConfig{Header: hdr, Message: msg}); err != nil {
|
|
return fmt.Errorf("invalid config: %v", err)
|
|
}
|
|
} else {
|
|
if err := l.setMethodMethodLogger(s+"/"+m, &MethodLoggerConfig{Header: hdr, Message: msg}); err != nil {
|
|
return fmt.Errorf("invalid config: %v", err)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
const (
|
|
// TODO: this const is only used by env_config now. But could be useful for
|
|
// other config. Move to binarylog.go if necessary.
|
|
maxUInt = ^uint64(0)
|
|
|
|
// For "p.s/m" plus any suffix. Suffix will be parsed again. See test for
|
|
// expected output.
|
|
longMethodConfigRegexpStr = `^([\w./]+)/((?:\w+)|[*])(.+)?$`
|
|
|
|
// For suffix from above, "{h:123,m:123}". See test for expected output.
|
|
optionalLengthRegexpStr = `(?::(\d+))?` // Optional ":123".
|
|
headerConfigRegexpStr = `^{h` + optionalLengthRegexpStr + `}$`
|
|
messageConfigRegexpStr = `^{m` + optionalLengthRegexpStr + `}$`
|
|
headerMessageConfigRegexpStr = `^{h` + optionalLengthRegexpStr + `;m` + optionalLengthRegexpStr + `}$`
|
|
)
|
|
|
|
var (
|
|
longMethodConfigRegexp = regexp.MustCompile(longMethodConfigRegexpStr)
|
|
headerConfigRegexp = regexp.MustCompile(headerConfigRegexpStr)
|
|
messageConfigRegexp = regexp.MustCompile(messageConfigRegexpStr)
|
|
headerMessageConfigRegexp = regexp.MustCompile(headerMessageConfigRegexpStr)
|
|
)
|
|
|
|
// Turn "service/method{h;m}" into "service", "method", "{h;m}".
|
|
func parseMethodConfigAndSuffix(c string) (service, method, suffix string, _ error) {
|
|
// Regexp result:
|
|
//
|
|
// in: "p.s/m{h:123,m:123}",
|
|
// out: []string{"p.s/m{h:123,m:123}", "p.s", "m", "{h:123,m:123}"},
|
|
match := longMethodConfigRegexp.FindStringSubmatch(c)
|
|
if match == nil {
|
|
return "", "", "", fmt.Errorf("%q contains invalid substring", c)
|
|
}
|
|
service = match[1]
|
|
method = match[2]
|
|
suffix = match[3]
|
|
return
|
|
}
|
|
|
|
// Turn "{h:123;m:345}" into 123, 345.
|
|
//
|
|
// Return maxUInt if length is unspecified.
|
|
func parseHeaderMessageLengthConfig(c string) (hdrLenStr, msgLenStr uint64, err error) {
|
|
if c == "" {
|
|
return maxUInt, maxUInt, nil
|
|
}
|
|
// Header config only.
|
|
if match := headerConfigRegexp.FindStringSubmatch(c); match != nil {
|
|
if s := match[1]; s != "" {
|
|
hdrLenStr, err = strconv.ParseUint(s, 10, 64)
|
|
if err != nil {
|
|
return 0, 0, fmt.Errorf("failed to convert %q to uint", s)
|
|
}
|
|
return hdrLenStr, 0, nil
|
|
}
|
|
return maxUInt, 0, nil
|
|
}
|
|
|
|
// Message config only.
|
|
if match := messageConfigRegexp.FindStringSubmatch(c); match != nil {
|
|
if s := match[1]; s != "" {
|
|
msgLenStr, err = strconv.ParseUint(s, 10, 64)
|
|
if err != nil {
|
|
return 0, 0, fmt.Errorf("failed to convert %q to uint", s)
|
|
}
|
|
return 0, msgLenStr, nil
|
|
}
|
|
return 0, maxUInt, nil
|
|
}
|
|
|
|
// Header and message config both.
|
|
if match := headerMessageConfigRegexp.FindStringSubmatch(c); match != nil {
|
|
// Both hdr and msg are specified, but one or two of them might be empty.
|
|
hdrLenStr = maxUInt
|
|
msgLenStr = maxUInt
|
|
if s := match[1]; s != "" {
|
|
hdrLenStr, err = strconv.ParseUint(s, 10, 64)
|
|
if err != nil {
|
|
return 0, 0, fmt.Errorf("failed to convert %q to uint", s)
|
|
}
|
|
}
|
|
if s := match[2]; s != "" {
|
|
msgLenStr, err = strconv.ParseUint(s, 10, 64)
|
|
if err != nil {
|
|
return 0, 0, fmt.Errorf("failed to convert %q to uint", s)
|
|
}
|
|
}
|
|
return hdrLenStr, msgLenStr, nil
|
|
}
|
|
return 0, 0, fmt.Errorf("%q contains invalid substring", c)
|
|
}
|