Commit graph

98 commits

Author SHA1 Message Date
Brian Martin
9509163464 Updates for XMPP
Updates for XMPP, seems to fix an issue with holding the rest of the asyncio loops hostage after a disconnect.
2019-05-18 15:55:00 -04:00
Brian Martin
d238ded6c1 Better MQTT logging and asyncio debug on
Better MQTT logging and asyncio debug on
2019-05-18 08:35:08 -04:00
Brian Martin
58919e1cbb
Merge pull request #24 from bmartin5692/remove_Context
Remove contextVars
2019-05-12 15:50:59 -04:00
Brian Martin
c4900be511 Fix db_path and test
Earlier commit broke the db_path and tests.....
2019-05-12 15:49:08 -04:00
Brian Martin
652a0b0e9b Fix command_responses
Final removal of contextvars
2019-05-12 15:42:47 -04:00
Brian Martin
d6816a02ec Remove vars
Start removal
2019-05-12 15:31:52 -04:00
Brian Martin
2683421c34 Fix startup and create db path
Fix for listen args and create db path if it doesn't exist
2019-05-12 15:20:10 -04:00
Brian Martin
17d7ee5f66 Individual log files
Log files per service - Closes #21
2019-05-03 09:00:05 -04:00
Brian Martin
6aedcd9050
Merge pull request #20 from bmartin5692/wip_asyncio
Wip asyncio
2019-04-16 20:49:02 -04:00
Brian Martin
bde8a7331e xmpp sleep to async
xmpp sleep to async
2019-04-16 20:42:41 -04:00
Brian Martin
b8f95d5b9c dont schedule pings if client disconnected
dont schedule pings if client disconnected
2019-03-22 09:58:03 -04:00
Brian Martin
437417929e WIP - Convert XMPP to Async
WIP - Convert XMPP to Async
2019-03-22 09:49:15 -04:00
Brian Martin
a296f038a7 rearrange start to use asyncio
Create an asyncio loop then start confservers, mqtt, and mqtthelper in loop.

TODO: Re-work xmpp for asyncio
2019-03-21 21:19:29 -04:00
Brian Martin
d5449961f3 Add --listen arg
A system with multiple nics had an issue with selecting the right IP to listen on.

Add --listen command-line arg.
Usage:
run_bumper.py --listen ip.address
2019-03-20 08:05:02 -04:00
Brian Martin
d9c5b5ee27 Update to xmpplogging
Move some connection related exceptions to debug log.
- Rename run_bumper to start_bumper and fix in README.
2019-03-19 08:58:56 -04:00
Brian Martin
5acc71b38c
Merge pull request #18 from bmartin5692/dev
Fix hardcoded IP
2019-03-18 23:48:28 -04:00
Brian Martin
9980e34717 Fix hardcoded IP
Fix hardcoded IP
2019-03-18 23:45:32 -04:00
Brian Martin
e37eeef78a
Merge pull request #17 from bmartin5692/dev
Remove contextvar
2019-03-18 23:43:11 -04:00
Brian Martin
059b405869 Merge branch 'dev' of https://github.com/bmartin5692/bumper into dev 2019-03-18 23:40:08 -04:00
Brian Martin
386f04c831
Merge pull request #16 from bmartin5692/dev
Tests and CI
2019-03-18 23:39:03 -04:00
Brian Martin
f29c9a70ff
Create appveyor.yml 2019-03-18 23:33:35 -04:00
Brian Martin
d2a95f0168
Update .travis.yml 2019-03-18 23:23:28 -04:00
Brian Martin
ccbfc2d58f
Update .travis.yml 2019-03-18 23:18:55 -04:00
Brian Martin
70b88a4e26
Create .travis.yml 2019-03-18 23:16:30 -04:00
Brian Martin
5efd5112a2 Cleanup remaining contextvar
Remove remaining context vars
Fix minor formatting
Rename bumper.py to run_bumper.py to remove conflict with module name
2019-03-18 13:13:38 -04:00
Brian Martin
a1ff95cc23 Add session to mqtt
Add session to mqtt
2019-03-17 11:35:52 -04:00
Brian Martin
4080f0f950 More confserver tests
More confserver tests, coverage 75%
2019-03-17 11:02:53 -04:00
Brian Martin
5392bef74f Additional tests for confserver
Additional tests for confserver
2019-03-15 09:05:54 -04:00
Brian Martin
747eeda4a5 Start adding tests for confserver
Start adding tests for confserver
2019-03-14 09:35:37 -04:00
Brian Martin
616729e97f full coverage for init
full coverage for init
- 100% coverage of db operations
2019-03-13 21:07:29 -04:00
Brian Martin
9580687aea
Merge pull request #15 from bmartin5692/tests
first test
2019-03-11 23:18:42 -04:00
Brian Martin
4d4f0f4e40
Merge branch 'master' into tests 2019-03-11 23:18:23 -04:00
Brian Martin
98b65bb808 first test
first test
2019-03-11 23:14:50 -04:00
Brian Martin
1f16249f28
Merge pull request #14 from bmartin5692/dev
update pyyaml to address vulnerability
2019-03-11 21:48:00 -04:00
Brian Martin
34136f4fbf update pyyaml to address vulnerability
update pyyaml to address vulnerability
2019-03-11 21:47:12 -04:00
Brian Martin
d7e73d7621
Merge pull request #13 from bmartin5692/dev
update gitignore and reformat files with black
2019-03-11 21:34:08 -04:00
Brian Martin
af3e4ab1ce reformat files with black
reformat files with black
2019-03-11 21:32:55 -04:00
Brian Martin
028399c496 Update gitignore, pipfile
Update gitignore, pipfile
2019-03-11 21:25:05 -04:00
Brian Martin
6e6f664857
Merge pull request #12 from bmartin5692/add-code-of-conduct-1
Create CODE_OF_CONDUCT.md
2019-03-11 21:12:28 -04:00
Brian Martin
ae21ed16ca
Create CODE_OF_CONDUCT.md 2019-03-11 21:12:15 -04:00
Brian Martin
2e59568744
Update issue templates 2019-03-11 21:10:27 -04:00
Brian Martin
5869b423d3
Merge pull request #11 from bmartin5692/tinydb
Tinydb added
2019-03-11 21:05:17 -04:00
Brian Martin
d6e853158c Fix revoke expired and remove disconnected
Fix revoke expired and remove disconnected
2019-03-11 21:01:47 -04:00
Brian Martin
09e41cbc6e Move tokens to new table
Move tokens to new table
- Authcode linked to token
2019-03-11 10:34:15 -04:00
Brian Martin
6994f5ae5e Remove old tokens and authcodes
Remove old tokens and authcodes
2019-03-09 10:45:45 -05:00
Brian Martin
8806e804f0 Updated confserver
Updated confserver to use tinydb and set users, tokens, authcodes
2019-03-03 10:28:52 -05:00
Brian Martin
a4fec85717 WIP: Bot and Client
- Using tinydb
- Bot and clients tracked in db
2019-03-02 16:33:56 -05:00
Brian Martin
6da029af6b
Merge pull request #9 from bmartin5692/Ozmo930
Ozmo930
2019-02-27 09:10:14 -05:00
Brian Martin
0f48d37103 Add Ozmo to README 2019-02-27 09:07:02 -05:00
Brian Martin
a7ce14eb9c additional optimizations and permission handling
Optimizations for handling XMPP data and commands

Basic permission handling - Add fuid users to bot
- Ozmo has ACLs and an "owner", if bot comes from eco to bumper the fuid_user won't have permissions
- Bumper will add the fuid_ user to bot ACLs and grant full
  - This can be used later when bumper adds proper auth to allow/block users
2019-02-27 09:05:23 -05:00