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>
310 lines
7.2 KiB
Go
310 lines
7.2 KiB
Go
package pongo2
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"errors"
|
|
)
|
|
|
|
type INode interface {
|
|
Execute(*ExecutionContext, TemplateWriter) *Error
|
|
}
|
|
|
|
type IEvaluator interface {
|
|
INode
|
|
GetPositionToken() *Token
|
|
Evaluate(*ExecutionContext) (*Value, *Error)
|
|
FilterApplied(name string) bool
|
|
}
|
|
|
|
// The parser provides you a comprehensive and easy tool to
|
|
// work with the template document and arguments provided by
|
|
// the user for your custom tag.
|
|
//
|
|
// The parser works on a token list which will be provided by pongo2.
|
|
// A token is a unit you can work with. Tokens are either of type identifier,
|
|
// string, number, keyword, HTML or symbol.
|
|
//
|
|
// (See Token's documentation for more about tokens)
|
|
type Parser struct {
|
|
name string
|
|
idx int
|
|
tokens []*Token
|
|
lastToken *Token
|
|
|
|
// if the parser parses a template document, here will be
|
|
// a reference to it (needed to access the template through Tags)
|
|
template *Template
|
|
}
|
|
|
|
// Creates a new parser to parse tokens.
|
|
// Used inside pongo2 to parse documents and to provide an easy-to-use
|
|
// parser for tag authors
|
|
func newParser(name string, tokens []*Token, template *Template) *Parser {
|
|
p := &Parser{
|
|
name: name,
|
|
tokens: tokens,
|
|
template: template,
|
|
}
|
|
if len(tokens) > 0 {
|
|
p.lastToken = tokens[len(tokens)-1]
|
|
}
|
|
return p
|
|
}
|
|
|
|
// Consume one token. It will be gone forever.
|
|
func (p *Parser) Consume() {
|
|
p.ConsumeN(1)
|
|
}
|
|
|
|
// Consume N tokens. They will be gone forever.
|
|
func (p *Parser) ConsumeN(count int) {
|
|
p.idx += count
|
|
}
|
|
|
|
// Returns the current token.
|
|
func (p *Parser) Current() *Token {
|
|
return p.Get(p.idx)
|
|
}
|
|
|
|
// Returns the CURRENT token if the given type matches.
|
|
// Consumes this token on success.
|
|
func (p *Parser) MatchType(typ TokenType) *Token {
|
|
if t := p.PeekType(typ); t != nil {
|
|
p.Consume()
|
|
return t
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Returns the CURRENT token if the given type AND value matches.
|
|
// Consumes this token on success.
|
|
func (p *Parser) Match(typ TokenType, val string) *Token {
|
|
if t := p.Peek(typ, val); t != nil {
|
|
p.Consume()
|
|
return t
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Returns the CURRENT token if the given type AND *one* of
|
|
// the given values matches.
|
|
// Consumes this token on success.
|
|
func (p *Parser) MatchOne(typ TokenType, vals ...string) *Token {
|
|
for _, val := range vals {
|
|
if t := p.Peek(typ, val); t != nil {
|
|
p.Consume()
|
|
return t
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Returns the CURRENT token if the given type matches.
|
|
// It DOES NOT consume the token.
|
|
func (p *Parser) PeekType(typ TokenType) *Token {
|
|
return p.PeekTypeN(0, typ)
|
|
}
|
|
|
|
// Returns the CURRENT token if the given type AND value matches.
|
|
// It DOES NOT consume the token.
|
|
func (p *Parser) Peek(typ TokenType, val string) *Token {
|
|
return p.PeekN(0, typ, val)
|
|
}
|
|
|
|
// Returns the CURRENT token if the given type AND *one* of
|
|
// the given values matches.
|
|
// It DOES NOT consume the token.
|
|
func (p *Parser) PeekOne(typ TokenType, vals ...string) *Token {
|
|
for _, v := range vals {
|
|
t := p.PeekN(0, typ, v)
|
|
if t != nil {
|
|
return t
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Returns the tokens[current position + shift] token if the
|
|
// given type AND value matches for that token.
|
|
// DOES NOT consume the token.
|
|
func (p *Parser) PeekN(shift int, typ TokenType, val string) *Token {
|
|
t := p.Get(p.idx + shift)
|
|
if t != nil {
|
|
if t.Typ == typ && t.Val == val {
|
|
return t
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Returns the tokens[current position + shift] token if the given type matches.
|
|
// DOES NOT consume the token for that token.
|
|
func (p *Parser) PeekTypeN(shift int, typ TokenType) *Token {
|
|
t := p.Get(p.idx + shift)
|
|
if t != nil {
|
|
if t.Typ == typ {
|
|
return t
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Returns the UNCONSUMED token count.
|
|
func (p *Parser) Remaining() int {
|
|
return len(p.tokens) - p.idx
|
|
}
|
|
|
|
// Returns the total token count.
|
|
func (p *Parser) Count() int {
|
|
return len(p.tokens)
|
|
}
|
|
|
|
// Returns tokens[i] or NIL (if i >= len(tokens))
|
|
func (p *Parser) Get(i int) *Token {
|
|
if i < len(p.tokens) && i >= 0 {
|
|
return p.tokens[i]
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Returns tokens[current-position + shift] or NIL
|
|
// (if (current-position + i) >= len(tokens))
|
|
func (p *Parser) GetR(shift int) *Token {
|
|
i := p.idx + shift
|
|
return p.Get(i)
|
|
}
|
|
|
|
// Error produces a nice error message and returns an error-object.
|
|
// The 'token'-argument is optional. If provided, it will take
|
|
// the token's position information. If not provided, it will
|
|
// automatically use the CURRENT token's position information.
|
|
func (p *Parser) Error(msg string, token *Token) *Error {
|
|
if token == nil {
|
|
// Set current token
|
|
token = p.Current()
|
|
if token == nil {
|
|
// Set to last token
|
|
if len(p.tokens) > 0 {
|
|
token = p.tokens[len(p.tokens)-1]
|
|
}
|
|
}
|
|
}
|
|
var line, col int
|
|
if token != nil {
|
|
line = token.Line
|
|
col = token.Col
|
|
}
|
|
return &Error{
|
|
Template: p.template,
|
|
Filename: p.name,
|
|
Sender: "parser",
|
|
Line: line,
|
|
Column: col,
|
|
Token: token,
|
|
OrigError: errors.New(msg),
|
|
}
|
|
}
|
|
|
|
// Wraps all nodes between starting tag and "{% endtag %}" and provides
|
|
// one simple interface to execute the wrapped nodes.
|
|
// It returns a parser to process provided arguments to the tag.
|
|
func (p *Parser) WrapUntilTag(names ...string) (*NodeWrapper, *Parser, *Error) {
|
|
wrapper := &NodeWrapper{}
|
|
|
|
var tagArgs []*Token
|
|
|
|
for p.Remaining() > 0 {
|
|
// New tag, check whether we have to stop wrapping here
|
|
if p.Peek(TokenSymbol, "{%") != nil {
|
|
tagIdent := p.PeekTypeN(1, TokenIdentifier)
|
|
|
|
if tagIdent != nil {
|
|
// We've found a (!) end-tag
|
|
|
|
found := false
|
|
for _, n := range names {
|
|
if tagIdent.Val == n {
|
|
found = true
|
|
break
|
|
}
|
|
}
|
|
|
|
// We only process the tag if we've found an end tag
|
|
if found {
|
|
// Okay, endtag found.
|
|
p.ConsumeN(2) // '{%' tagname
|
|
|
|
for {
|
|
if p.Match(TokenSymbol, "%}") != nil {
|
|
// Okay, end the wrapping here
|
|
wrapper.Endtag = tagIdent.Val
|
|
return wrapper, newParser(p.template.name, tagArgs, p.template), nil
|
|
}
|
|
t := p.Current()
|
|
p.Consume()
|
|
if t == nil {
|
|
return nil, nil, p.Error("Unexpected EOF.", p.lastToken)
|
|
}
|
|
tagArgs = append(tagArgs, t)
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
// Otherwise process next element to be wrapped
|
|
node, err := p.parseDocElement()
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
wrapper.nodes = append(wrapper.nodes, node)
|
|
}
|
|
|
|
return nil, nil, p.Error(fmt.Sprintf("Unexpected EOF, expected tag %s.", strings.Join(names, " or ")),
|
|
p.lastToken)
|
|
}
|
|
|
|
// Skips all nodes between starting tag and "{% endtag %}"
|
|
func (p *Parser) SkipUntilTag(names ...string) *Error {
|
|
for p.Remaining() > 0 {
|
|
// New tag, check whether we have to stop wrapping here
|
|
if p.Peek(TokenSymbol, "{%") != nil {
|
|
tagIdent := p.PeekTypeN(1, TokenIdentifier)
|
|
|
|
if tagIdent != nil {
|
|
// We've found a (!) end-tag
|
|
|
|
found := false
|
|
for _, n := range names {
|
|
if tagIdent.Val == n {
|
|
found = true
|
|
break
|
|
}
|
|
}
|
|
|
|
// We only process the tag if we've found an end tag
|
|
if found {
|
|
// Okay, endtag found.
|
|
p.ConsumeN(2) // '{%' tagname
|
|
|
|
for {
|
|
if p.Match(TokenSymbol, "%}") != nil {
|
|
// Done skipping, exit.
|
|
return nil
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
t := p.Current()
|
|
p.Consume()
|
|
if t == nil {
|
|
return p.Error("Unexpected EOF.", p.lastToken)
|
|
}
|
|
}
|
|
|
|
return p.Error(fmt.Sprintf("Unexpected EOF, expected tag %s.", strings.Join(names, " or ")), p.lastToken)
|
|
}
|