From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Thu, 14 Aug 2014 23:53:47 +0000 (+0200)
Subject: XEP-0198: Gracefully handle wrong credentials
X-Git-Tag: 14.12~77^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2daf95e93ff53ed4dafb309f7bb42e7b9e1562d1;p=ejabberd

XEP-0198: Gracefully handle wrong credentials

Produce a proper error message instead of crashing when the JID encoded
in the 'previd' value of a <resume/> request is different from the
authenticated JID.
---

diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 1e07be859..de80308fc 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -2936,6 +2936,8 @@ inherit_session_state(#state{user = U, server = S} = StateData, ResumeID) ->
 		      {error, <<"Cannot grab session state">>}
 		end
 	  end;
+      {term, {_WrongU, _WrongS, _R, _Time}} ->
+	  {error, <<"Previous JID doesn't match authenticated JID">>};
       error ->
 	  {error, <<"Invalid 'previd' value">>}
     end.