X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonstat.git;a=blobdiff_plain;f=xonstat%2F__init__.py;h=1d2e0750b5001e955e3351857af2ba198a52e93d;hp=0c14963de48cda94973d8d20e18e129cb09fca06;hb=2d53f7f9232b23ada761231482262392cf72192c;hpb=880f4957ecf547af1a23ac273b3e4c47f60d83d1 diff --git a/xonstat/__init__.py b/xonstat/__init__.py index 0c14963..1d2e075 100644 --- a/xonstat/__init__.py +++ b/xonstat/__init__.py @@ -1,11 +1,14 @@ import sqlahelper from pyramid_beaker import set_cache_regions_from_settings +from pyramid.authentication import AuthTktAuthenticationPolicy from pyramid.config import Configurator from pyramid.httpexceptions import HTTPNotFound from pyramid.renderers import JSONP from sqlalchemy import engine_from_config from xonstat.models import initialize_db from xonstat.views import * +from xonstat.security import * + def main(global_config, **settings): """ This function returns a Pyramid WSGI application. @@ -20,13 +23,30 @@ def main(global_config, **settings): # set up beaker cache set_cache_regions_from_settings(settings) - config = Configurator(settings=settings) + config = Configurator(settings=settings, root_factory=ACLFactory) + + # mako for templating + config.include('pyramid_mako') + + # Mozilla Persona as the login verifier. It defines default + # authentication and authorization policies. + config.include('pyramid_persona') + + # override the authn policy to provide a callback + secret = settings.get('persona.secret', None) + authn_policy = AuthTktAuthenticationPolicy(secret, callback=groupfinder, hashalg='sha512') + config.set_authentication_policy(authn_policy) + # for json-encoded responses config.add_renderer('jsonp', JSONP(param_name='callback')) # for static assets config.add_static_view('static', 'xonstat:static') + # robots + config.add_route("robots", "robots.txt") + config.add_view(robots, route_name="robots") + # for 404s config.add_view(notfound, context=HTTPNotFound, renderer="404.mako") @@ -36,25 +56,32 @@ def main(global_config, **settings): # MAIN SUBMISSION ROUTE config.add_route("submit_stats", "stats/submit") - config.add_view(submit_stats, route_name="submit_stats") + config.add_view(submit_stats, route_name="submit_stats", renderer="submit_stats.mako") # PLAYER ROUTES config.add_route("player_game_index", "/player/{player_id:\d+}/games") config.add_view(player_game_index, route_name="player_game_index", renderer="player_game_index.mako") - config.add_view(player_game_index_json, route_name="player_game_index_json", renderer="jsonp") config.add_route("player_game_index_json", "/player/{player_id:\d+}/games.json") + config.add_view(player_game_index_json, route_name="player_game_index_json", renderer="jsonp") config.add_route("player_info", "/player/{id:\d+}") config.add_view(player_info, route_name="player_info", renderer="player_info.mako") - config.add_view(player_info_json, route_name="player_info_json", renderer="jsonp") config.add_route("player_info_json", "/player/{id:\d+}.json") + config.add_view(player_info_json, route_name="player_info_json", renderer="jsonp") - config.add_route("player_hashkey_info_text", "/hashkey/{hashkey}") + config.add_route("player_hashkey_info_text", "/player/me") config.add_view(player_hashkey_info_text, route_name="player_hashkey_info_text", renderer="player_hashkey_info_text.mako") - config.add_route("player_elo_info_json", "/elo/{hashkey}") + config.add_route("player_hashkey_info_json", "/player/me.json") + config.add_view(player_hashkey_info_json, route_name="player_hashkey_info_json", renderer="jsonp") + + config.add_route("player_elo_info_text", "/player/{hashkey}/elo.txt") + config.add_view(player_elo_info_text, route_name="player_elo_info_text", renderer="player_elo_info_text.mako") + + # FIXME - needs an additional method to convert to JSON + config.add_route("player_elo_info_json", "/player/{hashkey}/elo.json") config.add_view(player_elo_info_json, route_name="player_elo_info_json", renderer="jsonp") config.add_route("player_accuracy", "/player/{id:\d+}/accuracy") @@ -66,15 +93,27 @@ def main(global_config, **settings): config.add_route("player_index_json", "/players.json") config.add_view(player_index_json, route_name="player_index_json", renderer="jsonp") - config.add_route("player_damage", "/player/{id:\d+}/damage") - config.add_view(player_damage_json, route_name="player_damage", renderer="jsonp") - - config.add_route("player_captimes", "/player/{id:\d+}/captimes") + config.add_route("player_captimes", "/player/{player_id:\d+}/captimes") config.add_view(player_captimes, route_name="player_captimes", renderer="player_captimes.mako") - config.add_route("player_captimes_json", "/player/{id:\d+}/captimes.json") + config.add_route("player_captimes_json", "/player/{player_id:\d+}/captimes.json") config.add_view(player_captimes_json, route_name="player_captimes_json", renderer="jsonp") + config.add_route("player_weaponstats_data_json", "/player/{id:\d+}/weaponstats.json") + config.add_view(player_weaponstats_data_json, route_name="player_weaponstats_data_json", renderer="jsonp") + + config.add_route("top_players_index", "/topactive") + config.add_view(top_players_index, route_name="top_players_index", renderer="top_players_index.mako") + + config.add_route("top_servers_index", "/topservers") + config.add_view(top_servers_index, route_name="top_servers_index", renderer="top_servers_index.mako") + + config.add_route("top_maps_index", "/topmaps") + config.add_view(top_maps_index, route_name="top_maps_index", renderer="top_maps_index.mako") + + config.add_route("player_versus", "/versus") + config.add_view(player_versus, route_name="player_versus", renderer="player_versus.mako") + # GAME ROUTES config.add_route("game_info", "/game/{id:\d+}") config.add_view(game_info, route_name="game_info", renderer="game_info.mako") @@ -82,40 +121,55 @@ def main(global_config, **settings): config.add_route("game_info_json", "/game/{id:\d+}.json") config.add_view(game_info_json, route_name="game_info_json", renderer="jsonp") - config.add_route("rank_index", "/ranks/{game_type_cd:ctf|dm|tdm|duel|ca|ft}") + config.add_route("rank_index", "/ranks/{game_type_cd}") config.add_view(rank_index, route_name="rank_index", renderer="rank_index.mako") - config.add_route("rank_index_json", "/ranks/{game_type_cd:ctf|dm|tdm|duel|ca|ft}.json") + config.add_route("rank_index_json", "/ranks/{game_type_cd}.json") config.add_view(rank_index_json, route_name="rank_index_json", renderer="jsonp") config.add_route("game_index", "/games") config.add_view(game_finder, route_name="game_index", renderer="game_finder.mako") - # SERVER ROUTES - config.add_route("server_index", "/servers") - config.add_view(server_index, route_name="server_index", renderer="server_index.mako") - - config.add_route("server_index_json", "/servers.json") - config.add_view(server_index_json, route_name="server_index_json", renderer="jsonp") - - config.add_route("server_game_index", "/server/{server_id:\d+}/games/page/{page:\d+}") - config.add_view(server_game_index, route_name="server_game_index", renderer="server_game_index.mako") - - config.add_route("server_game_index_json", "/server/{server_id:\d+}/games.json") - config.add_view(server_game_index_json, route_name="server_game_index_json", renderer="jsonp") + config.add_route("game_index_json", "/games.json") + config.add_view(game_finder_json, route_name="game_index_json", renderer="jsonp") - config.add_route("server_info", "/server/{id:\d+}") - config.add_view(server_info, route_name="server_info", renderer="server_info.mako") - - config.add_route("server_info_json", "/server/{id:\d+}.json") - config.add_view(server_info_json, route_name="server_info_json", renderer="jsonp") + # SERVER ROUTES + config.add_route("server_index", "/servers") + config.add_view(view=ServerIndex, route_name="server_index", attr="html", + renderer="server_index.mako", accept="text/html") + config.add_view(view=ServerIndex, route_name="server_index", attr="json", renderer="json", + accept="application/json") + + config.add_route("server_top_maps", "/server/{id:\d+}/topmaps") + config.add_view(view=ServerTopMaps, route_name="server_top_maps", attr="html", + renderer="server_top_maps.mako", accept="text/html") + config.add_view(view=ServerTopMaps, route_name="server_top_maps", attr="json", renderer="json", + accept="application/json") + + config.add_route("server_top_active", "/server/{id:\d+}/topactive") + config.add_view(view=ServerTopPlayers, route_name="server_top_active", attr="html", + renderer="server_top_active.mako", accept="text/html") + config.add_view(view=ServerTopPlayers, route_name="server_top_active", attr="json", + renderer="json", accept="application/json") + + config.add_route("server_top_scorers", "/server/{id:\d+}/topscorers") + config.add_view(view=ServerTopScorers, route_name="server_top_scorers", attr="html", + renderer="server_top_scorers.mako", accept="text/html") + config.add_view(view=ServerTopScorers, route_name="server_top_scorers", attr="json", + renderer="json", accept="application/json") + + config.add_route("server_info", "/server/{id:\d+}") + config.add_view(view=ServerInfo, route_name="server_info", attr="html", + renderer="server_info.mako", accept="text/html") + config.add_view(view=ServerInfo, route_name="server_info", attr="json", renderer="json", + accept="application/json") # MAP ROUTES - config.add_route("map_index", "/maps") - config.add_view(map_index, route_name="map_index", renderer="map_index.mako") - - config.add_route("map_index_json", "/maps.json") - config.add_view(map_index_json, route_name="map_index_json", renderer="jsonp") + config.add_route("map_index", "/maps") + config.add_view(view=MapIndex, route_name="map_index", attr="html", + renderer="map_index.mako", accept="text/html") + config.add_view(view=MapIndex, route_name="map_index", attr="json", renderer="json", + accept="application/json") config.add_route("map_info", "/map/{id:\d+}") config.add_view(map_info, route_name="map_info", renderer="map_info.mako") @@ -136,4 +190,13 @@ def main(global_config, **settings): config.add_route("search_json", "search.json") config.add_view(search_json, route_name="search_json", renderer="jsonp") + # ADMIN ROUTES + config.add_forbidden_view(forbidden, renderer="forbidden.mako") + + config.add_route("login", "/login") + config.add_view(login, route_name="login", check_csrf=True, renderer="json") + + config.add_route("merge", "/admin/merge") + config.add_view(merge, route_name="merge", renderer="merge.mako", permission="merge") + return config.make_wsgi_app()