Use per-connection JxmppContext

Fixes SMACK-924

Author: Flowdalic

smack-bosh/src/main/java/org/jivesoftware/smack/bosh/BOSHConfiguration.java

@@ -25,6 +25,8 @@
 import org.jivesoftware.smack.ConnectionConfiguration;
 import org.jivesoftware.smack.proxy.ProxyInfo;
 
+import org.jxmpp.JxmppContext;
+
 /**
  * Configuration to use while establishing the connection to the XMPP server via
  * HTTP binding.
@@ -90,15 +92,20 @@ public Map<String, String> getHttpHeaders() {
     }
 
     public static Builder builder() {
-        return new Builder();
+        return builder(getDefaultJxmppContext());
+    }
+
+    public static Builder builder(JxmppContext jxmppContext) {
+        return new Builder(jxmppContext);
     }
 
     public static final class Builder extends ConnectionConfiguration.Builder<Builder, BOSHConfiguration> {
         private boolean https;
         private String file;
         private Map<String, String> httpHeaders = new HashMap<>();
 
-        private Builder() {
+        private Builder(JxmppContext jxmppContext) {
+            super(jxmppContext);
         }
 
         public Builder setUseHttps(boolean useHttps) {

smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java

@@ -120,6 +120,7 @@
 import org.jivesoftware.smack.xml.XmlPullParser;
 import org.jivesoftware.smack.xml.XmlPullParserException;
 
+import org.jxmpp.JxmppContext;
 import org.jxmpp.jid.DomainBareJid;
 import org.jxmpp.jid.EntityBareJid;
 import org.jxmpp.jid.EntityFullJid;
@@ -317,6 +318,8 @@ protected enum SyncPointState {
      */
     protected final ConnectionConfiguration config;
 
+    private final JxmppContext jxmppContext;
+
     /**
      * Defines how the from attribute of outgoing stanzas should be handled.
      */
@@ -388,6 +391,9 @@ protected AbstractXMPPConnection(ConnectionConfiguration configuration) {
         saslAuthentication = new SASLAuthentication(this, configuration);
         config = configuration;
 
+        jxmppContext = configuration.getJxmppContext();
+        assert(jxmppContext != null);
+
         // Install the SASL Nonza callbacks.
         buildNonzaCallback()
             .listenFor(SaslNonza.Challenge.class, c -> {
@@ -1427,7 +1433,7 @@ protected final void parseAndProcessNonza(XmlPullParser parser) throws IOExcepti
             return;
         }
 
-        Nonza nonza = nonzaProvider.parse(parser, incomingStreamXmlEnvironment);
+        Nonza nonza = nonzaProvider.parse(parser, incomingStreamXmlEnvironment, getJxmppContext());
 
         maybeNotifyDebuggerAboutIncoming(nonza);
 
@@ -1465,7 +1471,7 @@ protected void parseAndProcessStanza(XmlPullParser parser)
         Stanza stanza = null;
         try {
             try {
-                stanza = PacketParserUtils.parseStanza(parser, incomingStreamXmlEnvironment);
+                stanza = PacketParserUtils.parseStanza(parser, incomingStreamXmlEnvironment, getJxmppContext());
             } catch (NullPointerException e) {
                 // Those exceptions should probably be wrapped into a SmackParsingException and therefore likely constitute a missing verification in the throwing parser.
                 String message = "Smack parser throw unexpected exception '" + e.getMessage() + "', please report this at " + Smack.BUG_REPORT_URL;
@@ -1899,7 +1905,7 @@ protected final void parseFeatures(XmlPullParser parser) throws XmlPullParserExc
                 default:
                     ExtensionElementProvider<ExtensionElement> provider = ProviderManager.getStreamFeatureProvider(name, namespace);
                     if (provider != null) {
-                        streamFeature = provider.parse(parser, incomingStreamXmlEnvironment);
+                        streamFeature = provider.parse(parser, incomingStreamXmlEnvironment, getJxmppContext());
                     }
                     break;
                 }
@@ -2146,6 +2152,11 @@ public long getLastStanzaReceived() {
         return lastStanzaReceived;
     }
 
+    @Override
+    public JxmppContext getJxmppContext() {
+        return jxmppContext;
+    }
+
     /**
      * Get the timestamp when the connection was the first time authenticated, i.e., when the first successful login was
      * performed. Note that this value is not reset on disconnect, so it represents the timestamp from the last
@@ -2293,7 +2304,7 @@ protected String onStreamOpen(XmlPullParser parser) {
         if (reportedServerDomainString != null) {
             DomainBareJid reportedServerDomain;
             try {
-                reportedServerDomain = JidCreate.domainBareFrom(reportedServerDomainString);
+                reportedServerDomain = JidCreate.domainBareFrom(reportedServerDomainString, getJxmppContext());
                 DomainBareJid configuredXmppServiceDomain = config.getXMPPServiceDomain();
                 if (!configuredXmppServiceDomain.equals(reportedServerDomain)) {
                     LOGGER.warning("Domain reported by server '" + reportedServerDomain

smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java

@@ -77,6 +77,7 @@
 import org.jivesoftware.smack.util.dns.SmackDaneProvider;
 import org.jivesoftware.smack.util.dns.SmackDaneVerifier;
 
+import org.jxmpp.JxmppContext;
 import org.jxmpp.jid.DomainBareJid;
 import org.jxmpp.jid.EntityBareJid;
 import org.jxmpp.jid.impl.JidCreate;
@@ -188,6 +189,8 @@ public abstract class ConnectionConfiguration {
 
     private final StanzaIdSourceFactory stanzaIdSourceFactory;
 
+    private final JxmppContext jxmppContext;
+
     protected ConnectionConfiguration(Builder<?, ?> builder) {
         try {
             smackTlsContext = getSmackTlsContext(builder.dnssecMode, builder.sslContextFactory,
@@ -249,6 +252,8 @@ protected ConnectionConfiguration(Builder<?, ?> builder) {
 
         stanzaIdSourceFactory = builder.stanzaIdSourceFactory;
 
+        jxmppContext = builder.jxmppContext;
+
         // If the enabledSaslMechanisms are set, then they must not be empty
         assert enabledSaslMechanisms == null || !enabledSaslMechanisms.isEmpty();
     }
@@ -303,6 +308,10 @@ private static SmackTlsContext getSmackTlsContext(DnssecMode dnssecMode, SslCont
         return new SmackTlsContext(context, daneVerifier, trustManager);
     }
 
+    protected static JxmppContext getDefaultJxmppContext() {
+        return SmackConfiguration.getDefaultJxmppContext();
+    }
+
     public String getHostString() {
         if (hostAddress != null) {
             return hostAddress.toString();
@@ -356,6 +365,10 @@ public DnsName getXmppServiceDomainAsDnsNameIfPossible() {
         return xmppServiceDomainDnsName;
     }
 
+    public JxmppContext getJxmppContext() {
+        return jxmppContext;
+    }
+
     /**
      * Returns the TLS security mode used when making the connection. By default,
      * the mode is {@link SecurityMode#required}.
@@ -645,6 +658,7 @@ StanzaIdSource constructStanzaIdSource() {
      * @param <C> the resulting connection configuration type parameter.
      */
     public abstract static class Builder<B extends Builder<B, C>, C extends ConnectionConfiguration> {
+        private final JxmppContext jxmppContext;
         private SecurityMode securityMode = SecurityMode.required;
         private DnssecMode dnssecMode = DnssecMode.disabled;
         private KeyManager[] keyManagers;
@@ -678,7 +692,8 @@ public abstract static class Builder<B extends Builder<B, C>, C extends Connecti
         private StanzaIdSourceFactory stanzaIdSourceFactory = new StandardStanzaIdSource.Factory();
 
         @SuppressWarnings("this-escape")
-        protected Builder() {
+        protected Builder(JxmppContext jxmppContext) {
+            this.jxmppContext = jxmppContext;
             if (SmackConfiguration.DEBUG) {
                 enableDefaultDebugger();
             }
@@ -695,7 +710,7 @@ protected Builder() {
          * @since 4.4.0
          */
         public B setXmppAddressAndPassword(CharSequence jid, String password) throws XmppStringprepException {
-            return setXmppAddressAndPassword(JidCreate.entityBareFrom(jid), password);
+            return setXmppAddressAndPassword(JidCreate.entityBareFrom(jid.toString(), jxmppContext), password);
         }
 
         /**
@@ -765,7 +780,7 @@ public B setXmppDomain(DomainBareJid xmppDomain) {
          * @throws XmppStringprepException if the given string is not a domain bare JID.
          */
         public B setXmppDomain(String xmppServiceDomain) throws XmppStringprepException {
-            this.xmppServiceDomain = JidCreate.domainBareFrom(xmppServiceDomain);
+            this.xmppServiceDomain = JidCreate.domainBareFrom(xmppServiceDomain, jxmppContext);
             return getThis();
         }
 

smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java

@@ -38,6 +38,8 @@
 import org.jivesoftware.smack.parsing.ParsingExceptionCallback;
 import org.jivesoftware.smack.util.Objects;
 
+import org.jxmpp.JxmppContext;
+
 /**
  * Represents the configuration of Smack. The configuration is used for:
  * <ul>
@@ -71,6 +73,8 @@ public final class SmackConfiguration {
 
     private static List<String> defaultMechs = new ArrayList<>();
 
+    private static JxmppContext defaultJxmppContext = JxmppContext.getDefaultContext();
+
     static Set<String> disabledSmackClasses = new HashSet<>();
 
     static final List<XMPPInputOutputStream> compressionHandlers = new ArrayList<>(2);
@@ -140,6 +144,14 @@ public static void setDefaultReplyTimeout(int timeout) {
         defaultPacketReplyTimeout = timeout;
     }
 
+    public static JxmppContext getDefaultJxmppContext() {
+        return defaultJxmppContext;
+    }
+
+    public static void setDefaultJxmppContext(JxmppContext jxmppContext) {
+        defaultJxmppContext = Objects.requireNonNull(jxmppContext);
+    }
+
     public static void setDefaultSmackDebuggerFactory(SmackDebuggerFactory debuggerFactory) {
         DEFAULT_DEBUGGER_FACTORY = Objects.requireNonNull(debuggerFactory, "Debugger factory must not be null");
     }

smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java

@@ -42,6 +42,7 @@
 import org.jivesoftware.smack.util.Consumer;
 import org.jivesoftware.smack.util.XmppElementUtil;
 
+import org.jxmpp.JxmppContext;
 import org.jxmpp.jid.DomainBareJid;
 import org.jxmpp.jid.EntityFullJid;
 
@@ -713,4 +714,9 @@ default boolean hasFeature(String element, String namespace) {
      * @return the timestamp in milliseconds
      */
     long getLastStanzaReceived();
+
+    default JxmppContext getJxmppContext() {
+        return JxmppContext.getDefaultContext();
+    };
+
 }

smack-core/src/main/java/org/jivesoftware/smack/c2s/ModularXmppClientToServerConnection.java

@@ -595,7 +595,7 @@ private void parseAndProcessElement(String element) {
                         }
                         break;
                     case "error":
-                        StreamError streamError = PacketParserUtils.parseStreamError(parser, null);
+                        StreamError streamError = PacketParserUtils.parseStreamError(parser, null, getJxmppContext());
                         StreamErrorException streamErrorException = new StreamErrorException(streamError);
                         setCurrentConnectionExceptionAndNotify(streamErrorException);
                         throw streamErrorException;

smack-core/src/main/java/org/jivesoftware/smack/c2s/ModularXmppClientToServerConnectionConfiguration.java

@@ -34,6 +34,8 @@
 import org.jivesoftware.smack.fsm.StateDescriptorGraph.GraphVertex;
 import org.jivesoftware.smack.util.CollectionUtil;
 
+import org.jxmpp.JxmppContext;
+
 public final class ModularXmppClientToServerConnectionConfiguration extends ConnectionConfiguration {
 
     final Set<ModularXmppClientToServerConnectionModuleDescriptor> moduleDescriptors;
@@ -83,7 +85,11 @@ public String getStateGraphInDotFormat() {
     }
 
     public static Builder builder() {
-        return new Builder();
+        return builder(getDefaultJxmppContext());
+    }
+
+    public static Builder builder(JxmppContext jxmppContext) {
+        return new Builder(jxmppContext);
     }
 
     public static final class Builder
@@ -93,7 +99,8 @@ public static final class Builder
 
         private boolean failOnUnknownStates;
 
-        private Builder() {
+        private Builder(JxmppContext jxmppContext) {
+            super(jxmppContext);
             SmackConfiguration.addAllKnownModulesTo(this);
         }
 

smack-core/src/main/java/org/jivesoftware/smack/compress/provider/CompressedProvider.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2018 Florian Schmaus
+ * Copyright 2018-2025 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@
 import org.jivesoftware.smack.provider.NonzaProvider;
 import org.jivesoftware.smack.xml.XmlPullParser;
 
+import org.jxmpp.JxmppContext;
+
 public final class CompressedProvider extends NonzaProvider<Compressed> {
 
     public static final CompressedProvider INSTANCE = new CompressedProvider();
@@ -29,7 +31,7 @@ private CompressedProvider() {
     }
 
     @Override
-    public Compressed parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) {
+    public Compressed parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment, JxmppContext jxmppContext) {
         return Compressed.INSTANCE;
     }
 

smack-core/src/main/java/org/jivesoftware/smack/compress/provider/FailureProvider.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2018-2019 Florian Schmaus
+ * Copyright 2018-2025 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,8 @@
 import org.jivesoftware.smack.xml.XmlPullParser;
 import org.jivesoftware.smack.xml.XmlPullParserException;
 
+import org.jxmpp.JxmppContext;
+
 public final class FailureProvider extends NonzaProvider<Failure> {
 
     private static final Logger LOGGER = Logger.getLogger(FailureProvider.class.getName());
@@ -39,7 +41,7 @@ private FailureProvider() {
     }
 
     @Override
-    public Failure parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException, SmackParsingException {
+    public Failure parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment, JxmppContext jxmppContext) throws XmlPullParserException, IOException, SmackParsingException {
         Failure.CompressFailureError compressFailureError = null;
         StanzaError stanzaError = null;
         XmlEnvironment failureXmlEnvironment = XmlEnvironment.from(parser, xmlEnvironment);
@@ -61,7 +63,7 @@ public Failure parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlE
                 case StreamOpen.SERVER_NAMESPACE:
                     switch (name) {
                         case StanzaError.ERROR:
-                            stanzaError = PacketParserUtils.parseError(parser, failureXmlEnvironment);
+                            stanzaError = PacketParserUtils.parseError(parser, failureXmlEnvironment, jxmppContext);
                             break;
                         default:
                             LOGGER.warning("Unknown element in " + namespace + ": " + name);

smack-core/src/main/java/org/jivesoftware/smack/parsing/StandardExtensionElementProvider.java

@@ -28,6 +28,8 @@
 import org.jivesoftware.smack.xml.XmlPullParser;
 import org.jivesoftware.smack.xml.XmlPullParserException;
 
+import org.jxmpp.JxmppContext;
+
 /**
  * The parser for {@link StandardExtensionElement}s.
  *
@@ -39,7 +41,7 @@ public class StandardExtensionElementProvider extends ExtensionElementProvider<S
     public static StandardExtensionElementProvider INSTANCE = new StandardExtensionElementProvider();
 
     @Override
-    public StandardExtensionElement parse(final XmlPullParser parser, final int initialDepth, XmlEnvironment xmlEnvironment)
+    public StandardExtensionElement parse(final XmlPullParser parser, final int initialDepth, XmlEnvironment xmlEnvironment, JxmppContext jxmppContext)
                     throws XmlPullParserException, IOException {
         // Unlike most (all?) other providers, we don't know the name and namespace of the element
         // we are parsing here.
@@ -79,7 +81,8 @@ public StandardExtensionElement parse(final XmlPullParser parser, final int init
             XmlPullParser.Event event = parser.next();
             switch (event) {
             case START_ELEMENT:
-                builder.addElement(parse(parser, parser.getDepth(), xmlEnvironment));
+                var element = parse(parser, parser.getDepth(), xmlEnvironment, jxmppContext);
+                builder.addElement(element);
                 break;
             case TEXT_CHARACTERS:
                 builder.setText(parser.getText());