diff --git a/services/managers/eve_api_manager.py b/services/managers/eve_api_manager.py index d1621fa2..b2891401 100644 --- a/services/managers/eve_api_manager.py +++ b/services/managers/eve_api_manager.py @@ -95,7 +95,7 @@ class EveApiManager(): account = evelink.account.Account(api=api) info = account.key_info() logger.debug("API has mask %s, required is %s." % (info[0]['access_mask'], settings.MEMBER_API_MASK)) - return info[0]['access_mask'] & int(settings.MEMBER_API_MASK) == int(settings.MEMBER_API_MASK)) + return info[0]['access_mask'] & int(settings.MEMBER_API_MASK) == int(settings.MEMBER_API_MASK) except evelink.api.APIError as error: logger.exception("Unhandled APIError occured.", exc_info=True) diff --git a/services/managers/ipboard_manager.py b/services/managers/ipboard_manager.py index 3313215f..496818de 100755 --- a/services/managers/ipboard_manager.py +++ b/services/managers/ipboard_manager.py @@ -138,7 +138,7 @@ class IPBoardManager: @staticmethod def update_user_password(username, email): - logger.debug("Settings new IPBoard password for user %s" % username)) + logger.debug("Settings new IPBoard password for user %s" % username) plain_password = IPBoardManager.__generate_random_pass() IPBoardManager.update_user(username, email, plain_password) return plain_password diff --git a/services/managers/mumble_manager.py b/services/managers/mumble_manager.py index d40ac249..4306249a 100755 --- a/services/managers/mumble_manager.py +++ b/services/managers/mumble_manager.py @@ -110,7 +110,7 @@ class MumbleManager: row = dbcursor.fetchone() groupid = row[0] dbcursor.execute(MumbleManager.SQL_ADD_GROUP, [groupid, settings.MUMBLE_SERVER_ID, name]) - logger.info("Created group %s on mumble server with id %s" % (name, groupid) + logger.info("Created group %s on mumble server with id %s" % (name, groupid)) return groupid @staticmethod @@ -256,4 +256,4 @@ class MumbleManager: logger.debug("Deleting mumble user %s from group %s" % (userid, mumble_groups[g])) MumbleManager._del_user_from_group(userid, mumble_groups[g]) except: - logger.exception("Exception occured whule removing mumble user %s with id %s from group %s with id %s" % (username, userid, g, mumble_groups[g]), exc_info=True)) + logger.exception("Exception occured while removing mumble user %s with id %s from group %s with id %s" % (username, userid, g, mumble_groups[g]), exc_info=True) diff --git a/services/views.py b/services/views.py index 6ab727f4..595e76e0 100755 --- a/services/views.py +++ b/services/views.py @@ -36,8 +36,10 @@ logger = logging.getLogger(__name__) @login_required def fleet_formatter_view(request): + logger.debug("fleet_formatter_view called by user %s" % request.user) if request.method == 'POST': form = FleetFormatterForm(request.POST) + logger.debug("Received POST request containing form, valid: %s" % form.is_valid()) if form.is_valid(): generated = "Fleet Name: " + form.cleaned_data['fleet_name'] + "\n" generated = generated + "FC: " + form.cleaned_data['fleet_commander'] + "\n" @@ -51,9 +53,11 @@ def fleet_formatter_view(request): generated = generated + "Important: " + form.cleaned_data['important'] + "\n" if form.cleaned_data['comments'] != "": generated = generated + "Why: " + form.cleaned_data['comments'] + "\n" + logger.info("Formatted fleet broadcast for user %s" % request.user) else: form = FleetFormatterForm() generated = "" + logger.debug("Returning empty form to user %s" % request.user) context = {'form': form, 'generated': generated} @@ -62,12 +66,15 @@ def fleet_formatter_view(request): @login_required @permission_required('auth.jabber_broadcast') def jabber_broadcast_view(request): + logger.debug("jabber_broadcast_view called by user %s" % request.user) success = False if request.method == 'POST': form = JabberBroadcastForm(request.POST) + logger.debug("Received POST request containing form, valid: %s" % form.is_valid()) if form.is_valid(): user_info = AuthServicesInfo.objects.get(user=request.user) main_char = EveCharacter.objects.get(character_id=user_info.main_char_id) + logger.debug("Processing jabber broadcast for user %s with main character %s" % (user_info, main_char)) if user_info.main_char_id != "": message_to_send = form.cleaned_data['message'] + "\n##### SENT BY: " + "[" + main_char.corporation_ticker + "]" + main_char.character_name + " TO: " + form.cleaned_data['group'] + " WHEN: " + datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S") + " #####\n##### Replies are NOT monitored #####\n" group_to_send = form.cleaned_data['group'] @@ -81,8 +88,10 @@ def jabber_broadcast_view(request): OpenfireManager.send_broadcast_threaded(group_to_send, message_to_send,) success = True + logger.info("Sent jabber broadcast on behalf of user %s" % request.user) else: form = JabberBroadcastForm() + logger.debug("Returning blank form to user %s" % request.user) context = {'form': form, 'success': success} return render_to_response('registered/jabberbroadcast.html', context, context_instance=RequestContext(request)) @@ -90,6 +99,7 @@ def jabber_broadcast_view(request): @login_required def services_view(request): + logger.debug("services_view called by user %s" % request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) return render_to_response('registered/services.html', {'authinfo': authinfo}, @@ -103,184 +113,236 @@ def service_blue_alliance_test(user): @login_required @user_passes_test(service_blue_alliance_test) def activate_forum(request): + logger.debug("activate_forum called by user %s" % request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) # Valid now we get the main characters character = EveManager.get_character_by_id(authinfo.main_char_id) + logger.debug("Adding phpbb user for user %s with main character %s" % (request.user, character)) result = Phpbb3Manager.add_user(character.character_name, request.user.email, ['REGISTERED'], authinfo.main_char_id) # if empty we failed if result[0] != "": AuthServicesInfoManager.update_user_forum_info(result[0], result[1], request.user) + logger.debug("Updated authserviceinfo for user %s with forum credentials. Updating groups." % request.user) update_forum_groups(request.user) + logger.info("Succesfully activated forum for user %s" % request.user) return HttpResponseRedirect("/services/") + logger.error("Unsuccesful attempt to activate forum for user %s" % request.user) return HttpResponseRedirect("/dashboard") @login_required @user_passes_test(service_blue_alliance_test) def deactivate_forum(request): + logger.debug("deactivate_forum called by user %s" % request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) result = Phpbb3Manager.disable_user(authinfo.forum_username) remove_all_syncgroups_for_service(request.user, "phpbb") # false we failed if result: AuthServicesInfoManager.update_user_forum_info("", "", request.user) + logger.info("Succesfully deactivated forum for user %s" % request.user) return HttpResponseRedirect("/services/") + logger.error("Unsuccesful attempt to activate forum for user %s" % request.user) return HttpResponseRedirect("/dashboard") @login_required @user_passes_test(service_blue_alliance_test) def reset_forum_password(request): + logger.debug("reset_forum_password called by user %s" % request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) result = Phpbb3Manager.update_user_password(authinfo.forum_username, authinfo.main_char_id) # false we failed if result != "": AuthServicesInfoManager.update_user_forum_info(authinfo.forum_username, result, request.user) + logger.info("Succesfully reset forum password for user %s" % request.user) return HttpResponseRedirect("/services/") + logger.error("Unsuccessful attempt to reset forum password for user %s" % request.user) return HttpResponseRedirect("/dashboard") @login_required @user_passes_test(service_blue_alliance_test) def activate_ipboard_forum(request): + logger.debug("activate_ipboard_forum called by user %s" % request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) # Valid now we get the main characters character = EveManager.get_character_by_id(authinfo.main_char_id) + logger.debug("Adding ipboard user for user %s with main character %s" % (request.user, character)) result = IPBoardManager.add_user(character.character_name, request.user.email) if result[0] != "": AuthServicesInfoManager.update_user_ipboard_info(result[0], result[1], request.user) + logger.debug("Updated authserviceinfo for user %s with ipboard credentials. Updating groups." % request.user) update_ipboard_groups(request.user) + logger.info("Succesfully activated ipboard for user %s" % request.user) return HttpResponseRedirect("/services/") + logger.error("Unsuccesful attempt to activate ipboard for user %s" % request.user) return HttpResponseRedirect("/dashboard") @login_required @user_passes_test(service_blue_alliance_test) def deactivate_ipboard_forum(request): + logger.debug("deactivate_ipboard_forum called by user %s" % request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) result = IPBoardManager.disable_user(authinfo.ipboard_username) remove_all_syncgroups_for_service(request.user, "ipboard") # false we failed if result: AuthServicesInfoManager.update_user_ipboard_info("", "", request.user) + logger.info("Succesfully deactivated ipboard for user %s" % request.user) return HttpResponseRedirect("/services/") + logger.error("Unsuccessful attempt to deactviate ipboard for user %s" % request.user) return HttpResponseRedirect("/dashboard") @login_required @user_passes_test(service_blue_alliance_test) def reset_ipboard_password(request): + logger.debug("reset_ipboard_password called by user %s" % request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) result = IPBoardManager.update_user_password(authinfo.ipboard_username, request.user.email) if result != "": AuthServicesInfoManager.update_user_ipboard_info(authinfo.ipboard_username, result, request.user) + logger.info("Succesfully reset ipboard password for user %s" % request.user) return HttpResponseRedirect("/services/") + logger.error("Unsuccesful attempt to reset ipboard password for user %s" % request.user) return HttpResponseRedirect("/dashboard") @login_required @user_passes_test(service_blue_alliance_test) def activate_jabber(request): + logger.debug("activate_jabber called by user %s" % request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) character = EveManager.get_character_by_id(authinfo.main_char_id) + logger.debug("Adding jabber user for user %s with main character %s" % (request.user, character)) info = OpenfireManager.add_user(character.character_name) # If our username is blank means we already had a user if info[0] is not "": AuthServicesInfoManager.update_user_jabber_info(info[0], info[1], request.user) + logger.debug("Updated authserviceinfo for user %s with jabber credentials. Updating groups." % request.user) update_jabber_groups(request.user) + logger.info("Succesfully activated jabber for user %s" % request.user) return HttpResponseRedirect("/services/") + logger.error("Unsuccesful attempt to activate jabber for user %s" % request.user) return HttpResponseRedirect("/dashboard") @login_required @user_passes_test(service_blue_alliance_test) def deactivate_jabber(request): + logger.debug("deactivate_jabber called by user %s" % request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) result = OpenfireManager.delete_user(authinfo.jabber_username) remove_all_syncgroups_for_service(request.user, "openfire") # If our username is blank means we failed if result: AuthServicesInfoManager.update_user_jabber_info("", "", request.user) + logger.info("Succesfully deactivated jabber for user %s" % request.user) return HttpResponseRedirect("/services/") + logger.error("Unsuccesful attempt to deactivate jabber for user %s" % request.user) return HttpResponseRedirect("/dashboard") @login_required @user_passes_test(service_blue_alliance_test) def reset_jabber_password(request): + logger.debug("reset_jabber_password called by user %s" % request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) result = OpenfireManager.update_user_pass(authinfo.jabber_username) # If our username is blank means we failed if result != "": AuthServicesInfoManager.update_user_jabber_info(authinfo.jabber_username, result, request.user) + logger.info("Succesfully reset jabber password for user %s" % request.user) return HttpResponseRedirect("/services/") + logger.error("Unsuccessful attempt to reset jabber for user %s" % request.user) return HttpResponseRedirect("/dashboard") @login_required @user_passes_test(service_blue_alliance_test) def activate_mumble(request): + logger.debug("activate_mumble called by user %s" % request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) character = EveManager.get_character_by_id(authinfo.main_char_id) if check_if_user_has_permission(request.user, "blue_member"): + logger.debug("Adding mumble user for blue user %s with main character %s" % (request.user, character)) result = MumbleManager.create_blue_user(character.corporation_ticker, character.character_name) else: + logger.debug("Adding mumble user for user %s with main character %s" % (request.user, character)) result = MumbleManager.create_user(character.corporation_ticker, character.character_name) # if its empty we failed if result[0] is not "": AuthServicesInfoManager.update_user_mumble_info(result[0], result[1], request.user) + logger.debug("Updated authserviceinfo for user %s with mumble credentials. Updating groups." % request.user) update_mumble_groups(request.user) + logger.info("Succesfully activated mumble for user %s" % request.user) return HttpResponseRedirect("/services/") + logger.error("Unsuccessful attempt to activate mumble for user %s" % request.user) return HttpResponseRedirect("/dashboard") @login_required @user_passes_test(service_blue_alliance_test) def deactivate_mumble(request): + logger.debug("deactivate_mumble called by user %s" % request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) result = MumbleManager.delete_user(authinfo.mumble_username) remove_all_syncgroups_for_service(request.user, "mumble") # if false we failed if result: AuthServicesInfoManager.update_user_mumble_info("", "", request.user) + logger.info("Succesfully deactivated mumble for user %s" % request.user) return HttpResponseRedirect("/services/") + logger.error("Unsuccessful attempt to deactivate mumble for user %s" % request.user) return HttpResponseRedirect("/") @login_required @user_passes_test(service_blue_alliance_test) def reset_mumble_password(request): + logger.debug("reset_mumble_password called by user %s" % request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) result = MumbleManager.update_user_password(authinfo.mumble_username) # if blank we failed if result != "": AuthServicesInfoManager.update_user_mumble_info(authinfo.mumble_username, result, request.user) + logger.info("Succesfully reset mumble password for user %s" % request.user) return HttpResponseRedirect("/services/") + logger.error("Unsuccesful attempt to reset mumble password for user %s" % request.user) return HttpResponseRedirect("/") @login_required @user_passes_test(service_blue_alliance_test) def activate_teamspeak3(request): + logger.debug("activate_teamspeak3 called by user %s" % request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) character = EveManager.get_character_by_id(authinfo.main_char_id) if check_if_user_has_permission(request.user, "blue_member"): + logger.debug("Adding TS3 user for blue user %s with main character %s" % (request.user, character)) result = Teamspeak3Manager.add_blue_user(character.character_name, character.corporation_ticker) else: + logger.debug("Adding TS3 user for user %s with main character %s" % (request.user, character)) result = Teamspeak3Manager.add_user(character.character_name, character.corporation_ticker) # if its empty we failed if result[0] is not "": AuthServicesInfoManager.update_user_teamspeak3_info(result[0], result[1], request.user) + logger.debug("Updated authserviceinfo for user %s with TS3 credentials. Updating groups." % request.user) update_teamspeak3_groups(request.user) + logger.info("Succesfully activated TS3 for user %s" % request.user) return HttpResponseRedirect("/services/") + logger.error("Unsuccessful attempt to activate TS3 for user %s" % request.user) return HttpResponseRedirect("/dashboard") @login_required @user_passes_test(service_blue_alliance_test) def deactivate_teamspeak3(request): + logger.debug("deactivate_teamspeak3 called by user %s" % request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) result = Teamspeak3Manager.delete_user(authinfo.teamspeak3_uid) @@ -289,37 +351,45 @@ def deactivate_teamspeak3(request): # if false we failed if result: AuthServicesInfoManager.update_user_teamspeak3_info("", "", request.user) - + logger.info("Succesfully deactivated TS3 for user %s" % request.user) return HttpResponseRedirect("/services/") + logger.error("Unsuccessful attempt to deactivate TS3 for user %s" % request.user) return HttpResponseRedirect("/") @login_required @user_passes_test(service_blue_alliance_test) def reset_teamspeak3_perm(request): + logger.debug("reset_teamspeak3_perm called by user %s" % request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) character = EveManager.get_character_by_id(authinfo.main_char_id) - + logger.debug("Deleting TS3 user for user %s" % request.user) Teamspeak3Manager.delete_user(authinfo.teamspeak3_uid) remove_all_syncgroups_for_service(request.user, "teamspeak3") if check_if_user_has_permission(request.user, "blue_member"): + logger.debug("Generating new permission key for blue user %s with main character %s" % (request.user, character)) result = Teamspeak3Manager.generate_new_blue_permissionkey(authinfo.teamspeak3_uid, character.character_name, character.corporation_ticker) else: + logger.debug("Generating new permission key for user %s with main character %s" % (request.user, character)) result = Teamspeak3Manager.generate_new_permissionkey(authinfo.teamspeak3_uid, character.character_name, character.corporation_ticker) # if blank we failed if result != "": AuthServicesInfoManager.update_user_teamspeak3_info(result[0], result[1], request.user) + logger.debug("Updated authserviceinfo for user %s with TS3 credentials. Updating groups." % request.user) update_teamspeak3_groups(request.user) + logger.info("Successfully reset TS3 permission key for user %s" % request.user) return HttpResponseRedirect("/services/") + logger.error("Unsuccessful attempt to reset TS3 permission key for user %s" % request.user) return HttpResponseRedirect("/") @login_required def fleet_fits(request): + logger.debug("fleet_fits called by user %s" % request.user) context = {} return render_to_response('registered/fleetfits.html', context, context_instance=RequestContext(request)) @@ -327,28 +397,34 @@ context_instance=RequestContext(request)) @login_required @user_passes_test(service_blue_alliance_test) def deactivate_discord(request): + logger.debug("deactivate_discord called by user %s" % request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) result = DiscordManager.delete_user(authinfo.discord_uid) if result: remove_all_syncgroups_for_service(request.user, "discord") AuthServicesInfoManager.update_user_discord_info("", request.user) + logger.info("Succesfully deactivated discord for user %s" % request.user) return HttpResponseRedirect("/services/") + logger.error("Unsuccesful attempt to deactivate discord for user %s" % request.user) return HttpResponseRedirect("/dashboard") @login_required @user_passes_test(service_blue_alliance_test) def reset_discord(request): + logger.debug("reset_discord called by user %s" % request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) result = DiscordManager.delete_user(authinfo.discord_uid) if result: AuthServicesInfoManager.update_user_discord_info("",request.user) + logger.info("Succesfully deleted discord user for user %s - forwarding to discord activation." % request.user) return HttpResponseRedirect("/activate_discord/") + logger.error("Unsuccessful attempt to reset discord for user %s" % request.user) return HttpResponseRedirect("/services/") @login_required @user_passes_test(service_blue_alliance_test) def activate_discord(request): - logger.debug("activate_discord called.") + logger.debug("activate_discord called by user %s" % request.user) success = False if request.method == 'POST': logger.debug("Received POST request with form.") @@ -361,13 +437,14 @@ def activate_discord(request): logger.debug("Form contains password of length %s" % len(password)) try: user_id = DiscordManager.add_user(email, password) - logger.debug("Received user_id %s" % user_id) + logger.debug("Received discord uid %s" % user_id) if user_id != "": AuthServicesInfoManager.update_user_discord_info(user_id, request.user) logger.debug("Updated discord id %s for user %s" % (user_id, request.user)) update_discord_groups(request.user) - logger.debug("Updated discord groups for user %s. Succesful activation." % request.user) + logger.debug("Updated discord groups for user %s." % request.user) success = True + logger.info("Succesfully activated discord for user %s" % request.user) return HttpResponseRedirect("/services/") except: logger.exception("An unhandled exception has occured.", exc_info=True) @@ -376,6 +453,6 @@ def activate_discord(request): logger.debug("Request is not type POST - providing empty form.") form = DiscordForm() - logger.debug("Rendering form for user with success %s" % success) + logger.debug("Rendering form for user %s with success %s" % (request.user, success)) context = {'form': form, 'success': success} return render_to_response('registered/discord.html', context, context_instance=RequestContext(request))