You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by be...@apache.org on 2008/06/02 19:08:56 UTC

svn commit: r662488 - in /labs/vysper/src: main/java/org/apache/vysper/xmpp/protocol/ main/java/org/apache/vysper/xmpp/protocol/worker/ main/java/org/apache/vysper/xmpp/server/ main/java/org/apache/vysper/xmpp/server/response/ main/java/org/apache/vysp...

Author: berndf
Date: Mon Jun  2 10:08:55 2008
New Revision: 662488

URL: http://svn.apache.org/viewvc?rev=662488&view=rev
Log:
[vysper] fixes and improvements in the light of upcoming stanza session

Modified:
    labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/ServiceUnavailableStanzaErrorHandler.java
    labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java
    labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/AbstractStateAwareProtocolWorker.java
    labs/vysper/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java
    labs/vysper/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java
    labs/vysper/src/main/java/org/apache/vysper/xmpp/server/SessionContext.java
    labs/vysper/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java
    labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java
    labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java
    labs/vysper/src/main/java/org/apache/vysper/xmpp/writer/DenseStanzaLogRenderer.java
    labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java
    labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptionStartedTestCase.java
    labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/ServiceUnavailableStanzaErrorHandler.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/ServiceUnavailableStanzaErrorHandler.java?rev=662488&r1=662487&r2=662488&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/ServiceUnavailableStanzaErrorHandler.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/ServiceUnavailableStanzaErrorHandler.java Mon Jun  2 10:08:55 2008
@@ -26,6 +26,7 @@
 /**
  */
 public class ServiceUnavailableStanzaErrorHandler implements StanzaHandler {
+    
     public String getName() {
         return "stanza_not_supported_error";
     }
@@ -38,6 +39,8 @@
         if (!(stanza instanceof XMPPCoreStanza)) {
             stanza = XMPPCoreStanza.getWrapper(stanza);
         }
+        if (stanza == null) throw new IllegalArgumentException("cannot coerce into a message, iq or presence stanza");
+        
         XMPPCoreStanza coreStanza = (XMPPCoreStanza) stanza;
         Stanza errorStanza = ServerErrorResponses.getInstance().getStanzaError(StanzaErrorCondition.SERVICE_UNAVAILABLE, coreStanza, StanzaErrorType.CANCEL, "namespace not supported", null, null);
         return new ResponseStanzaContainerImpl(errorStanza);

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java?rev=662488&r1=662487&r2=662488&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java Mon Jun  2 10:08:55 2008
@@ -23,6 +23,7 @@
 import org.apache.vysper.xmpp.modules.core.base.handler.StreamStartHandler;
 import org.apache.vysper.xmpp.modules.core.base.handler.XMLPrologHandler;
 import org.apache.vysper.xmpp.stanza.Stanza;
+import org.apache.vysper.xmpp.stanza.XMPPCoreStanza;
 import org.apache.vysper.xmpp.xmlfragment.XMLElement;
 
 import java.util.Collection;
@@ -62,8 +63,14 @@
         else if (messageHandler.verify(stanza)) return getMessageHandler(stanza);
         else if (presenceHandler.verify(stanza)) return getPresenceHandler(stanza);
         else {
-            // this is not a core stanza (RFC3920),
-            // could be a test, or custom extension, or from the handshake so we delegate
+            // this is not a core stanza (RFC3920), but something like the following
+            // (in descending-probability order):
+            // a. a custom extension of iq, message, presence
+            // b. some handshake stanza other than iq, message, presence 
+            // c. an arbitrary test stanza
+            // d. an evil forged stanza
+            // e. some extension we don't know yet
+            // ...so we delegate:
             return getHandlerForElement(stanza, stanza);
         }
     }
@@ -94,7 +101,7 @@
     /**
      * tries to find the handler by trying
      * 1. value of xmlElement's XMLNS attribute, if unique
-     * 1. xmlElements namespace, if the element name has a namespace prefix 
+     * 2. xmlElements namespace, if the element name has a namespace prefix 
      */
     private StanzaHandler getHandlerForElement(Stanza stanza, XMLElement xmlElement) {
         
@@ -109,7 +116,9 @@
         } 
         if (namespaceHandlerDictionary != null) return namespaceHandlerDictionary.get(stanza); 
 
-        return SERVICE_UNAVAILABLE_STANZA_ERROR_HANDLER;
+        if (XMPPCoreStanza.getWrapper(stanza) != null) return SERVICE_UNAVAILABLE_STANZA_ERROR_HANDLER;
+        
+        return null;
     }
 
 }

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/AbstractStateAwareProtocolWorker.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/AbstractStateAwareProtocolWorker.java?rev=662488&r1=662487&r2=662488&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/AbstractStateAwareProtocolWorker.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/AbstractStateAwareProtocolWorker.java Mon Jun  2 10:08:55 2008
@@ -28,7 +28,7 @@
 import org.apache.vysper.xmpp.stanza.Stanza;
 
 /**
- * high-level xmpp protocol logic, state-aware
+ * high-level xmpp protocol logic, state-aware.
  * writes response stanzas
  */
 public abstract class AbstractStateAwareProtocolWorker implements StateAwareProtocolWorker {
@@ -44,8 +44,7 @@
         writeResponse(sessionContext, responseWriter, responseStanzaContainer);
     }
 
-    protected boolean checkState(SessionContext sessionContext, SessionStateHolder sessionStateHolder, Stanza stanza, StanzaHandler stanzaHandler, ResponseWriter responseWriter)
-    {
+    protected boolean checkState(SessionContext sessionContext, SessionStateHolder sessionStateHolder, Stanza stanza, StanzaHandler stanzaHandler, ResponseWriter responseWriter) {
         return 0 == getHandledState().compareTo(sessionContext.getState());
     }
 

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java?rev=662488&r1=662487&r2=662488&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java Mon Jun  2 10:08:55 2008
@@ -33,7 +33,7 @@
     protected String sessionId;
     protected String xmlLang;
     protected UUIDGenerator sequence = new JVMBuiltinUUIDGenerator();
-    protected SessionStateHolder sessionStateHolder;
+    protected SessionStateHolder sessionStateHolder; // be secure: do not provide this via a getter or other means
     protected Entity serverEntity;
     private Entity initiatingEntity;
     private boolean serverToServer = false;

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java?rev=662488&r1=662487&r2=662488&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java Mon Jun  2 10:08:55 2008
@@ -43,16 +43,54 @@
  */
 public class DefaultServerRuntimeContext implements ServerRuntimeContext, ModuleRegistry {
 
+    // basic internal data structures and configuration...
+    
+    /**
+     * directory where all available processors for incoming stanzas are located 
+     */
     private StanzaHandlerLookup stanzaHandlerLookup = new StanzaHandlerLookup();
+
+    /**
+     * the 'domain' the server is directly serving for
+     */
     private Entity serverEntity;
-    private StanzaRelay stanzaRelay;
+
+    /**
+     * feature configuration
+     */
     private ServerFeatures serverFeatures = new ServerFeatures();
+
+    /**
+     * the Secure Socket Engine in use
+     */
     private SSLContext sslContext = null;
-    private UUIDGenerator resourceIdGenerator = new JVMBuiltinUUIDGenerator();
+
+    /**
+     * generates unique session ids
+     */
+    private UUIDGenerator sessionIdGenerator = new JVMBuiltinUUIDGenerator();
+
+    // basic services the server is using...
+
+    /**
+     * receives stanzas issued by a session, which are going to other sessions/servers
+     */
+    private StanzaRelay stanzaRelay;
+
+    /**
+     * user authorization backend
+     */
     private UserAuthorization userAuthorization = new SimpleUserAuthorization();
+
+    /**
+     * administrate and query resources and sessions 
+     */
     private ResourceRegistry resourceRegistry;
-    final private Map<String, ServerRuntimeContextService> serverRuntimeContextServiceMap = new HashMap<String, ServerRuntimeContextService>();
 
+    /**
+     * collection of all other services, which are mostly add-ons to the minimal setup
+     */
+    final private Map<String, ServerRuntimeContextService> serverRuntimeContextServiceMap = new HashMap<String, ServerRuntimeContextService>();
 
     public DefaultServerRuntimeContext(Entity serverEntity, StanzaRelay stanzaRelay) {
         this.serverEntity = serverEntity;
@@ -77,7 +115,7 @@
     }
 
     public String getNextSessionId() {
-        return resourceIdGenerator.create();
+        return sessionIdGenerator.create();
     }
 
     public Entity getServerEnitity() {

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/server/SessionContext.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/server/SessionContext.java?rev=662488&r1=662487&r2=662488&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/server/SessionContext.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/server/SessionContext.java Mon Jun  2 10:08:55 2008
@@ -22,7 +22,7 @@
 import org.apache.vysper.xmpp.resourcebinding.BindException;
 
 /**
- * provides the session with its context data
+ * provides the server-side session with its context data
  */
 public interface SessionContext {
 	/**

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java?rev=662488&r1=662487&r2=662488&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java Mon Jun  2 10:08:55 2008
@@ -93,7 +93,7 @@
                                  String errorText, String errorLang,
                                  XMLElement errorConditionElement) {
 
-        if ("error".equals(stanza.getType())) {
+        if (stanza != null && "error".equals(stanza.getType())) {
             return ServerErrorResponses.getInstance().getStreamError(StreamErrorCondition.UNSUPPORTED_STANZA_TYPE, errorLang,
                                                                "cannot respond to IQ stanza of type error with the same", null);
         }

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java?rev=662488&r1=662487&r2=662488&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java Mon Jun  2 10:08:55 2008
@@ -65,6 +65,8 @@
     }
     
     public static StanzaBuilder createDirectReply(XMPPCoreStanza original, boolean fromIsServerOnly, String type) {
+        if (original == null) throw new IllegalArgumentException();
+        
         StanzaBuilder stanzaBuilder = new StanzaBuilder(original.getName(), original.getNamespace());
         // reverse to and from
         Entity newTo = original.getFrom();

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java?rev=662488&r1=662487&r2=662488&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java Mon Jun  2 10:08:55 2008
@@ -34,6 +34,7 @@
     }
 
     public static XMPPCoreStanza getWrapper(Stanza stanza) {
+        if (stanza instanceof XMPPCoreStanza) return (XMPPCoreStanza)stanza;
         if (IQStanza.isOfType(stanza)) return new IQStanza(stanza);
         if (MessageStanza.isOfType(stanza)) return new MessageStanza(stanza);
         if (PresenceStanza.isOfType(stanza)) return new PresenceStanza(stanza);

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/writer/DenseStanzaLogRenderer.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/writer/DenseStanzaLogRenderer.java?rev=662488&r1=662487&r2=662488&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/writer/DenseStanzaLogRenderer.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/writer/DenseStanzaLogRenderer.java Mon Jun  2 10:08:55 2008
@@ -92,10 +92,12 @@
                     stringBuilder.append(ELEMENT_SEPARATOR);
                     stringBuilder.append("features.mechanisms[");
                     List<XMLElement> list = mechanisms.getInnerElementsNamed("mechanism");
-                    for (Iterator<XMLElement> it = list.iterator(); it.hasNext();) {
-                        XMLElement element = it.next();
-                        stringBuilder.append(element.getSingleInnerText().getText());
-                        if (it.hasNext()) stringBuilder.append(",");
+                    if (list != null) {
+                        for (Iterator<XMLElement> it = list.iterator(); it.hasNext();) {
+                            XMLElement element = it.next();
+                            stringBuilder.append(element.getSingleInnerText().getText());
+                            if (it.hasNext()) stringBuilder.append(",");
+                        }
                     }
                     stringBuilder.append("]");
                 }

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java?rev=662488&r1=662487&r2=662488&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java Mon Jun  2 10:08:55 2008
@@ -60,6 +60,7 @@
         this.name = name;
         this.attributes = (attributes == null) ? Collections.EMPTY_LIST : Collections.unmodifiableList(attributes);
         this.innerFragments = (innerFragments == null) ? Collections.EMPTY_LIST : Collections.unmodifiableList(innerFragments);
+        if (name == null) throw new IllegalArgumentException("XMLElement name cannot be null");
     }
 
     public String getName() {

Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptionStartedTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptionStartedTestCase.java?rev=662488&r1=662487&r2=662488&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptionStartedTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptionStartedTestCase.java Mon Jun  2 10:08:55 2008
@@ -33,13 +33,8 @@
     }
 
     public void testDontAcceptArbitraryStanzaWhileNotAuthenticated() {
-        try {
-            skeleton_testDontAcceptArbitraryStanzaWhileNotAuthenticated();
-            fail();
-        } catch (RuntimeException e) {
-            // worker is not implemented
-        }
+        skeleton_testDontAcceptArbitraryStanzaWhileNotAuthenticated();
     }
 
 
-}
\ No newline at end of file
+}

Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java?rev=662488&r1=662487&r2=662488&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java Mon Jun  2 10:08:55 2008
@@ -51,7 +51,7 @@
 
         Stanza nonExistingStanza = new Stanza("testDictionaryHierarchyNotExist", "testNSURI", new ArrayList<Attribute>(), new ArrayList<XMLFragment>());
         StanzaHandler handler = stanzaHandlerLookup.getHandler(nonExistingStanza);
-        assertTrue(handler instanceof ServiceUnavailableStanzaErrorHandler);
+        assertNull("handler not found", handler);
 
         Stanza existingStanzaNS1 = new Stanza("testDictionaryHierarchy", "testNSURI1", new ArrayList<Attribute>(), new ArrayList<XMLFragment>());
         handler = stanzaHandlerLookup.getHandler(existingStanzaNS1);



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org