Merge discvr-19.3 to develop

Author: bbimber

LDK/api-src/org/labkey/api/ldk/LDKService.java

@@ -77,4 +77,6 @@ static public void setInstance(LDKService instance)
     abstract public List<ButtonConfigFactory> getQueryButtons(TableInfo ti);
 
     abstract public void customizeButtonBar(AbstractTableInfo ti, List<ButtonConfigFactory> buttons);
+
+    abstract public User getBackgroundAdminUser();
 }

LDK/resources/module.xml

@@ -2,4 +2,13 @@
     <clientDependencies>
         <dependency path="LDK/LDKApi"/>
     </clientDependencies>
+    <properties>
+        <propertyDescriptor name="BackgroundAdminUser">
+            <description>This is the username of a user that can be used by background processes to execute tasks.  An example is certain system maintenance tasks, which might require a user to execute some operations.</description>
+            <canSetPerContainer>false</canSetPerContainer>
+            <editPermissions>
+                <permission>ADMIN</permission>
+            </editPermissions>
+        </propertyDescriptor>
+    </properties>
 </module>

LDK/src/org/labkey/ldk/LDKServiceImpl.java

@@ -2,6 +2,7 @@
 
 import org.apache.commons.collections4.MultiValuedMap;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.json.JSONArray;
@@ -10,6 +11,7 @@
 import org.labkey.api.data.AbstractTableInfo;
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.Container;
+import org.labkey.api.data.ContainerManager;
 import org.labkey.api.data.DbSchema;
 import org.labkey.api.data.SQLFragment;
 import org.labkey.api.data.Selector;
@@ -22,8 +24,12 @@
 import org.labkey.api.ldk.LDKService;
 import org.labkey.api.ldk.notification.NotificationSection;
 import org.labkey.api.ldk.table.ButtonConfigFactory;
+import org.labkey.api.module.Module;
+import org.labkey.api.module.ModuleLoader;
+import org.labkey.api.module.ModuleProperty;
 import org.labkey.api.security.User;
-import org.labkey.api.services.ServiceRegistry;
+import org.labkey.api.security.UserManager;
+import org.labkey.api.security.ValidEmail;
 import org.labkey.ldk.query.BuiltInColumnsCustomizer;
 import org.labkey.ldk.query.ColumnOrderCustomizer;
 import org.labkey.ldk.query.DefaultTableCustomizer;
@@ -54,6 +60,7 @@ public class LDKServiceImpl extends LDKService
     private List<List<String>> _containerScopedTables = new ArrayList<>();
     private Boolean _isNaturalizeInstalled = null;
     private Map<String, Map<String, List<ButtonConfigFactory>>> _queryButtons = new CaseInsensitiveHashMap<Map<String, List<ButtonConfigFactory>>>();
+    private static final String BACKGROUND_USER_PROPNAME = "BackgroundAdminUser";
 
     public LDKServiceImpl()
     {
@@ -483,4 +490,31 @@ public void setBrowser(String browser)
             _browser = browser;
         }
     }
+
+    public User getBackgroundAdminUser()
+    {
+        Module m = ModuleLoader.getInstance().getModule(LDKModule.NAME);
+        ModuleProperty mp = m.getModuleProperties().get(BACKGROUND_USER_PROPNAME);
+        String username = StringUtils.trimToNull(mp.getValueContainerSpecific(ContainerManager.getRoot()));
+        if (username != null)
+        {
+            User u = UserManager.getUserByDisplayName(username);
+            if (u == null)
+            {
+                try
+                {
+                    u = UserManager.getUser(new ValidEmail(username));
+                }
+                catch (ValidEmail.InvalidEmailException e)
+                {
+                    //ignore
+
+                }
+            }
+
+            return u;
+        }
+
+        return null;
+    }
 }