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>
222 lines
7.3 KiB
Go
222 lines
7.3 KiB
Go
package jet
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"path"
|
|
"path/filepath"
|
|
"reflect"
|
|
"sync"
|
|
"text/template"
|
|
)
|
|
|
|
// Set is responsible to load, parse and cache templates.
|
|
// Every Jet template is associated with a Set.
|
|
type Set struct {
|
|
loader Loader
|
|
cache Cache
|
|
escapee SafeWriter // escapee to use at runtime
|
|
globals VarMap // global scope for this template set
|
|
gmx *sync.RWMutex // global variables map mutex
|
|
extensions []string
|
|
developmentMode bool
|
|
leftDelim string
|
|
rightDelim string
|
|
}
|
|
|
|
// Option is the type of option functions that can be used in NewSet().
|
|
type Option func(*Set)
|
|
|
|
// NewSet returns a new Set relying on loader. NewSet panics if a nil Loader is passed.
|
|
func NewSet(loader Loader, opts ...Option) *Set {
|
|
if loader == nil {
|
|
panic(errors.New("jet: NewSet() must not be called with a nil loader"))
|
|
}
|
|
|
|
s := &Set{
|
|
loader: loader,
|
|
cache: &cache{},
|
|
escapee: template.HTMLEscape,
|
|
globals: VarMap{},
|
|
gmx: &sync.RWMutex{},
|
|
extensions: []string{
|
|
"", // in case the path is given with the correct extension already
|
|
".jet",
|
|
".html.jet",
|
|
".jet.html",
|
|
},
|
|
}
|
|
|
|
for _, opt := range opts {
|
|
opt(s)
|
|
}
|
|
|
|
return s
|
|
}
|
|
|
|
// WithCache returns an option function that sets the cache to use for template parsing results.
|
|
// Use InDevelopmentMode() to disable caching of parsed templates. By default, Jet uses a
|
|
// concurrency-safe in-memory cache that holds templates forever.
|
|
func WithCache(c Cache) Option {
|
|
if c == nil {
|
|
panic(errors.New("jet: WithCache() must not be called with a nil cache"))
|
|
}
|
|
return func(s *Set) {
|
|
s.cache = c
|
|
}
|
|
}
|
|
|
|
// WithSafeWriter returns an option function that sets the escaping function to use when executing
|
|
// templates. By default, Jet uses a writer that takes care of HTML escaping. Pass nil to disable escaping.
|
|
func WithSafeWriter(w SafeWriter) Option {
|
|
return func(s *Set) {
|
|
s.escapee = w
|
|
}
|
|
}
|
|
|
|
// WithDelims returns an option function that sets the delimiters to the specified strings.
|
|
// Parsed templates will inherit the settings. Not setting them leaves them at the default: `{{` and `}}`.
|
|
func WithDelims(left, right string) Option {
|
|
return func(s *Set) {
|
|
s.leftDelim = left
|
|
s.rightDelim = right
|
|
}
|
|
}
|
|
|
|
// WithTemplateNameExtensions returns an option function that sets the extensions to try when looking
|
|
// up template names in the cache or loader. Default extensions are `""` (no extension), `".jet"`,
|
|
// `".html.jet"`, `".jet.html"`. Extensions will be tried in the order they are defined in the slice.
|
|
// WithTemplateNameExtensions panics when you pass in a nil or empty slice.
|
|
func WithTemplateNameExtensions(extensions []string) Option {
|
|
if len(extensions) == 0 {
|
|
panic(errors.New("jet: WithTemplateNameExtensions() must not be called with a nil or empty slice of extensions"))
|
|
}
|
|
return func(s *Set) {
|
|
s.extensions = extensions
|
|
}
|
|
}
|
|
|
|
// InDevelopmentMode returns an option function that toggles development mode on, meaning the cache will
|
|
// always be bypassed and every template lookup will go to the loader.
|
|
func InDevelopmentMode() Option {
|
|
return func(s *Set) {
|
|
s.developmentMode = true
|
|
}
|
|
}
|
|
|
|
// GetTemplate tries to find (and parse, if not yet parsed) the template at the specified path.
|
|
//
|
|
// For example, GetTemplate("catalog/products.list") with extensions set to []string{"", ".html.jet",".jet"}
|
|
// will try to look for:
|
|
// 1. catalog/products.list
|
|
// 2. catalog/products.list.html.jet
|
|
// 3. catalog/products.list.jet
|
|
// in the set's templates cache, and if it can't find the template it will try to load the same paths via
|
|
// the loader, and, if parsed successfully, cache the template (unless running in development mode).
|
|
func (s *Set) GetTemplate(templatePath string) (t *Template, err error) {
|
|
return s.getSiblingTemplate(templatePath, "/", true)
|
|
}
|
|
|
|
func (s *Set) getSiblingTemplate(templatePath, siblingPath string, cacheAfterParsing bool) (t *Template, err error) {
|
|
templatePath = filepath.ToSlash(templatePath)
|
|
siblingPath = filepath.ToSlash(siblingPath)
|
|
if !path.IsAbs(templatePath) {
|
|
siblingDir := path.Dir(siblingPath)
|
|
templatePath = path.Join(siblingDir, templatePath)
|
|
}
|
|
return s.getTemplate(templatePath, cacheAfterParsing)
|
|
}
|
|
|
|
// same as GetTemplate, but doesn't cache a template when found through the loader.
|
|
func (s *Set) getTemplate(templatePath string, cacheAfterParsing bool) (t *Template, err error) {
|
|
if !s.developmentMode {
|
|
t, found := s.getTemplateFromCache(templatePath)
|
|
if found {
|
|
return t, nil
|
|
}
|
|
}
|
|
|
|
t, err = s.getTemplateFromLoader(templatePath, cacheAfterParsing)
|
|
if err == nil && cacheAfterParsing && !s.developmentMode {
|
|
s.cache.Put(templatePath, t)
|
|
}
|
|
return t, err
|
|
}
|
|
|
|
func (s *Set) getTemplateFromCache(templatePath string) (t *Template, ok bool) {
|
|
// check path with all possible extensions in cache
|
|
for _, extension := range s.extensions {
|
|
canonicalPath := templatePath + extension
|
|
if t := s.cache.Get(canonicalPath); t != nil {
|
|
return t, true
|
|
}
|
|
}
|
|
return nil, false
|
|
}
|
|
|
|
func (s *Set) getTemplateFromLoader(templatePath string, cacheAfterParsing bool) (t *Template, err error) {
|
|
// check path with all possible extensions in loader
|
|
for _, extension := range s.extensions {
|
|
canonicalPath := templatePath + extension
|
|
if found := s.loader.Exists(canonicalPath); found {
|
|
return s.loadFromFile(canonicalPath, cacheAfterParsing)
|
|
}
|
|
}
|
|
return nil, fmt.Errorf("template %s could not be found", templatePath)
|
|
}
|
|
|
|
func (s *Set) loadFromFile(templatePath string, cacheAfterParsing bool) (template *Template, err error) {
|
|
f, err := s.loader.Open(templatePath)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer f.Close()
|
|
content, err := ioutil.ReadAll(f)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return s.parse(templatePath, string(content), cacheAfterParsing)
|
|
}
|
|
|
|
// Parse parses `contents` as if it were located at `templatePath`, but won't put the result into the cache.
|
|
// Any referenced template (e.g. via `extends` or `import` statements) will be tried to be loaded from the cache.
|
|
// If a referenced template has to be loaded and parsed, it will also not be put into the cache after parsing.
|
|
func (s *Set) Parse(templatePath, contents string) (template *Template, err error) {
|
|
templatePath = filepath.ToSlash(templatePath)
|
|
switch path.Base(templatePath) {
|
|
case ".", "/":
|
|
return nil, errors.New("template path has no base name")
|
|
}
|
|
// make sure it's absolute and clean it
|
|
templatePath = path.Join("/", templatePath)
|
|
|
|
return s.parse(templatePath, contents, false)
|
|
}
|
|
|
|
// AddGlobal adds a global variable into the Set,
|
|
// overriding any value previously set under the specified key.
|
|
// It returns the Set it was called on to allow for method chaining.
|
|
func (s *Set) AddGlobal(key string, i interface{}) *Set {
|
|
s.gmx.Lock()
|
|
defer s.gmx.Unlock()
|
|
s.globals[key] = reflect.ValueOf(i)
|
|
return s
|
|
}
|
|
|
|
// LookupGlobal returns the global variable previously set under the specified key.
|
|
// It returns the nil interface and false if no variable exists under that key.
|
|
func (s *Set) LookupGlobal(key string) (val interface{}, found bool) {
|
|
s.gmx.RLock()
|
|
defer s.gmx.RUnlock()
|
|
val, found = s.globals[key]
|
|
return
|
|
}
|
|
|
|
// AddGlobalFunc adds a global function into the Set,
|
|
// overriding any function previously set under the specified key.
|
|
// It returns the Set it was called on to allow for method chaining.
|
|
func (s *Set) AddGlobalFunc(key string, fn Func) *Set {
|
|
return s.AddGlobal(key, fn)
|
|
}
|