mirror of
https://github.com/mainflux/mainflux.git
synced 2025-05-02 22:17:10 +08:00

* Return Auth service Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update Compose to run with SpiceDB and Auth svc Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update auth gRPC API Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Remove Users' policies Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Move Groups to internal Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Use shared groups in Users Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Remove unused code Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Use pkg Groups in Things Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Remove Things groups Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Make imports consistent Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update Groups networking Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Remove things groups-specific API Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Move Things Clients to the root Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Move Clients to Users root Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Temporarily remove tracing Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Fix imports Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Add buffer config for gRPC Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update auth type for Things Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Use Auth for login Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Add temporary solution for refresh token Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update Tokenizer interface Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Updade tokens issuing Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Fix token issuing Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update JWT validator and refactor Tokenizer Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Rename access timeout Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Rename login to authenticate Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update Identify to use SubjectID Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Add Auth to Groups Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Use the Auth service for Groups Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update auth schema Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Fix Auth for Groups Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Add auth for addons (#14) Signed-off-by: Arvindh <arvindh91@gmail.com> Speparate Login and Refresh tokens Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Merge authN and authZ requests for things Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Add connect and disconnect Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update sharing Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Fix policies addition and removal Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update relation with roels Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Add gRPC to Things Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Assign and Unassign members to group and Listing of Group members (#15) * add auth for addons Signed-off-by: Arvindh <arvindh91@gmail.com> * add assign and unassign to group Signed-off-by: Arvindh <arvindh91@gmail.com> * add group incomplete repo implementation Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users Signed-off-by: Arvindh <arvindh91@gmail.com> --------- Signed-off-by: Arvindh <arvindh91@gmail.com> Move coap mqtt and ws policies to spicedb (#16) Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Remove old policies Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> NOISSUE - Things authorize to return thingID (#18) This commit modifies the authorize endpoint to the grpc endpoint to return thingID. The authorize endpoint allows adapters to get the publisher of the message. Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Add Groups to users service (#17) * add assign and unassign to group Signed-off-by: Arvindh <arvindh91@gmail.com> * add group incomplete repo implementation Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users stable 1 Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users stable 2 Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users & things Signed-off-by: Arvindh <arvindh91@gmail.com> * Amend signature Signed-off-by: Arvindh <arvindh91@gmail.com> * fix merge error Signed-off-by: Arvindh <arvindh91@gmail.com> --------- Signed-off-by: Arvindh <arvindh91@gmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Fix es code (#21) Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Fix Bugs (#20) * fix bugs Signed-off-by: Arvindh <arvindh91@gmail.com> * fix bugs Signed-off-by: Arvindh <arvindh91@gmail.com> --------- Signed-off-by: Arvindh <arvindh91@gmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Test e2e (#19) * fix: connect method Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * fix: e2e Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * fix changes in sdk and e2e Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * feat(docker): remove unnecessary port mapping Remove the port mapping for MQTT broker in the docker-compose.yml file. Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * Enable group listing Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * feat(responses): update ChannelsPage struct The ChannelsPage struct in the responses.go file has been updated. The "Channels" field has been renamed to "Groups" to provide more accurate naming. This change ensures consistency and clarity in the codebase. Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * feat(things): add UpdateClientSecret method Add the UpdateClientSecret method to the things service. This method allows updating the client secret for a specific client identified by the provided token, id, and key parameters. Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> --------- Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Use smaller buffers for gRPC Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Clean up tests (#22) Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Add Connect Disconnect endpoints (#23) * fix bugs Signed-off-by: Arvindh <arvindh91@gmail.com> * fix bugs Signed-off-by: Arvindh <arvindh91@gmail.com> * fix list of things in a channel and Add connect disconnect endpoint Signed-off-by: Arvindh <arvindh91@gmail.com> * fix list of things in a channel and Add connect disconnect endpoint Signed-off-by: Arvindh <arvindh91@gmail.com> --------- Signed-off-by: Arvindh <arvindh91@gmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Add: Things share with users (#25) * fix list of things in a channel and Add connect disconnect endpoint Signed-off-by: Arvindh <arvindh91@gmail.com> * add: things share with other users Signed-off-by: Arvindh <arvindh91@gmail.com> --------- Signed-off-by: Arvindh <arvindh91@gmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Rename gRPC Services (#24) * Rename things and users auth service Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * docs: add authorization docs for gRPC services Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * Rename things and users grpc services Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * Remove mainflux.env package Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> --------- Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Add: Listing of things, channels, groups, users (#26) * add: listing of channels, users, groups, things Signed-off-by: Arvindh <arvindh91@gmail.com> * add: listing of channels, users, groups, things Signed-off-by: Arvindh <arvindh91@gmail.com> * add: listing of channels, users, groups, things Signed-off-by: Arvindh <arvindh91@gmail.com> * add: listing of channels, users, groups, things Signed-off-by: Arvindh <arvindh91@gmail.com> --------- Signed-off-by: Arvindh <arvindh91@gmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Clean Up Users (#27) * feat(groups): rename redis package to events - Renamed the `redis` package to `events` in the `internal/groups` directory. - Updated the file paths and names accordingly. - This change reflects the more accurate purpose of the package and improves code organization. Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * feat(auth): Modify identity method Change request and response of identity method Add accessToken and refreshToken to Token response Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * clean up users, remove dead code Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * feat(users): add unit tests for user service This commit adds unit tests for the user service in the `users` package. The tests cover various scenarios and ensure the correct behavior of the service. Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> --------- Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Add: List of user groups & removed repeating code in groups (#29) * removed repeating code in list groups Signed-off-by: Arvindh <arvindh91@gmail.com> * add: list of user group Signed-off-by: Arvindh <arvindh91@gmail.com> * fix: otel handler operator name for endpoints Signed-off-by: Arvindh <arvindh91@gmail.com> --------- Signed-off-by: Arvindh <arvindh91@gmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Clean Up Things Service (#28) * Rework things service Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * add tests Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> --------- Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Clean Up Auth Service (#30) * clean up auth service Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * feat(auth): remove unused import Remove the unused import of `emptypb` in `auth.pb.go`. This import is not being used in the codebase and can be safely removed. Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> --------- Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Update API docs (#31) Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Remove TODO comments and cleanup the code Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Update dependenices Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> --------- Signed-off-by: Arvindh <arvindh91@gmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Co-authored-by: b1ackd0t <28790446+rodneyosodo@users.noreply.github.com> Co-authored-by: Arvindh <30824765+arvindh123@users.noreply.github.com>
202 lines
5.6 KiB
Go
202 lines
5.6 KiB
Go
// Copyright 2022 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package slog
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
"sync/atomic"
|
|
)
|
|
|
|
// A Level is the importance or severity of a log event.
|
|
// The higher the level, the more important or severe the event.
|
|
type Level int
|
|
|
|
// Level numbers are inherently arbitrary,
|
|
// but we picked them to satisfy three constraints.
|
|
// Any system can map them to another numbering scheme if it wishes.
|
|
//
|
|
// First, we wanted the default level to be Info, Since Levels are ints, Info is
|
|
// the default value for int, zero.
|
|
//
|
|
|
|
// Second, we wanted to make it easy to use levels to specify logger verbosity.
|
|
// Since a larger level means a more severe event, a logger that accepts events
|
|
// with smaller (or more negative) level means a more verbose logger. Logger
|
|
// verbosity is thus the negation of event severity, and the default verbosity
|
|
// of 0 accepts all events at least as severe as INFO.
|
|
//
|
|
// Third, we wanted some room between levels to accommodate schemes with named
|
|
// levels between ours. For example, Google Cloud Logging defines a Notice level
|
|
// between Info and Warn. Since there are only a few of these intermediate
|
|
// levels, the gap between the numbers need not be large. Our gap of 4 matches
|
|
// OpenTelemetry's mapping. Subtracting 9 from an OpenTelemetry level in the
|
|
// DEBUG, INFO, WARN and ERROR ranges converts it to the corresponding slog
|
|
// Level range. OpenTelemetry also has the names TRACE and FATAL, which slog
|
|
// does not. But those OpenTelemetry levels can still be represented as slog
|
|
// Levels by using the appropriate integers.
|
|
//
|
|
// Names for common levels.
|
|
const (
|
|
LevelDebug Level = -4
|
|
LevelInfo Level = 0
|
|
LevelWarn Level = 4
|
|
LevelError Level = 8
|
|
)
|
|
|
|
// String returns a name for the level.
|
|
// If the level has a name, then that name
|
|
// in uppercase is returned.
|
|
// If the level is between named values, then
|
|
// an integer is appended to the uppercased name.
|
|
// Examples:
|
|
//
|
|
// LevelWarn.String() => "WARN"
|
|
// (LevelInfo+2).String() => "INFO+2"
|
|
func (l Level) String() string {
|
|
str := func(base string, val Level) string {
|
|
if val == 0 {
|
|
return base
|
|
}
|
|
return fmt.Sprintf("%s%+d", base, val)
|
|
}
|
|
|
|
switch {
|
|
case l < LevelInfo:
|
|
return str("DEBUG", l-LevelDebug)
|
|
case l < LevelWarn:
|
|
return str("INFO", l-LevelInfo)
|
|
case l < LevelError:
|
|
return str("WARN", l-LevelWarn)
|
|
default:
|
|
return str("ERROR", l-LevelError)
|
|
}
|
|
}
|
|
|
|
// MarshalJSON implements [encoding/json.Marshaler]
|
|
// by quoting the output of [Level.String].
|
|
func (l Level) MarshalJSON() ([]byte, error) {
|
|
// AppendQuote is sufficient for JSON-encoding all Level strings.
|
|
// They don't contain any runes that would produce invalid JSON
|
|
// when escaped.
|
|
return strconv.AppendQuote(nil, l.String()), nil
|
|
}
|
|
|
|
// UnmarshalJSON implements [encoding/json.Unmarshaler]
|
|
// It accepts any string produced by [Level.MarshalJSON],
|
|
// ignoring case.
|
|
// It also accepts numeric offsets that would result in a different string on
|
|
// output. For example, "Error-8" would marshal as "INFO".
|
|
func (l *Level) UnmarshalJSON(data []byte) error {
|
|
s, err := strconv.Unquote(string(data))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return l.parse(s)
|
|
}
|
|
|
|
// MarshalText implements [encoding.TextMarshaler]
|
|
// by calling [Level.String].
|
|
func (l Level) MarshalText() ([]byte, error) {
|
|
return []byte(l.String()), nil
|
|
}
|
|
|
|
// UnmarshalText implements [encoding.TextUnmarshaler].
|
|
// It accepts any string produced by [Level.MarshalText],
|
|
// ignoring case.
|
|
// It also accepts numeric offsets that would result in a different string on
|
|
// output. For example, "Error-8" would marshal as "INFO".
|
|
func (l *Level) UnmarshalText(data []byte) error {
|
|
return l.parse(string(data))
|
|
}
|
|
|
|
func (l *Level) parse(s string) (err error) {
|
|
defer func() {
|
|
if err != nil {
|
|
err = fmt.Errorf("slog: level string %q: %w", s, err)
|
|
}
|
|
}()
|
|
|
|
name := s
|
|
offset := 0
|
|
if i := strings.IndexAny(s, "+-"); i >= 0 {
|
|
name = s[:i]
|
|
offset, err = strconv.Atoi(s[i:])
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
switch strings.ToUpper(name) {
|
|
case "DEBUG":
|
|
*l = LevelDebug
|
|
case "INFO":
|
|
*l = LevelInfo
|
|
case "WARN":
|
|
*l = LevelWarn
|
|
case "ERROR":
|
|
*l = LevelError
|
|
default:
|
|
return errors.New("unknown name")
|
|
}
|
|
*l += Level(offset)
|
|
return nil
|
|
}
|
|
|
|
// Level returns the receiver.
|
|
// It implements Leveler.
|
|
func (l Level) Level() Level { return l }
|
|
|
|
// A LevelVar is a Level variable, to allow a Handler level to change
|
|
// dynamically.
|
|
// It implements Leveler as well as a Set method,
|
|
// and it is safe for use by multiple goroutines.
|
|
// The zero LevelVar corresponds to LevelInfo.
|
|
type LevelVar struct {
|
|
val atomic.Int64
|
|
}
|
|
|
|
// Level returns v's level.
|
|
func (v *LevelVar) Level() Level {
|
|
return Level(int(v.val.Load()))
|
|
}
|
|
|
|
// Set sets v's level to l.
|
|
func (v *LevelVar) Set(l Level) {
|
|
v.val.Store(int64(l))
|
|
}
|
|
|
|
func (v *LevelVar) String() string {
|
|
return fmt.Sprintf("LevelVar(%s)", v.Level())
|
|
}
|
|
|
|
// MarshalText implements [encoding.TextMarshaler]
|
|
// by calling [Level.MarshalText].
|
|
func (v *LevelVar) MarshalText() ([]byte, error) {
|
|
return v.Level().MarshalText()
|
|
}
|
|
|
|
// UnmarshalText implements [encoding.TextUnmarshaler]
|
|
// by calling [Level.UnmarshalText].
|
|
func (v *LevelVar) UnmarshalText(data []byte) error {
|
|
var l Level
|
|
if err := l.UnmarshalText(data); err != nil {
|
|
return err
|
|
}
|
|
v.Set(l)
|
|
return nil
|
|
}
|
|
|
|
// A Leveler provides a Level value.
|
|
//
|
|
// As Level itself implements Leveler, clients typically supply
|
|
// a Level value wherever a Leveler is needed, such as in HandlerOptions.
|
|
// Clients who need to vary the level dynamically can provide a more complex
|
|
// Leveler implementation such as *LevelVar.
|
|
type Leveler interface {
|
|
Level() Level
|
|
}
|