summaryrefslogtreecommitdiff |
diff options
author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2018-09-08 05:28:28 +0200 |
---|---|---|
committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2018-09-08 05:28:28 +0200 |
commit | 936f186b6b767273fdc3c01f17311981c46e102c (patch) | |
tree | 624d6d9591df4cb869d1361f31c27c7a6a66350c /src/character | |
parent | cbc16fc5033ae7bd49c053131ec842e8f3445041 (diff) |
Send "disconnected" cmd if user failed cred check.
This (currently) does not apply to the actual login page, but just to
any other action that requires being logged in.
Diffstat (limited to 'src/character')
-rw-r--r-- | src/character/query/chr_load.erl | 23 | ||||
-rw-r--r-- | src/character/query/chr_update.erl | 27 |
2 files changed, 30 insertions, 20 deletions
diff --git a/src/character/query/chr_load.erl b/src/character/query/chr_load.erl index 290ea37..3c269d6 100644 --- a/src/character/query/chr_load.erl +++ b/src/character/query/chr_load.erl @@ -47,16 +47,17 @@ parse_input (Req) -> session_token = SessionToken }. --spec authenticate_user (input()) -> {'ok', shr_player:type()}. +-spec authenticate_user (input()) -> ({'ok', shr_player:type()} | 'error'). authenticate_user (Input) -> PlayerID = Input#input.player_id, SessionToken = Input#input.session_token, Player = shr_timed_cache:fetch(player_db, any, PlayerID), - shr_security:assert_identity(SessionToken, Player), - - {ok, Player}. + case shr_security:credentials_match(SessionToken, Player) of + true -> {ok, Player}; + _ -> error + end. -spec fetch_data (shr_player:type(), input()) -> query_state(). fetch_data (Player, Input) -> @@ -94,11 +95,15 @@ generate_reply (QueryState) -> -spec handle (binary()) -> binary(). handle (Req) -> Input = parse_input(Req), - {ok, Player} = authenticate_user(Input), - shr_security:lock_queries(Input#input.player_id), - QueryState = fetch_data(Player, Input), - shr_security:unlock_queries(Input#input.player_id), - generate_reply(QueryState). + case authenticate_user(Input) of + {ok, Player} -> + shr_security:lock_queries(Input#input.player_id), + QueryState = fetch_data(Player, Input), + shr_security:unlock_queries(Input#input.player_id), + generate_reply(QueryState); + + error -> jiffy:encode([shr_disconnected:generate()]) + end. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/src/character/query/chr_update.erl b/src/character/query/chr_update.erl index 90d87c5..568a749 100644 --- a/src/character/query/chr_update.erl +++ b/src/character/query/chr_update.erl @@ -55,16 +55,17 @@ parse_input (Req) -> character = Character }. --spec authenticate_user (input()) -> {'ok', shr_player:type()}. +-spec authenticate_user (input()) -> ({'ok', shr_player:type()} | 'error'). authenticate_user (Input) -> PlayerID = Input#input.player_id, SessionToken = Input#input.session_token, Player = shr_timed_cache:fetch(player_db, any, PlayerID), - shr_security:assert_identity(SessionToken, Player), - - {ok, Player}. + case shr_security:credentials_match(SessionToken, Player) of + true -> {ok, Player}; + _ -> error + end. -spec fetch_data (shr_player:type(), input()) -> query_state(). fetch_data (Player, Input) -> @@ -131,13 +132,17 @@ generate_reply () -> -spec handle (binary()) -> binary(). handle (Req) -> Input = parse_input(Req), - {ok, Player} = authenticate_user(Input), - shr_security:lock_queries(Input#input.player_id), - QueryState = fetch_data(Player, Input), - Update = update_data(QueryState, Input), - commit_update(Update, Input), - shr_security:unlock_queries(Input#input.player_id), - generate_reply(). + case authenticate_user(Input) of + {ok, Player} -> + shr_security:lock_queries(Input#input.player_id), + QueryState = fetch_data(Player, Input), + Update = update_data(QueryState, Input), + commit_update(Update, Input), + shr_security:unlock_queries(Input#input.player_id), + generate_reply(); + + error -> jiffy:encode([shr_disconnected:generate()]) + end. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% |