Fix bool assignment for use_remote_user

The option `use_remote_user` was used an declared as bool in the codebase, but it was assigned the value of `single_user` in some cases and that option can be either a bool or an email address (str) causing the type validation to fail.
galaxyproject · Aug 25, 2023 · c9a6794 · c9a6794
1 parent bc9a64f
commit c9a6794
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/galaxy/config/__init__.py b/lib/galaxy/config/__init__.py
@@ -914,7 +914,7 @@ def _process_config(self, kwargs: Dict[str, Any]) -> None:
         self.galaxy_data_manager_data_path = self.galaxy_data_manager_data_path or self.tool_data_path
         self.tool_secret = kwargs.get("tool_secret", "")
         self.metadata_strategy = kwargs.get("metadata_strategy", "directory")
-        self.use_remote_user = self.use_remote_user or self.single_user
+        self.use_remote_user = self.use_remote_user or bool(self.single_user)
         self.fetch_url_allowlist_ips = [
             ipaddress.ip_network(unicodify(ip.strip()))  # If it has a slash, assume 127.0.0.1/24 notation
             if "/" in ip

diff --git a/lib/galaxy/webapps/galaxy/buildapp.py b/lib/galaxy/webapps/galaxy/buildapp.py
@@ -1201,7 +1201,7 @@ def wrap_in_middleware(app, global_conf, application_stack, **local_conf):
     # protects Galaxy from improperly configured authentication in the
     # upstream server
     single_user = conf.get("single_user", None)
-    use_remote_user = asbool(conf.get("use_remote_user", False)) or single_user
+    use_remote_user = asbool(conf.get("use_remote_user", False)) or bool(single_user)
     if use_remote_user:
         from galaxy.web.framework.middleware.remoteuser import RemoteUser