53 Commits

Author SHA1 Message Date
Mr McClain
ab9423ec1f Fixed Security Issue (#380)
* fixed security issue

* fixed security issue

* fixed security issue

* fixed security issue

* fixed security issue

* fixed security issue
2016-04-14 10:12:00 -05:00
Mr McClain
93d3481527 Addresses #379 2016-04-14 08:06:50 -05:00
Adarnof
361e4a6409 Prompt users to join TS when creating account
- will allow groups to sync
 - add button to get back to this prompt
 - do not sync groups until joined server
Closes #331
2016-03-26 03:08:28 +00:00
Mr McClain
5839d64cb7 Updated Logging because I cant Spell 2016-02-07 15:28:58 -06:00
Mr McClain
56ddee22f8 Updated Logging To remove spam from logs. 2016-02-07 15:24:19 -06:00
Adarnof
2db7a71e9d Removed exc_info kwarg from logger.exception statements 2016-01-31 19:42:01 +00:00
Adarnof
08cd2c1f1a Corrections for typos in logging.
Rephrased EveManager exceptions to reflect determination id is not of type rather than failure of function.
2016-01-03 20:08:44 +00:00
Adarnof
cd44f00881 Finished auditing service manager logging. 2015-12-30 11:22:40 +00:00
Adarnof
3f359ecae1 Logging added to all service managers.
Unrelated, getting ImportError when trying to start shell. I broke something.
2015-12-29 22:44:17 +00:00
Adarnof
235385ce39 Added more logging to TS3 manager. 2015-12-28 18:07:14 +00:00
Adarnof
1cc3b2a6b7 Fixed Issue #77 Teamspeak3 Manger errors prevent run_databaseUpdate from completing
Wrapped _sync_ts_group_db in a try/catch block until we abstract services into their own apps
2015-11-07 05:33:46 +00:00
Adarnof
b7327a34d0 Corrected reference to misnamed group. 2015-11-07 00:46:44 +00:00
Brett Costabile
15e959b265 Merged with R4stl1n master
Had to resolve a small conflict in email. Replaced mine with upstream.
2015-11-05 22:37:37 -05:00
Brett Costabile
c9958ebbb5 Removed all my logging
I'm done. Don't need this anymore.
2015-11-03 01:18:08 -05:00
Brett Costabile
c8d7ea2ca9 FUCKING MAPS AND LISTS
FUUUUUUUUUUUUUUUUUUUUUCK
2015-11-03 00:53:44 -05:00
Brett Costabile
b2eadc2a78 logging
yes more
2015-11-03 00:46:35 -05:00
Brett Costabile
adcbcdaf52 Casting int to str
because it's better than trying to compare them shithead
2015-11-03 00:41:37 -05:00
Brett Costabile
5a03565f86 So close
but no qute
2015-11-02 23:43:21 -05:00
Brett Costabile
e9a2cb54b1 Lists and maps
it's important to remember which one you're working with
2015-11-02 23:34:54 -05:00
Brett Costabile
876ac6f3a2 Strings and ints
I was comparing them. That was dumb
2015-11-02 23:30:00 -05:00
Brett Costabile
ba1e11d182 Can I stop yet? 2015-11-02 23:21:38 -05:00
Brett Costabile
bba5bc33c4 Logging
I'm tired
2015-11-02 23:16:59 -05:00
Brett Costabile
d7933f5311 Logging
Even more
2015-11-02 23:08:02 -05:00
Brett Costabile
9c0d980bfa logging
I broke it again
2015-11-02 22:46:26 -05:00
Brett Costabile
385533a9b5 filter
It's not plural
2015-11-02 22:15:24 -05:00
Brett Costabile
560673767a syntax
get some
2015-11-02 22:12:49 -05:00
Brett Costabile
d3d1463404 Version conflict
update_or_insert is from a newer version of django. gotta use .save()
2015-11-02 22:08:32 -05:00
Brett Costabile
425aef081d Add/Remove user need sting inputs
Had to cast groupid to str
2015-11-02 00:49:34 -05:00
Brett Costabile
8a0e3f309d More logging
Groups aren't adding now. Gotta make the logging better in
update_groups()
2015-11-02 00:41:31 -05:00
Brett Costabile
f0527a5479 mistake
forgot to change one instance of groupname to groupid
2015-11-02 00:23:12 -05:00
Brett Costabile
c81b676553 remove_user_from_group
Mirrored changes from add_user_from_group() remove_user_from_group()
2015-11-02 00:14:58 -05:00
Brett Costabile
6abd62960f Small error
If statement with bad syntax
2015-11-01 23:50:26 -05:00
Brett Costabile
7039cffddb Fixing Server Admin assignment
Changed _add_user_to_group() to take group ID instead of group name.
addgroups and remgroups are now lists instead of dictionaries because I
don't need the group names anymore.
Removed debug logging from _add_user_to_group() and send_command()
2015-11-01 23:40:34 -05:00
Brett Costabile
478d855d62 Logging
It looks like the escaping is fine, but there's two "Server Admin"
groups (id3 and id6) which might be messing with the assignment.
2015-11-01 18:19:56 -05:00
Brett Costabile
2eb0bd5221 More indentation
Notepad++ was configured to use tabs instead of spaces. That shouldn't
happen anymore.
2015-11-01 17:53:10 -05:00
Brett Costabile
ee3fe5e43e More logging
Added more debug logging to figure out why Server Admin never gets
assigned.
2015-11-01 17:49:53 -05:00
Brett Costabile
df659c4851 Copypaste error
user_ts_group_key should have been ts_group_key
2015-11-01 17:34:01 -05:00
Brett Costabile
94ef8ce694 Indentation
I broke it. Now it's fixed.
2015-11-01 17:32:08 -05:00
Brett Costabile
cddd2b91e4 changed group key type
Why did I even think long was a good idea?
2015-11-01 17:28:41 -05:00
Brett Costabile
2bfbd614e6 Adjusted logging
Changed logging to make a little more sense during debugging
2015-11-01 17:27:04 -05:00
Brett Costabile
b76bc2729c More random changes
Super disorganized here. Trying to get back to a working state
2015-11-01 16:41:16 -05:00
Adarnof
e98bc36a9c Removed all dependency on alliance membership
Renamed permission 'alliance_member' 'member'
Renamed multiple variables in settings.py and associated handlers in util

Maybe it still works?
2015-09-17 04:42:36 +00:00
Brett Costabile
c86ba4990d Lots of changes, not tested
Pushing latest changes to run them by a few folks.
2015-05-28 01:23:45 -04:00
Brett Costabile
423e0ad161 Added function to sync TS3 groups 2015-05-26 01:22:42 -04:00
Trent Bartlem
8729f5b838 Update teamspeak3_manager.py
Sanitise both username and corp ticker at the same time.
2014-12-31 23:06:08 +10:00
Raynaldo Rivera
de34d35add Fixed issue where syncgroups were preventing other groups from being created if a service is added after. 2014-11-29 16:01:23 -07:00
Raynaldo Rivera
eb723254f2 Added ts3 lib fix 2014-11-24 18:03:44 -07:00
Raynaldo Rivera
81768983d8 Added teamspeak3 group fix 2014-11-23 17:39:28 -07:00
Raynaldo Rivera
1695073c3c Added teamspeak3 group fix 2014-11-23 16:21:11 -07:00
Raynaldo Rivera
30356687ef Added teamspeak3 fix 2014-11-23 14:12:12 -07:00