X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=xonstat%2F__init__.py;h=ec8bc310a01798d741ab94006f6cffa44a40d96e;hb=e69cf899ced79dce164dda3881653d1d626b7124;hp=6186a67e60e03ce5188bce292f57ce0161835940;hpb=1d0c16dddc2861e4e094e488cc357d7c95f584ef;p=xonotic%2Fxonstat.git diff --git a/xonstat/__init__.py b/xonstat/__init__.py index 6186a67..ec8bc31 100644 --- a/xonstat/__init__.py +++ b/xonstat/__init__.py @@ -1,11 +1,13 @@ 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,7 +22,7 @@ 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') @@ -29,12 +31,21 @@ def main(global_config, **settings): # 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") @@ -44,7 +55,7 @@ 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") @@ -90,14 +101,14 @@ def main(global_config, **settings): 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_by_time", "/topactive") - config.add_view(top_players_by_time, route_name="top_players_by_time", renderer="top_players_by_time.mako") + 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_by_players", "/topservers") - config.add_view(top_servers_by_players, route_name="top_servers_by_players", renderer="top_servers_by_players.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_by_times_played", "/topmaps") - config.add_view(top_maps_by_times_played, route_name="top_maps_by_times_played", renderer="top_maps_by_times_played.mako") + config.add_route("top_maps_index", "/topmaps") + config.add_view(top_maps_index, route_name="top_maps_index", renderer="top_maps_index.mako") # GAME ROUTES config.add_route("game_info", "/game/{id:\d+}") @@ -106,15 +117,18 @@ 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") + config.add_route("game_index_json", "/games.json") + config.add_view(game_finder_json, route_name="game_index_json", renderer="jsonp") + # SERVER ROUTES config.add_route("server_index", "/servers") config.add_view(server_index, route_name="server_index", renderer="server_index.mako") @@ -122,12 +136,6 @@ def main(global_config, **settings): 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("server_info", "/server/{id:\d+}") config.add_view(server_info, route_name="server_info", renderer="server_info.mako") @@ -166,7 +174,7 @@ def main(global_config, **settings): config.add_route("login", "/login") config.add_view(login, route_name="login", check_csrf=True, renderer="json") - #config.add_route("merge", "/merge") - #config.add_view(merge, route_name="merge", renderer="merge.mako") + config.add_route("merge", "/admin/merge") + config.add_view(merge, route_name="merge", renderer="merge.mako", permission="merge") return config.make_wsgi_app()