OF-1335 Strip namespaces differently

01d67e45 · Dave Cridland · daf92ff2 · 01d67e45 · 01d67e45
Commit 01d67e45 authored Oct 31, 2017 by Dave Cridland
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 573 additions and 513 deletions

XMPPPacketReader.java src/java/org/dom4j/io/XMPPPacketReader.java +543 -513

XMPPPacketReaderTest.java src/test/java/dom/io/XMPPPacketReaderTest.java +30 -0

No files found.
--- a/src/java/org/dom4j/io/XMPPPacketReader.java
+++ b/src/java/org/dom4j/io/XMPPPacketReader.java
--- a/src/test/java/dom/io/XMPPPacketReaderTest.java
+++ b/src/test/java/dom/io/XMPPPacketReaderTest.java
@@ -55,7 +55,9 @@ public class XMPPPacketReaderTest
        final String input = "<stream:stream to='example.com' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' version='1.0'><message from='juliet@example.com' to='romeo@example.net' xml:lang='en'><body>Art thou not Romeo, and a Montague?</body></message></stream:stream>";

        // Execute system under test.
+        System.out.println("** " + input);
        final Document result = packetReader.read( new StringReader( input ) );
+        System.out.println("** " + result.asXML());

        // Verify result.
        Assert.assertFalse( result.asXML().contains( "jabber:client" ) );
@@ -76,7 +78,9 @@ public class XMPPPacketReaderTest
        final String input = "<stream:stream to='example.com' xmlns:stream='http://etherx.jabber.org/streams' version='1.0'><message xmlns='jabber:client' from='juliet@example.com' to='romeo@example.net' xml:lang='en'><body>Art thou not Romeo, and a Montague?</body></message></stream:stream>";

        // Execute system under test.
+        System.out.println("** " + input);
        final Document result = packetReader.read( new StringReader( input ) );
+        System.out.println("** " + result.asXML());

        // Verify result.
        Assert.assertFalse( result.asXML().contains( "jabber:client" ) );
@@ -105,7 +109,9 @@ public class XMPPPacketReaderTest
            "  </message>" +
            "</stream:stream>";

+        System.out.println("** " + input);
        final Document result = packetReader.read( new StringReader( input ) );
+        System.out.println("** " + result.asXML());

        // Verify result.
        Assert.assertFalse( "'jabber:client' should not occur before 'something:else'", result.asXML().substring( 0, result.asXML().indexOf("something:else") ).contains( "jabber:client" ) );
@@ -135,7 +141,31 @@ public class XMPPPacketReaderTest
                "  </message>" +
                "</stream:stream>";

+        System.out.println("** " + input);
        final Document result = packetReader.read( new StringReader( input ) );
+        System.out.println("** " + result.asXML());
+
+        // Verify result.
+        Assert.assertFalse( "'jabber:client' should not occur before 'something:else'", result.asXML().substring( 0, result.asXML().indexOf("something:else") ).contains( "jabber:client" ) );
+        Assert.assertTrue( "'jabber:client' should occur after 'something:else'", result.asXML().substring( result.asXML().indexOf("something:else") ).contains( "jabber:client" ) );
+    }
+
+    /**
+     * Check that a websocket connection woudl also work.
+     */
+    @Test
+    public void testStripNamespacesForWebsocket() throws Exception
+    {
+        final String input_header = "<open xmlns='urn:ietf:params:xml:ns:xmpp-framing' to='example.com' version='1.0' />";
+        final Document doc_header = packetReader.read( new StringReader( input_header ) );
+        final String input = "  <message xmlns='jabber:client'>" +
+            "    <other xmlns='something:else'>" +
+            "      <message xmlns='jabber:client'/>" +
+            "    </other>" +
+            "  </message>";
+        System.out.println("** " + input);
+        final Document result = packetReader.read( new StringReader( input ) );
+        System.out.println("** " + result.asXML());

        // Verify result.
        Assert.assertFalse( "'jabber:client' should not occur before 'something:else'", result.asXML().substring( 0, result.asXML().indexOf("something:else") ).contains( "jabber:client" ) );