fixes #139: Fix MAM queries using before/after the result ID

The implementation looks for a stanza-id and falls back to a database ID. The XEP-0313 says a client shouldn't rely on the stanza-id as the UID of a message in the archive, but OF is trending towards making that reliable. In the meantime, the result ID is still the database ID.

Without this change, searches for the database ID is searched as freetext within the stanza. As a short number in amongst many GUIDs, false positives are more likely than not. This change ensures that a search for a stanza-id is more likely to match exactly that, but it's not foolproof.

Author: Fishbowler

src/java/com/reucon/openfire/plugin/archive/impl/MucMamPersistenceManager.java

@@ -288,10 +288,11 @@ static Long getMessageIdForStableId( final MUCRoom room, final String value )
         try
         {
             connection = DbConnectionManager.getConnection();
-            pstmt = connection.prepareStatement( "SELECT messageId, stanza FROM ofMucConversationLog WHERE messageId IS NOT NULL AND roomID=? AND stanza LIKE ? AND stanza LIKE ?" );
+            pstmt = connection.prepareStatement( "SELECT messageId, stanza FROM ofMucConversationLog WHERE messageId IS NOT NULL AND roomID=? AND (stanza LIKE ? OR stanza LIKE ?) AND stanza LIKE ?" );
             pstmt.setLong( 1, room.getID() );
-            pstmt.setString( 2, "%"+value+"%" );
-            pstmt.setString( 3, "%urn:xmpp:sid:%" ); // only match stanzas if some kind of XEP-0359 namespace is used.
+            pstmt.setString( 2, "%id=\""+value+"\"%" );
+            pstmt.setString( 3, "%id='"+value+"'%" );
+            pstmt.setString( 4, "%urn:xmpp:sid:%" ); // only match stanzas if some kind of XEP-0359 namespace is used.
 
             rs = pstmt.executeQuery();
             while ( rs.next() ) {