X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;ds=inline;f=modules%2Ferl%2Feuphorik_requests.erl;h=49cbe026132afa200c3b98e313c0382faf002045;hb=5d9992368bb386d2e606ae037c5478fe10ac70e8;hp=edc0e174064650f12fd273ee99b0ccaceaf775ab;hpb=886e51257b3d610ee0e4f7576d720495914ae9ec;p=euphorik.git
diff --git a/modules/erl/euphorik_requests.erl b/modules/erl/euphorik_requests.erl
index edc0e17..49cbe02 100755
--- a/modules/erl/euphorik_requests.erl
+++ b/modules/erl/euphorik_requests.erl
@@ -1,69 +1,89 @@
% coding: utf-8
-% Ce module est fait pour répondre à des requêtes 'AJAX'.
-% Il est définit comme 'appmods' pour l'url "request" dans yaws.
-% Par exemple http://www.euphorik.ch/request abouti sur la fonction out() de ce module.
-% @author G.Burri
-
+% Copyright 2008 Grégory Burri
+%
+% This file is part of Euphorik.
+%
+% Euphorik is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
+%
+% Euphorik is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with Euphorik. If not, see .
+%
+% This module responds to JSON requests via 'AJAX'.
+% It's defined as an Yaws 'appmods' with the url '/request'.
+% For instance in debug mode 'http://localhost:8090/request' will call the out/1 function.
+
+
-module(euphorik_requests).
--export([
- tester/0,
- out/1
-]).
+-author("Greg Burri ").
+-export([out/1]).
+-include_lib("yaws_api.hrl").
+-include("../include/euphorik_defines.hrl").
--include_lib("xmerl/include/xmerl.hrl").
--include_lib("yaws/include/yaws_api.hrl").
-
-% Test du module (TODO)
-tester() ->
- que_dal.
-
+% Entry point for all AJAX requests on '/request'.
+out(A) ->
+ IP = case inet:peername(A#arg.clisock) of
+ {ok, {Address, _Port}} -> Address;
+ _ -> unknown
+ end,
+ % active: to receive {tcp_closed, _} when the socket is closing.
+ % keepalive: avoid firewalls to cut the connection.
-out(A) ->
- %io:format("~p~n", [A]), % utilisé parfois pendant le debug
- IP = case inet:peername(A#arg.clisock) of
- {ok, {Adresse, _Port}} -> Adresse;
- _ -> inconnue
- end,
- % passive -> active, permet de recevoir {tcp_closed, _} lorsque le socket se ferme
- inet:setopts(A#arg.clisock, [{active, true}]),
+ inet:setopts(A#arg.clisock, [{active, true}, {keepalive, true}]),
{value, {_, Contenu}} = lists:keysearch("action", 1, yaws_api:parse_post(A)),
- Ret = traiter_donnees(Contenu, IP),
+
+ Ret = traiter_message(Contenu, IP),
{content, "application/json", Ret}.
-
-traiter_donnees(Contenu, IP) ->
- case json:decode_string(Contenu) of
- {ok, {struct, [{action, Action}| Reste]}} ->
- json:encode(traiter_action(Action, Reste, IP));
- _ ->
- error
- end.
-
-
-% authentification d'un client
-traiter_action("authentification", JSON, IP) ->
- euphorik_protocole:login(JSON, IP);
-% un client s'enregistre (pseudo + password)
-traiter_action("register", JSON, IP) ->
- euphorik_protocole:register(JSON, IP);
-% modification du profile
-traiter_action("set_profile", JSON, _) ->
- euphorik_protocole:profile(JSON);
-% un utilisateur attend un événement (par exemple l'arrivé d'un nouveau message)
-traiter_action("wait_event", JSON, _) ->
- euphorik_protocole:wait_event(JSON);
-% un utilisateur envoie un message
-traiter_action("put_message", JSON, _) ->
- euphorik_protocole:put_message(JSON);
-traiter_action("ban", JSON, _) ->
- euphorik_protocole:ban(JSON);
-traiter_action("slap", JSON, _) ->
- euphorik_protocole:slap(JSON);
-traiter_action("put_troll", JSON, _) ->
- euphorik_protocole:put_troll(JSON);
-traiter_action("mod_troll", JSON, _) ->
- euphorik_protocole:mod_troll(JSON);
-traiter_action("del_troll", JSON, _) ->
- euphorik_protocole:del_troll(JSON).
-
\ No newline at end of file
+
+% Décode le message JSON.
+traiter_message(Contenu, IP) ->
+ % extrait l'entête obligatoire des messages JSON
+ {ok, {struct, [{"header", {struct, [{"action", Action}, {"version", Version_client}]}} | Reste]}} = json2:decode_string(Contenu),
+
+ json2:encode(
+ if Version_client =:= ?VERSION_PROTOCOLE ->
+ traiter_action(Action, Reste, IP);
+ true ->
+ euphorik_protocole:erreur(lists:flatten(io_lib:format(
+ "La version du protocole du client (~w) ne correspond à celle du serveur (~w)", [Version_client, ?VERSION_PROTOCOLE]
+ )))
+ end
+ ).
+
+
+% Authentification d'un client.
+traiter_action("authentification", JSON, IP) ->
+ euphorik_protocole:login(JSON, IP);
+% Un client s'enregistre : (pseudo + password) ou de manière anonyme.
+traiter_action("register", JSON, IP) ->
+ euphorik_protocole:register(JSON, IP);
+% Modification du profile.
+traiter_action("set_profile", JSON, _) ->
+ euphorik_protocole:profile(JSON);
+% Un utilisateur attend un événement (par exemple l'arrivée d'un nouveau message).
+traiter_action("wait_event", JSON, _) ->
+ euphorik_protocole:wait_event(JSON);
+% Un utilisateur envoie un message.
+traiter_action("put_message", JSON, _) ->
+ euphorik_protocole:put_message(JSON);
+% Un ekMaster bannie un utilisateur (ip).
+traiter_action("ban", JSON, _) ->
+ euphorik_protocole:ban(JSON);
+% Un ekMaster slap un utilisateur.
+traiter_action("slap", JSON, _) ->
+ euphorik_protocole:slap(JSON);
+% Un ekMaster demande la liste des ips bannies.
+traiter_action("list_banned_ips", JSON, _) ->
+ euphorik_protocole:list_banned_ips(JSON);
+% Un ekMaster débannie une ip.
+traiter_action("unban", JSON, _) ->
+ euphorik_protocole:unban_ip(JSON).