Remove old boilerplate authn and authz.

[xonotic/xonstat.git] / xonstat / __init__.py

diff --git a/xonstat/__init__.py b/xonstat/__init__.py
index b2314b3a1f64415a148dac76b43fc4fb9fdc6db4..d0c033fa7f3f829148312a1bcd83805df44f361f 100644 (file)
--- a/xonstat/__init__.py
+++ b/xonstat/__init__.py
@@ -22,6 +22,14 @@ def main(global_config, **settings):
 
     config = Configurator(settings=settings)
 
+    # mako for templating
+    config.include('pyramid_mako')
+
+    # Mozilla Persona as the login verifier. It defines default
+    # authentication and authorization policies.
+    config.include('pyramid_persona')
+
+    # for json-encoded responses
     config.add_renderer('jsonp', JSONP(param_name='callback'))
 
     # for static assets
@@ -48,19 +56,20 @@ def main(global_config, **settings):
     config.add_route("player_info",      "/player/{id:\d+}")
     config.add_view(player_info,      route_name="player_info",      renderer="player_info.mako")
 
-    config.add_route("player_hashkey_info_json", "/player/{hashkey:.{44}}.json")
-    config.add_view(player_hashkey_info_json, route_name="player_hashkey_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", "/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_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_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")
 
-    config.add_route("player_elo_info_json", "/player/{hashkey}/elo.json") ## FIXME - doesn't seem to work?
+    # 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")
@@ -72,10 +81,10 @@ 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_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")
@@ -151,4 +160,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",      "/merge")
+    config.add_view(route_name="merge", renderer="merge.mako", permission="merge")
+
     return config.make_wsgi_app()