b1ackd0t
3e7bac493c
NOISSUE - Sync Env Veriables With Docker Deployment ( #1841 )
...
* Initial Commit: Sync Env Veriables With Docker Deployment
Signed-off-by: rodneyosodo <blackd0t@protonmail.com>
* Sync Env Vars With Master
Signed-off-by: rodneyosodo <blackd0t@protonmail.com>
* Remove Altprefix
Signed-off-by: rodneyosodo <blackd0t@protonmail.com>
* Rename HttpPort to HTTPPort
Signed-off-by: rodneyosodo <blackd0t@protonmail.com>
* Fix envPrefixDB After Rebase
Signed-off-by: rodneyosodo <blackd0t@protonmail.com>
* Remove Server Parse
Signed-off-by: rodneyosodo <blackd0t@protonmail.com>
* Add Provision For TLS on CoAP
Signed-off-by: rodneyosodo <blackd0t@protonmail.com>
* Fix Exit After Defer
Signed-off-by: rodneyosodo <blackd0t@protonmail.com>
* Remove Unused Function
Signed-off-by: rodneyosodo <blackd0t@protonmail.com>
* Document Undocumentated Env Variables
Signed-off-by: rodneyosodo <blackd0t@protonmail.com>
---------
Signed-off-by: rodneyosodo <blackd0t@protonmail.com>
Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
2023-07-31 14:38:35 +02:00
Dušan Borovčanin
55e09c1921
MF-1506 - Group-based Access Control ( #1716 )
...
* 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>
2023-06-14 12:40:37 +02:00
Sammy Kerata Oina
83ff4e12ea
MF-512 - Change service default ports ( #1737 )
...
* Change service Default ports
Updated ports:
- auth http 9000
- auth grpc 7000
- provision http 9001
- things http 9002
- things auth http 9003
- things auth grpc 7001
- twins http 9004
- users http 9005
- bootstrap http 9006
- cassandra-reader http 9007
- cassandra-writer http 9008
- influxdb-reader http 9009
- influxdb-writer http 9010
- lora http 9011
- mongodb reader http 9012
- mongodb writer http 9013
- postgres-reader http 9014
- postgrs-writer http 9015
- smpp-notifier http 9016
- smtp-notifier http 9017
- timescale-reader http 9018
- timescale-writer http 9019
Signed-off-by: SammyOina <sammyoina@gmail.com>
* change default service ports on env and sh
Signed-off-by: SammyOina <sammyoina@gmail.com>
* change things url default port
Signed-off-by: SammyOina <sammyoina@gmail.com>
* change default ports order by importance
- auth http 9000
- auth grpc 7000
- things http 9001
- things auth http 9002
- things auth grpc 7001
- users http 9003
- cassandra-reader http 9004
- cassandra-writer http 9005
- influxdb-reader http 9006
- influxdb-writer http 9007
- mongodb reader http 9008
- mongodb writer http 9009
- postgres-reader http 9010
- postgres-writer http 9011
- timescale-reader http 9012
- timescale-writer http 9013
- bootstrap http 9014
- smpp-notifier http 9015
- smtp-notifier http 9016
- provision http 9017
- lora http 9018
- twins http 9019
Signed-off-by: SammyOina <sammyoina@gmail.com>
* lower port number in auth service
Signed-off-by: SammyOina <sammyoina@gmail.com>
* change things and users port
- things 9000
- things auth 9001
- things auth grpc 7000
- users 9002
Signed-off-by: SammyOina <sammyoina@gmail.com>
* update documentaton to new port numbers
Signed-off-by: SammyOina <sammyoina@gmail.com>
* update test and metrics
Signed-off-by: SammyOina <sammyoina@gmail.com>
* update host on metrics
Signed-off-by: SammyOina <sammyoina@gmail.com>
* resolving conflics
Signed-off-by: SammyOina <sammyoina@gmail.com>
* set http adapter port to :80
Signed-off-by: SammyOina <sammyoina@gmail.com>
* reassign http port on metrics to :80
Signed-off-by: SammyOina <sammyoina@gmail.com>
* reassign http adapter port
Signed-off-by: SammyOina <sammyoina@gmail.com>
* set http adapter port to 8008
Signed-off-by: SammyOina <sammyoina@gmail.com>
* document http adapter default port
Signed-off-by: SammyOina <sammyoina@gmail.com>
---------
Signed-off-by: SammyOina <sammyoina@gmail.com>
2023-03-23 21:55:11 +01:00
Aryan Godara
8a4cc12cd3
MF-1623 - Bring back WebSocket Adapter ( #1625 )
...
Signed-off-by: aryan <aryangodara03@gmail.com>
2022-09-16 14:07:12 +02:00
b1ackd0t
2abf9da27e
MF-1008 - Make token duration configurable ( #1550 )
...
* Make token duration configurable
Signed-off-by: 0x6f736f646f <blackd0t@protonmail.com>
* Change env variable name
Signed-off-by: 0x6f736f646f <blackd0t@protonmail.com>
* Add MF_AUTH_LOGIN_TOKEN_DURATION in environment variable
Signed-off-by: 0x6f736f646f <blackd0t@protonmail.com>
* Change tests
Signed-off-by: 0x6f736f646f <blackd0t@protonmail.com>
* Document MF_AUTH_LOGIN_TOKEN_DURATION
Signed-off-by: 0x6f736f646f <blackd0t@protonmail.com>
* Change default login duration
Signed-off-by: 0x6f736f646f <blackd0t@protonmail.com>
* Change declaration of loginduration
Signed-off-by: 0x6f736f646f <blackd0t@protonmail.com>
* Add space after port
Signed-off-by: 0x6f736f646f <blackd0t@protonmail.com>
* Change time to hours
Signed-off-by: 0x6f736f646f <blackd0t@protonmail.com>
* Remove constant login duration
Signed-off-by: 0x6f736f646f <blackd0t@protonmail.com>
* Keep back recovery duration
Signed-off-by: 0x6f736f646f <blackd0t@protonmail.com>
* Change docs for login token duration
Signed-off-by: 0x6f736f646f <blackd0t@protonmail.com>
* Change login description
Signed-off-by: 0x6f736f646f <blackd0t@protonmail.com>
* Remove blank lines
Signed-off-by: 0x6f736f646f <blackd0t@protonmail.com>
2022-01-25 19:42:41 +01:00
Mirko Teodorovic
530f925c4d
MF-1346 - Create Groups API - add grouping of entities ( #1334 )
...
* remove owner id
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add users endpoint for retrieving users from group
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* remove groups from things and users
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* move groups into auth
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* separate endpoints for users and things
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix problems with retrieving members
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add groups test
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* remove groups from users
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* remove groups from things
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* rename constant
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add new errors
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* remove unnecessary constants
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix validation
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* create groups db mock
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* adding tests
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* revert changes to docker related files
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* remove groups endpoints from users openapi
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* remove groups endpoints from users openapi
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* move constant from postgres to groups
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* move constant from postgres to groups
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* move constant from postgres to groups
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* remove testing group
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* renam typ to groupType
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add error for max level
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* remove print
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* remove groups.Member interface
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix query building and add test cases
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* uncomment tests
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* move groups package
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* remove group type, add bulk assign and unassign
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* update openapi, remove parentID from create request, reorder endpoints
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* update openapi
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* update openapi for users and things
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix groups test
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix linter errors
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* resolve comments
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* rename assignReq structure
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* refactor mocks, response, remove type from endpoint
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* some refactor, renaming, errors
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* simplify check
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* remove package alias
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix naming and comment
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* additional comments
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add members grpc endpoint test
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix retrieving members for different types
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix retrieving members for different types
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* remove unecessary structure
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix api grpc
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* rename const
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* refactore retrieve parents and children with common function
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* small changes for errors
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix compile error
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix sorting in mock
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* remove regexp for groups
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* revert as change is made by mistake
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* revert as change is made by mistake
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* refactor groups and keys package
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix naming
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix naming
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix test for timestamp compare
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix error handling
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* remove errors not being used
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* var renaming
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* resolve comments
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* minor changes
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix test
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add endpoints for groups into nginx
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* reorganize endpoints, remove some errors
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* reorganize endpoints, remove some errors
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* small fix
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix linter errors
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* minor changes
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* resolve comments
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix group save path problem
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* description constant
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* rename variables
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix validation
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* get back return
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix compile
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
2021-03-04 10:29:03 +01:00
Ivan Milošević
7bcaa323d4
MF-1317 - Configurable regexp rule for password ( #1355 )
...
* read and validate regex envar
Signed-off-by: Ivan Milosevic <iva@blokovi.com>
* pass regexp to user/api
Signed-off-by: Ivan Milosevic <iva@blokovi.com>
* resolve conflicts
Signed-off-by: Ivan Milosevic <iva@blokovi.com>
* use exported regexp variable
Signed-off-by: Ivan Milosevic <iva@blokovi.com>
* move password validation from users package
Signed-off-by: Ivan Milosevic <iva@blokovi.com>
* remove dead code
Signed-off-by: Ivan Milosevic <iva@blokovi.com>
* add password change request
Signed-off-by: Ivan Milosevic <iva@blokovi.com>
* move regexp from api to users package
Signed-off-by: Ivan Milosevic <iva@blokovi.com>
* fix tests
Signed-off-by: Ivan Milosevic <iva@blokovi.com>
* remove commented code
Signed-off-by: Ivan Milosevic <iva@blokovi.com>
* add regexp as field in userService, remove it as user exported global var
Signed-off-by: Ivan Milosevic <iva@blokovi.com>
* add passwd validation in service
Signed-off-by: Ivan Milosevic <iva@blokovi.com>
* Add psswd validation for change password in service
Signed-off-by: Ivan Milosevic <iva@blokovi.com>
* add password validation in password reset
Signed-off-by: Ivan Milosevic <iva@blokovi.com>
* Remove password validation from user validation test
Signed-off-by: Ivan Milosevic <iva@blokovi.com>
* Replace email and passwords in test with constants
Signed-off-by: Ivan Milosevic <iva@blokovi.com>
* compile error not fail silently
Signed-off-by: Ivan Milosevic <iva@blokovi.com>
* fix tempate path
Signed-off-by: Ivan Milosevic <iva@blokovi.com>
2021-03-01 15:22:57 +01:00
Dušan Borovčanin
31f5bf714a
NOISSUE - Fix run script and compiler warnings ( #1336 )
...
* Fix NATS server naming in run script
Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com>
* Fix warnings
Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com>
* Fix typo
Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com>
2021-01-26 01:07:06 +01:00
Manuel Imperiale
ac09815457
NOISSUE - Fix Auth typo ( #1319 )
...
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2021-01-11 10:00:13 +01:00
Mirko Teodorovic
47217cb5b9
NOISSUE - Merge authz and authn into new service auth ( #1313 )
...
* remove owner id
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* move authz into authn and merge into new service
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add groups
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add groups
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add groups endpoints
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add group type
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* adding mocks, some renaming, refactor
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* update proto
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* adding mocks, some renaming, refactor
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix linter err,and comments
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* undo renaming, add interface for authn and authz
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* renam some variables
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* renaming
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* remove extra slashes from comment
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* resolving small remarks
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
2020-12-29 23:02:35 +01:00
Manuel Imperiale
01aa4190c5
MF-1087 - Remove WebSocket adapter ( #1120 )
...
* MF-1087 - Remove WebSocket adapter
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm all ws directory
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert authorization.js
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove /ws endpoint from ssl/authorization.js
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm gorilla from vendor
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert gorilla to vendor
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-04-17 13:16:21 +02:00
Manuel Imperiale
6c39c85cc8
MF-1096 - Fix AuthN and Things Auth ENVARS ( #1066 )
...
* NOISSUE - Fix AuthN and Things Auth ENVARS
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Add DB envars to env.go
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix envars
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Add DefLogLLevelError
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix DB names
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix DB names
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix DB names and HTTP ports
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix .env
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert writers DB names
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unused Twins envars
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove definitions from env.go
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert HTTP gRPC ports
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use default NATS URL as string
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert default ports
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix cassandra ENVARS
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix cassandra reader ENVARS
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix readers and writers envars
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix readers and writers .env
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-04-07 12:02:17 +02:00
Ivan Milošević
d2153a8846
[NOISSUE] - Improve errors package ( #1086 )
...
* Init commit - implement errors package on things service
Signed-off-by: Ivan Milošević <iva@blokovi.com>
* things service errors issue
Signed-off-by: Ivan Milošević <iva@blokovi.com>
* Decode errors
Add authn service to run script
Signed-off-by: Ivan Milošević <iva@blokovi.com>
* Modify tests
Signed-off-by: Ivan Milošević <iva@blokovi.com>
* service_test
Signed-off-by: Ivan Milošević <iva@blokovi.com>
* debug lines
Signed-off-by: Ivan Milošević <iva@blokovi.com>
* Regulate tests
Signed-off-by: Ivan Milošević <iva@blokovi.com>
* Improve errors in Redis
Signed-off-by: Ivan Milošević <iva@blokovi.com>
* Remove dead code
Inline if conditions
Rename err var
Signed-off-by: Ivan Milošević <iva@blokovi.com>
* Transform errors messages to lowercase
Signed-off-by: Ivan Milošević <iva@blokovi.com>
* improve errors package
Signed-off-by: Ivan Milošević <iva@blokovi.com>
* modify wrap method
inline wrapping errors in redis
Signed-off-by: Ivan Milošević <iva@blokovi.com>
* Add copyright to errors package
Signed-off-by: Ivan Milošević <iva@blokovi.com>
* wrapping nil error returns wrapper (instead of nil)
Signed-off-by: Ivan Milošević <iva@blokovi.com>
* move response messages in test to vars
Signed-off-by: Ivan Milošević <iva@blokovi.com>
* golangcibot review fix
Signed-off-by: Ivan Milošević <iva@blokovi.com>
* golangbot fix review in transport
Signed-off-by: Ivan Milošević <iva@blokovi.com>
2020-03-30 15:22:18 +02:00
Drasko DRASKOVIC
d587921eda
Merged MQTT docker compose in core composition file ( #1060 )
...
Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com>
2020-03-05 13:34:07 +01:00
Nikola Marčetić
dcba41e8c4
Removed VerneMQ auth plugin, Aedes impl. Added mproxy support in docker ( #1049 )
...
Signed-off-by: Nikola Marcetic <n.marcetic86@gmail.com>
2020-03-01 23:55:43 +01:00
Mirko Teodorovic
9e8dd4b149
MF-942 - Fix email template logic ( #944 )
...
* fix email template
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* rename resetPasswEmail.tmpl
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add env var
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* rename resetPasswEmail.tmpl
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* rename resetPasswEmail.tmpl
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* upd docs
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* upd docs
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* upd docs
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* remove not needed file
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* move email tmpl
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* move email tmpl
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* move email tmpl
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* variable for tmpl
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix ident and caps
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
2019-11-11 12:13:48 +01:00
Dušan Borovčanin
f50335ab33
MF-919 - Mainflux message updates ( #924 )
...
* Remove RawMessage
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Remove Normalizer
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Update tests
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Replace normalizer with senml-transformer
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Rename Transformer interface and package
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Update docs
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Remove SenML transformer service
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Remove SenML Protobuf support
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Fix readers
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Fix writers tests
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Refactor tests and remove normalizer
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Update docs
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Reanme Service interface to Transformer
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Use msg instead of rawmsg
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Remove rawMsg from Aedes code
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Fix VerneMQ files
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Remove RawMessage code
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Fix missing subtopic return
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Remove remaining RawMessage reference
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Fix formatting
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Fix readers and writers tests
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Rename SenML transformer variables
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
* Fix readers and writers tests constants
Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2019-11-05 11:57:16 +01:00
Mirko Teodorovic
ecc15b64b6
MF-859 - Channels metadata search ( #867 )
...
* add users metadata
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add users metadata
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add metadata to users
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add metadata to users
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* run.sh
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add metadata to users
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add default value for metadata
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add default value for metadata
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* when metadata is not set dont save 'null' string
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* when metadata is not set dont save 'null' string
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add metadata to channels
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add metadata to channels
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* change metadata type, add error handling
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add pause
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* remove extra char
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* retype from string to []byte
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add metadata to channels
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add metadata to channels
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add wait logic for gnatsd
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* few small fixes
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix identityRes
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add metadata to channels
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add metadata to channels
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* add metadata to channels
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix waiting for gnatsd
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix waiting for gnatsd
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix waiting for gnatsd
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* changes to wait gnatsd logic
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* changes to wait gnatsd logic
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* testing query
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix query
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix query
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix merge problem
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* Update requests.go
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* Delete pwdrecovery.go
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix merge problem
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix merge problem
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* small change in comments
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* remove unused struct
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
* fix comments
Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
2019-10-01 14:12:52 +02:00
Drasko DRASKOVIC
3b19292966
NOISSUE - Add docker-compose for MQTT cluster ( #841 )
...
* Add MQTT cluster configs
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
* Bump worker_connections value in nginx.conf
Signed-off-by: drasko <drasko.draskovic@gmail.com>
* Revert config.toml
Signed-off-by: drasko <drasko.draskovic@gmail.com>
* Fix cluster
Signed-off-by: drasko <drasko.draskovic@gmail.com>
* Move non-ssl server into the same directive
Signed-off-by: drasko <drasko.draskovic@gmail.com>
* Fix cluster
Signed-off-by: drasko <drasko.draskovic@gmail.com>
* Remove unnecessary comments
Signed-off-by: drasko <drasko.draskovic@gmail.com>
* Organize docker-compose and nginx conf files
Signed-off-by: drasko <drasko.draskovic@gmail.com>
* Correct nginx.conf for mTLS and aux changes
Signed-off-by: drasko <drasko.draskovic@gmail.com>
* Fix NginX conf trailing slash in proxy_pass
Signed-off-by: drasko <drasko.draskovic@gmail.com>
* Fix path for MQTT
Signed-off-by: drasko <drasko.draskovic@gmail.com>
* Fix minorstuff in gitignore and comments
Signed-off-by: drasko <drasko.draskovic@gmail.com>
2019-09-12 16:55:24 +02:00
Ivan Milošević
b0a79436b8
Fix MF_THINGS_AUTH_GRPC_PORT in addons' docker-compose files ( #781 )
...
Signed-off-by: Ivan Milošević <iva@blokovi.com>
2019-07-11 23:19:08 +02:00
mteodor
c418a9a4cf
NOISSUE - Added normalizer service to run script ( #594 )
...
* Added normalizer service to be run
* Update run.sh
2019-02-13 12:05:29 +01:00
Dušan Borovčanin
bf299a0143
NOISSUE - Add .dockerignore to project root ( #457 )
...
* Add .dockerignore file to project root
Signed-off-by: Dusan Borovcanin <dusan.borovcanin@mainflux.com>
* Cleanup project root
Update run script and remove unused files from project root.
Signed-off-by: Dusan Borovcanin <dusan.borovcanin@mainflux.com>
* Remove .dockerignore form docker dir
Signed-off-by: Dusan Borovcanin <dusan.borovcanin@mainflux.com>
2018-11-13 22:31:13 +01:00
Drasko DRASKOVIC
9cacf5708b
NOISSUE - Add info log-level for development ( #427 )
...
Signed-off-by: drasko <drasko.draskovic@gmail.com>
2018-10-24 17:13:29 +02:00
Drasko DRASKOVIC
7e83b2d612
NOISSUE - Add system run script ( #350 )
...
* NOISSUE - Add system run script
Signed-off-by: drasko <drasko.draskovic@gmail.com>
* Add MQTT
Signed-off-by: drasko <drasko.draskovic@gmail.com>
* Add MQTT module install to Makefile. Fix warnings.
Signed-off-by: drasko <drasko.draskovic@gmail.com>
2018-08-16 19:52:43 +02:00