Merge remote-tracking branch 'origin/develop' into fb_sampleColors

Author: XingY

api/src/org/labkey/api/ApiModule.java

@@ -173,6 +173,7 @@
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.Path;
 import org.labkey.api.util.SessionHelper;
+import org.labkey.api.util.SmtpTransportProvider;
 import org.labkey.api.util.StringExpressionFactory;
 import org.labkey.api.util.StringUtilsLabKey;
 import org.labkey.api.util.SvgUtil;
@@ -234,6 +235,7 @@ protected void init()
 
         PropertyManager.registerEncryptionMigrationHandler();
         AuthenticationManager.registerEncryptionMigrationHandler();
+        MailHelper.registerProvider(new SmtpTransportProvider());
 
         LabKeyManagement.register(new StandardMBean(new OperationsMXBeanImpl(), OperationsMXBean.class, true), "Operations");
 

api/src/org/labkey/api/notification/EmailMessage.java

@@ -40,7 +40,7 @@ public interface EmailMessage
     // TODO: Only used by tests... delete?
     void setFiles(List<File> files);
     void addContent(MimeType type, String content);
-    void addContent(MimeType type, HttpServletRequest request, HttpView view) throws Exception;
+    void addContent(MimeType type, HttpServletRequest request, HttpView<?> view) throws Exception;
 
     /**
      * Sets the display name for the email sender, the actual sender email address will be the one configured via site or project settings

api/src/org/labkey/api/pipeline/PipelineJob.java

@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import datadog.trace.api.CorrelationIdentifier;
 import datadog.trace.api.Trace;
@@ -1897,12 +1898,30 @@ public static PipelineJob deserializeJob(@NotNull String serialized)
     }
 
     public static ObjectMapper createObjectMapper()
+    {
+        return createObjectMapper(null);
+    }
+
+    /**
+     * Build the pipeline-job ObjectMapper. Polymorphic default typing (NON_FINAL) is always active so the concrete
+     * PipelineJob subclass and its field graph round-trip through {@code @class} type ids on the wire.
+     *
+     * @param typeValidator when non-null, default typing is activated with this {@link PolymorphicTypeValidator}
+     * (a deny-by-default allowlist) instead of the deprecated, unrestricted {@code enableDefaultTyping}. It is consulted
+     * only on deserialization, so only the pipeline-job deserialize path passes one (see {@code PipelineJacksonTyping});
+     * serialization and all other callers pass null and keep the historical permissive behavior.
+     */
+    public static ObjectMapper createObjectMapper(@Nullable PolymorphicTypeValidator typeValidator)
     {
         ObjectMapper mapper = JsonUtil.DEFAULT_MAPPER.copy()
             .setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE)
             .setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY)
-            .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
-            .enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+            .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+
+        if (typeValidator != null)
+            mapper.activateDefaultTyping(typeValidator, ObjectMapper.DefaultTyping.NON_FINAL);
+        else
+            mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
 
         SimpleModule module = new SimpleModule();
         module.addSerializer(new SqlTimeSerialization.SqlTimeSerializer());

api/src/org/labkey/api/secrets/SecretProvider.java

@@ -30,4 +30,14 @@ public interface SecretProvider
 
     /** Human-readable name for this source, shown on the admin secrets page. */
     @NotNull String getDescription();
+
+    /**
+     * Returns the name of the application this source is scoped to, or {@code null} if this
+     * source has no notion of an application name (the default). Used for attributing
+     * externally-billed resources (e.g., Vertex AI requests) back to the owning app.
+     */
+    default @Nullable String getAppName()
+    {
+        return null;
+    }
 }

api/src/org/labkey/api/secrets/SecretService.java

@@ -90,4 +90,10 @@ static void setInstance(SecretService service)
      * The external provider takes priority over startup-property and environment-variable sources.
      */
     @Nullable String getExternalProviderDescription();
+
+    /**
+     * Returns the application name reported by the highest-priority provider that has one
+     * (see {@link SecretProvider#getAppName()}), or {@code null} if no active provider reports one.
+     */
+    @Nullable String getAppName();
 }

api/src/org/labkey/api/settings/AppProps.java

@@ -21,6 +21,7 @@
 import org.labkey.api.data.ContainerManager;
 import org.labkey.api.module.DefaultModule;
 import org.labkey.api.module.SupportedDatabase;
+import org.labkey.api.secrets.SecretService;
 import org.labkey.api.util.ExceptionReportingLevel;
 import org.labkey.api.util.Path;
 import org.labkey.api.util.UsageReportingLevel;
@@ -75,6 +76,17 @@ static WriteableAppProps getWriteableInstance()
     @Nullable
     String getEnlistmentId();
 
+    /**
+     * Returns the DevOps-assigned name of the tenant/customer this deployment belongs to (e.g., "Hooli",
+     * "WNPRC"), or {@code null} if none is configured. Not customer-facing; currently sourced from
+     * whichever active {@link org.labkey.api.secrets.SecretProvider} reports one.
+     * @see SecretService#getAppName()
+     */
+    default @Nullable String getAppName()
+    {
+        return SecretService.get().getAppName();
+    }
+
     boolean isCachingAllowed();
 
     boolean isRecompileJspEnabled();

api/src/org/labkey/api/util/EmailTransportProvider.java

@@ -17,6 +17,7 @@
 
 import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
+import jakarta.mail.Session;
 
 import java.util.Properties;
 
@@ -31,6 +32,13 @@ public interface EmailTransportProvider
      */
     String getName();
 
+    /**
+     * @return a short, human-readable hint describing how to configure this provider, used when building the
+     * "no email transport configured" error message. For example, {@code "SMTP (mail.smtp.*)"}. Only the hints of
+     * registered providers are shown, so an undeployed provider (e.g. Microsoft Graph) never appears in the message.
+     */
+    String getConfigurationHint();
+
     /**
      * Load configuration from startup properties and/or ServletContext.
      * Called once during initialization.
@@ -50,6 +58,17 @@ public interface EmailTransportProvider
      */
     void send(Message message) throws MessagingException;
 
+    /**
+     * @return the {@link Session} to associate with newly created messages. The session travels with the message and
+     * carries any transport-specific configuration needed at send time (e.g. SMTP host/port/auth). Transports that
+     * don't rely on the session (e.g. Microsoft Graph, which reads the assembled MIME content) can use the default
+     * neutral session.
+     */
+    default Session getSession()
+    {
+        return MailHelper.getDefaultSession();
+    }
+
     /**
      * @return the configuration properties for this provider
      */

api/src/org/labkey/api/util/MailHelper.java

@@ -53,7 +53,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.StringTokenizer;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * Provides static functions for help with sending email. Supports SMTP and Microsoft Graph transport providers.
@@ -65,11 +67,15 @@ public class MailHelper
     private static final Logger _log = LogHelper.getLogger(MailHelper.class, "Errors sending and configuring email");
 
     // Transport providers
-    private static final SmtpTransportProvider _smtpProvider = new SmtpTransportProvider();
-    private static final List<EmailTransportProvider> _providers = new ArrayList<>(List.of(_smtpProvider));
+    private static final List<EmailTransportProvider> _providers = new CopyOnWriteArrayList<>();
+
+    // A neutral session for building MIME messages. Used when the active provider doesn't need session-based transport
+    // config (e.g. Microsoft Graph) or when no provider is configured. Message assembly (headers, body, attachments)
+    // doesn't depend on any transport-specific session state.
+    private static final Session DEFAULT_SESSION = Session.getInstance(new Properties());
 
     // Active provider (set during initialization)
-    private static EmailTransportProvider _activeProvider = null;
+    private static volatile EmailTransportProvider _activeProvider = null;
 
     // Configuration conflict flag
     private static boolean _configurationConflict = false;
@@ -121,13 +127,24 @@ public static EmailTransportProvider getActiveProvider()
         return _activeProvider;
     }
 
+    /**
+     * Directly set the active transport provider, bypassing the normal configuration-driven selection in
+     * {@link #loadActiveProvider()}. Intended for tools that need to temporarily redirect all outgoing email, such as
+     * the Dumbster mail recorder, which installs its own {@link SmtpTransportProvider} pointed at a local capture
+     * server. Callers should save the previous provider (via {@link #getActiveProvider()}) and restore it when done.
+     */
+    public static void setActiveProvider(@Nullable EmailTransportProvider provider)
+    {
+        _activeProvider = provider;
+    }
+
     public static boolean hasActiveProvider()
     {
         return null != _activeProvider;
     }
 
     /**
-     * Registers an optional transport provider. Must be called during module {@code init()} so that
+     * Registers a transport provider. Must be called during module {@code init()} so that
      * all providers are in place before {@link #init()} calls {@link #loadActiveProvider()}.
      */
     public static void registerProvider(EmailTransportProvider provider)
@@ -140,31 +157,37 @@ public static void init()
         _activeProvider = loadActiveProvider();
     }
 
-    public static void setSmtpSession(Session session)
+    /**
+     * @return the {@link Session} to associate with newly created messages, supplied by the active transport provider
+     * (which decides what session state, if any, a message needs to carry to be delivered). Falls back to a neutral
+     * session when no provider is configured. Provider-agnostic: callers should not assume this is an SMTP session.
+     */
+    @NotNull
+    public static Session getSession()
     {
-        _smtpProvider.setSession(session);
+        return null != _activeProvider ? _activeProvider.getSession() : DEFAULT_SESSION;
     }
 
     /**
-     * Returns the SMTP session for creating messages
+     * @return a neutral session suitable for assembling MIME messages that don't need transport-specific session state.
      */
-    @Nullable
-    public static Session getSmtpSession()
+    @NotNull
+    static Session getDefaultSession()
     {
-        return _smtpProvider.getSession();
+        return DEFAULT_SESSION;
     }
 
     /**
      * Creates a blank email message. Caller must set all fields before sending.
      */
     public static ViewMessage createMessage()
     {
-        return new ViewMessage(getSmtpSession());
+        return new ViewMessage(getSession());
     }
 
     public static MultipartMessage createMultipartMessage()
     {
-        return new MultipartMessage(getSmtpSession());
+        return new MultipartMessage(getSession());
     }
 
     /**
@@ -199,6 +222,21 @@ public static Address[] createAddressArray(String s) throws AddressException
         return addresses.toArray(new Address[0]);
     }
 
+    /**
+     * Builds the "no email transport configured" message from the hints of the currently registered providers, so that
+     * an undeployed provider (e.g. Microsoft Graph, when its module isn't present) is never mentioned.
+     */
+    private static String noTransportConfiguredMessage()
+    {
+        List<String> hints = _providers.stream()
+            .map(EmailTransportProvider::getConfigurationHint)
+            .toList();
+        if (hints.isEmpty())
+            return "No email transport configured and no transport providers are registered.";
+        String choices = StringUtilsLabKey.joinWithConjunction(hints, "or");
+        return "No email transport configured. Please configure " + choices + " settings.";
+    }
+
     /**
      * Sends an email message using the configured transport provider. This method logs
      * exceptions before throwing them to the caller. The caller should avoid double-logging
@@ -222,9 +260,7 @@ public static void send(Message m, @Nullable User user, Container c)
             // Check if any provider is configured
             if (_activeProvider == null)
             {
-                throw new ConfigurationException(
-                    "No email transport configured. Please configure either SMTP (mail.smtp.*) " +
-                    "or Microsoft Graph (mail.graph.*) settings.");
+                throw new ConfigurationException(noTransportConfiguredMessage());
             }
 
             // Send via the active provider

api/src/org/labkey/api/util/SmtpTransportProvider.java

@@ -66,6 +66,12 @@ public String getName()
         return "SMTP";
     }
 
+    @Override
+    public String getConfigurationHint()
+    {
+        return "SMTP (mail.smtp.*)";
+    }
+
     @Override
     public void loadConfiguration()
     {
@@ -99,22 +105,7 @@ public void handle(Collection<StartupPropertyEntry> entries)
             // Create session if configured
             if (isConfigured())
             {
-                _session = Session.getInstance(_properties);
-
-                if ("true".equalsIgnoreCase(_session.getProperty("mail.smtp.ssl.enable")) ||
-                        "true".equalsIgnoreCase(_session.getProperty("mail.smtp.starttls.enable")))
-                {
-                    String username = _session.getProperty("mail.smtp.user");
-                    String password = _session.getProperty("mail.smtp.password");
-                    _session = Session.getInstance(_session.getProperties(), new Authenticator()
-                    {
-                        @Override
-                        protected PasswordAuthentication getPasswordAuthentication()
-                        {
-                            return new PasswordAuthentication(username, password);
-                        }
-                    });
-                }
+                _session = createSession(_properties);
                 LOG.info("Email configured to use SMTP transport");
             }
         }
@@ -124,6 +115,40 @@ protected PasswordAuthentication getPasswordAuthentication()
         }
     }
 
+    /**
+     * Configure this provider directly from the supplied SMTP properties, replacing any previously loaded
+     * configuration and rebuilding the session. Used to point SMTP transport at an alternate server (e.g. the
+     * Dumbster mail recorder's local capture server) without reaching into another provider's session state.
+     */
+    public void configure(Properties properties)
+    {
+        _properties.clear();
+        _properties.putAll(properties);
+        _session = createSession(_properties);
+    }
+
+    private static Session createSession(Properties properties)
+    {
+        Session session = Session.getInstance(properties);
+
+        if ("true".equalsIgnoreCase(session.getProperty("mail.smtp.ssl.enable")) ||
+                "true".equalsIgnoreCase(session.getProperty("mail.smtp.starttls.enable")))
+        {
+            String username = session.getProperty("mail.smtp.user");
+            String password = session.getProperty("mail.smtp.password");
+            session = Session.getInstance(session.getProperties(), new Authenticator()
+            {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication()
+                {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+
+        return session;
+    }
+
     @Override
     public boolean isConfigured()
     {
@@ -141,18 +166,15 @@ public void send(Message message) throws MessagingException
     }
 
     /**
-     * @return the SMTP session for creating messages, or null if not configured
+     * @return the SMTP session, which carries the host/port/auth configuration that {@code Transport.send()} needs at
+     * send time, or null if not configured
      */
+    @Override
     public Session getSession()
     {
         return _session;
     }
 
-    public void setSession(Session session)
-    {
-        _session = session;
-    }
-
     @Override
     public Properties getProperties()
     {