patches: Update rstudio-server-multi-version patches.

The changes have been rebased on top of version 1.4.1717 and include a
bug fix.  Previous versions would fail to look up the user's active
sessions (and thus fail to restore a previously set version of R) when
rserver did not run as the same user account as the rsession
process (e.g. root).

7 files changed, 60 insertions, 42 deletions

diff --git a/patches/rstudio-server-multi-version/0001-handleClientInit-Store-R-versions-in-sessionInfo.patch b/patches/rstudio-server-multi-version/0001-handleClientInit-Store-R-versions-in-sessionInfo.patch
index 7e64e06..4908ed9 100644
--- a/patches/rstudio-server-multi-version/0001-handleClientInit-Store-R-versions-in-sessionInfo.patch
+++ b/patches/rstudio-server-multi-version/0001-handleClientInit-Store-R-versions-in-sessionInfo.patch
@@ -1,4 +1,4 @@
-From 6a8348988fcd961a67d709aa37c5defd7159b27b Mon Sep 17 00:00:00 2001
+From 131f634028a572b206742697d5cad2122ca940b1 Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Fri, 18 Dec 2020 10:26:44 +0100
 Subject: [PATCH 1/7] handleClientInit: Store R versions in sessionInfo.
@@ -15,7 +15,7 @@ r_versions_info->available_r_versions.
  1 file changed, 26 insertions(+), 5 deletions(-)
 
 diff --git a/src/cpp/session/SessionClientInit.cpp b/src/cpp/session/SessionClientInit.cpp
-index e4b3b7dd71..52523fc896 100644
+index ab1228096f..6d9e5a064b 100644
 --- a/src/cpp/session/SessionClientInit.cpp
 +++ b/src/cpp/session/SessionClientInit.cpp
 @@ -2,6 +2,7 @@
@@ -26,7 +26,7 @@ index e4b3b7dd71..52523fc896 100644
   *
   * Unless you have received this program directly from RStudio pursuant
   * to the terms of a commercial license agreement with RStudio, then
-@@ -62,6 +63,8 @@
+@@ -63,6 +64,8 @@
  #include <core/http/CSRFToken.hpp>
  #include <core/system/Environment.hpp>
  
@@ -35,7 +35,7 @@ index e4b3b7dd71..52523fc896 100644
  #include <session/SessionConsoleProcess.hpp>
  #include <session/SessionClientEventService.hpp>
  #include <session/SessionHttpConnection.hpp>
-@@ -507,11 +510,29 @@ void handleClientInit(const boost::function<void()>& initFunction,
+@@ -511,11 +514,29 @@ void handleClientInit(const boost::function<void()>& initFunction,
  
     sessionInfo["multi_session"] = options.multiSession();
  
@@ -71,5 +71,5 @@ index e4b3b7dd71..52523fc896 100644
     sessionInfo["show_user_home_page"] = options.showUserHomePage();
     sessionInfo["user_home_page_url"] = json::Value();
 -- 
-2.31.1
+2.33.0
 
diff --git a/patches/rstudio-server-multi-version/0002-sessionProcessConfig-Configure-R-version-from-active.patch b/patches/rstudio-server-multi-version/0002-sessionProcessConfig-Configure-R-version-from-active.patch
index 5105001..8b70bd0 100644
--- a/patches/rstudio-server-multi-version/0002-sessionProcessConfig-Configure-R-version-from-active.patch
+++ b/patches/rstudio-server-multi-version/0002-sessionProcessConfig-Configure-R-version-from-active.patch
@@ -1,4 +1,4 @@
-From 6172ab0908e8b80bd5838ed4336335d224b80941 Mon Sep 17 00:00:00 2001
+From 8202e0ae8276285afcdeee1fbec50a744a7171ff Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Fri, 18 Dec 2020 10:32:01 +0100
 Subject: [PATCH 2/7] sessionProcessConfig: Configure R version from active
@@ -13,11 +13,11 @@ be used to launch the embedded R.
 Configure R environment using the R version that has been recorded in
 the active session.
 ---
- src/cpp/server/ServerSessionManager.cpp | 26 ++++++++++++++++++++++++-
- 1 file changed, 25 insertions(+), 1 deletion(-)
+ src/cpp/server/ServerSessionManager.cpp | 44 ++++++++++++++++++++++++-
+ 1 file changed, 43 insertions(+), 1 deletion(-)
 
 diff --git a/src/cpp/server/ServerSessionManager.cpp b/src/cpp/server/ServerSessionManager.cpp
-index 6e37578cab..86d212779a 100644
+index 22f138a6ad..01be702a83 100644
 --- a/src/cpp/server/ServerSessionManager.cpp
 +++ b/src/cpp/server/ServerSessionManager.cpp
 @@ -2,6 +2,7 @@
@@ -43,20 +43,34 @@ index 6e37578cab..86d212779a 100644
  #include <monitor/MonitorClient.hpp>
  #include <session/SessionConstants.hpp>
  
-@@ -156,7 +161,26 @@ core::system::ProcessConfig sessionProcessConfig(
+@@ -156,7 +161,44 @@ core::system::ProcessConfig sessionProcessConfig(
     std::copy(extraArgs.begin(), extraArgs.end(), std::back_inserter(args));
  
     // append R environment variables
 -   r_util::RVersion rVersion = r_environment::rVersion();
 +   // Get the active session (e.g. after switching projects) and set R
 +   // variables according to the configured R version.
-+   core::system::User user;
-+   core::system::User::getUserFromIdentifier(context.username, user);
-+   FilePath userScratchPath_ = core::system::xdg::userDataDir(context.username);
++
++   // We cannot use core::system::userHomePath because it always
++   // returns the server user's home directory.  This is /root when
++   // rserver runs as root.  Instead we want to get the home directory
++   // of the *target* user for which rsession will be run.  This is
++   // why we launch a shell to determine the user's home directory.
++   core::system::ProcessOptions poptions;
++   core::system::ProcessResult presult;
++   Error rError = core::system::runCommand(
++            "/bin/sh -c 'echo -n ~" + context.username + "'",
++            poptions,
++            &presult);
++   if (rError)
++      LOG_ERROR(rError);
++   
++   FilePath homeDir = FilePath(presult.stdOut);
++   FilePath userScratchPath_ = core::system::xdg::userDataDir(context.username, homeDir);
 +
 +   r_util::ActiveSessions activeSessions(userScratchPath_);
 +   std::vector<boost::shared_ptr<r_util::ActiveSession> > sessions =
-+     activeSessions.list(user.getHomePath(), false);
++     activeSessions.list(homeDir, false);
 +
 +   r_util::RVersion rVersion;
 +   if (sessions.size() > 0) {
@@ -65,6 +79,10 @@ index 6e37578cab..86d212779a 100644
 +     std::string errorMsg;
 +     bool success = r_environment::detectRVersion(FilePath((*sessions.front()).rVersionHome()).completePath("bin/R"),
 +                                   &rVersion, &errorMsg);
++
++     if (!success) {
++       rVersion = r_environment::rVersion();
++     }
 +   } else {
 +     rVersion = r_environment::rVersion();
 +   }
@@ -72,5 +90,5 @@ index 6e37578cab..86d212779a 100644
     environment.insert(environment.end(), rEnvVars.begin(), rEnvVars.end());
     
 -- 
-2.31.1
+2.33.0
 
diff --git a/patches/rstudio-server-multi-version/0003-NewProjectWizard-Unhide-version-selector-widget.patch b/patches/rstudio-server-multi-version/0003-NewProjectWizard-Unhide-version-selector-widget.patch
index c8f78a5..74ddd99 100644
--- a/patches/rstudio-server-multi-version/0003-NewProjectWizard-Unhide-version-selector-widget.patch
+++ b/patches/rstudio-server-multi-version/0003-NewProjectWizard-Unhide-version-selector-widget.patch
@@ -1,4 +1,4 @@
-From 28a8054858657014cb83703be222a06f3aa06119 Mon Sep 17 00:00:00 2001
+From 4063e89423325632efc734ae3d2e143f354392cf Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Fri, 18 Dec 2020 10:35:39 +0100
 Subject: [PATCH 3/7] NewProjectWizard: Unhide version selector widget.
@@ -11,10 +11,10 @@ Do not hide the widget.
  1 file changed, 1 deletion(-)
 
 diff --git a/src/gwt/src/org/rstudio/studio/client/projects/ui/newproject/NewProjectWizard.java b/src/gwt/src/org/rstudio/studio/client/projects/ui/newproject/NewProjectWizard.java
-index 08ece8ab26..3a19f4eeab 100644
+index f386b99af1..d39ef19bf9 100644
 --- a/src/gwt/src/org/rstudio/studio/client/projects/ui/newproject/NewProjectWizard.java
 +++ b/src/gwt/src/org/rstudio/studio/client/projects/ui/newproject/NewProjectWizard.java
-@@ -70,7 +70,6 @@ public class NewProjectWizard extends Wizard<NewProjectInput,NewProjectResult>
+@@ -71,7 +71,6 @@ public class NewProjectWizard extends Wizard<NewProjectInput,NewProjectResult>
           rVersionSelector_.setRVersion(rVersion);
           addLeftWidget(rVersionSelector_);
           rVersionSelector_.getElement().getStyle().setMarginRight(8, Unit.PX);
@@ -23,5 +23,5 @@ index 08ece8ab26..3a19f4eeab 100644
        
        openInNewWindow_ = new CheckBox("Open in new session");
 -- 
-2.31.1
+2.33.0
 
diff --git a/patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch b/patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch
index 0fbeb86..0cd1c7c 100644
--- a/patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch
+++ b/patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch
@@ -1,4 +1,4 @@
-From a41c5e9ce141713b12ad552205c27db41193c477 Mon Sep 17 00:00:00 2001
+From 54e7fb9c835b3ec8afcb5db55b03a8ead3ff6088 Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Sat, 19 Dec 2020 00:57:26 +0100
 Subject: [PATCH 4/7] handleConnection: Switch R version when switching
@@ -70,10 +70,10 @@ index 2fd08c028b..3e66f13dd7 100644
                                                             module_context::sharedProjectScratchPath(),
                                                             version,
 diff --git a/src/gwt/src/org/rstudio/studio/client/projects/Projects.java b/src/gwt/src/org/rstudio/studio/client/projects/Projects.java
-index 89c3eb04b9..4ebeb6881d 100644
+index 71ce880487..63937c4806 100644
 --- a/src/gwt/src/org/rstudio/studio/client/projects/Projects.java
 +++ b/src/gwt/src/org/rstudio/studio/client/projects/Projects.java
-@@ -1131,7 +1131,8 @@ public class Projects implements OpenProjectFileHandler,
+@@ -1127,7 +1127,8 @@ public class Projects implements OpenProjectFileEvent.Handler,
                          {
                             // perform quit
                             applicationQuit_.performQuit(null, saveChanges,
@@ -84,5 +84,5 @@ index 89c3eb04b9..4ebeb6881d 100644
                       };
  
 -- 
-2.31.1
+2.33.0
 
diff --git a/patches/rstudio-server-multi-version/0005-Add-version-switcher-widget-to-toolbar.patch b/patches/rstudio-server-multi-version/0005-Add-version-switcher-widget-to-toolbar.patch
index da4f79f..18c1158 100644
--- a/patches/rstudio-server-multi-version/0005-Add-version-switcher-widget-to-toolbar.patch
+++ b/patches/rstudio-server-multi-version/0005-Add-version-switcher-widget-to-toolbar.patch
@@ -1,4 +1,4 @@
-From 3a70a198af9771dc080ab3d790cab38d47196042 Mon Sep 17 00:00:00 2001
+From 0bf91a24f1d087bc78b501e0493eea7f02a9b9d3 Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Sat, 19 Dec 2020 23:33:16 +0100
 Subject: [PATCH 5/7] Add version switcher widget to toolbar.
@@ -14,10 +14,10 @@ Subject: [PATCH 5/7] Add version switcher widget to toolbar.
  create mode 100644 src/gwt/src/org/rstudio/studio/client/application/ui/RVersionPopupMenu.java
 
 diff --git a/src/gwt/src/org/rstudio/core/client/ElementIds.java b/src/gwt/src/org/rstudio/core/client/ElementIds.java
-index 9a62c2f5b1..7ef305d552 100644
+index e47990a68d..eaffa48271 100644
 --- a/src/gwt/src/org/rstudio/core/client/ElementIds.java
 +++ b/src/gwt/src/org/rstudio/core/client/ElementIds.java
-@@ -295,6 +295,8 @@ public class ElementIds
+@@ -321,6 +321,8 @@ public class ElementIds
     public final static String PROJECT_MENUBUTTON_TOOLBAR_SUFFIX = "toolbar";
     public final static String PROJECT_MENUBUTTON_MENUBAR_SUFFIX = "menubar";
  
@@ -27,7 +27,7 @@ index 9a62c2f5b1..7ef305d552 100644
     public final static String BUILD_MORE_MENUBUTTON = "build_more_menubutton";
     public final static String BUILD_BOOKDOWN_MENUBUTTON = "build_bookdown_menubutton";
 diff --git a/src/gwt/src/org/rstudio/studio/client/RStudioGinjector.java b/src/gwt/src/org/rstudio/studio/client/RStudioGinjector.java
-index 5ee1e0b025..1517834382 100644
+index 486146b30e..2bb2acb895 100644
 --- a/src/gwt/src/org/rstudio/studio/client/RStudioGinjector.java
 +++ b/src/gwt/src/org/rstudio/studio/client/RStudioGinjector.java
 @@ -41,6 +41,7 @@ import org.rstudio.studio.client.application.AriaLiveService;
@@ -38,7 +38,7 @@ index 5ee1e0b025..1517834382 100644
  import org.rstudio.studio.client.application.ui.addins.AddinsToolbarButton;
  import org.rstudio.studio.client.application.ui.impl.DesktopApplicationHeader;
  import org.rstudio.studio.client.application.ui.impl.WebApplicationHeader;
-@@ -226,6 +227,7 @@ public interface RStudioGinjector extends Ginjector
+@@ -227,6 +228,7 @@ public interface RStudioGinjector extends Ginjector
     void injectMembers(CodeFilesList codeFilesList);
     void injectMembers(ToolbarPopupMenu toolbarPopupMenu);
     void injectMembers(ProjectPopupMenu projectPopupMenu);
@@ -230,10 +230,10 @@ index 0000000000..ca66b2f53f
 +   private EventBus events_;
 +}
 diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.cmd.xml b/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.cmd.xml
-index 8f53957924..47c5fbb89a 100644
+index c036e2d519..0ff515aa02 100644
 --- a/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.cmd.xml
 +++ b/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.cmd.xml
-@@ -1312,6 +1312,17 @@ well as menu structures (for main menu and popup menus).
+@@ -1324,6 +1324,17 @@ well as menu structures (for main menu and popup menus).
          desc="Edit options for the current project"
          windowMode="main"/>
  
@@ -252,7 +252,7 @@ index 8f53957924..47c5fbb89a 100644
          menuLabel=""
          buttonLabel=""
 diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.java b/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.java
-index 803f79ecc9..1c84e2c039 100644
+index 37a88a2369..cbe16750f4 100644
 --- a/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.java
 +++ b/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.java
 @@ -2,6 +2,7 @@
@@ -263,7 +263,7 @@ index 803f79ecc9..1c84e2c039 100644
   *
   * Unless you have received this program directly from RStudio pursuant
   * to the terms of a commercial license agreement with RStudio, then
-@@ -231,6 +232,18 @@ public abstract class
+@@ -232,6 +233,18 @@ public abstract class
     public abstract AppCommand projectSweaveOptions();
     public abstract AppCommand setWorkingDirToProjectDir();
  
@@ -283,5 +283,5 @@ index 803f79ecc9..1c84e2c039 100644
     public abstract AppCommand consoleClear();
     public abstract AppCommand interruptR();
 -- 
-2.31.1
+2.33.0
 
diff --git a/patches/rstudio-server-multi-version/0006-Look-at-.local-share-rstudio-r-versions-for-custom-R.patch b/patches/rstudio-server-multi-version/0006-Look-at-.local-share-rstudio-r-versions-for-custom-R.patch
index 48150c3..cb5acec 100644
--- a/patches/rstudio-server-multi-version/0006-Look-at-.local-share-rstudio-r-versions-for-custom-R.patch
+++ b/patches/rstudio-server-multi-version/0006-Look-at-.local-share-rstudio-r-versions-for-custom-R.patch
@@ -1,4 +1,4 @@
-From e309b35a2f59a268442de8e1684ddd72fc9e5166 Mon Sep 17 00:00:00 2001
+From b5f4604100d06bc52b31a5e661bc8d4f3cef3259 Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Sun, 20 Dec 2020 00:25:42 +0100
 Subject: [PATCH 6/7] Look at ~/.local/share/rstudio/r-versions for custom R
@@ -68,10 +68,10 @@ index 840429edf5..3cf9b7d79e 100644
     bool detectRVersion(const core::FilePath& rScriptPath,
                         core::r_util::RVersion* pVersion,
 diff --git a/src/cpp/session/SessionClientInit.cpp b/src/cpp/session/SessionClientInit.cpp
-index 52523fc896..34dad727c4 100644
+index 6d9e5a064b..52bf324cb2 100644
 --- a/src/cpp/session/SessionClientInit.cpp
 +++ b/src/cpp/session/SessionClientInit.cpp
-@@ -511,8 +511,14 @@ void handleClientInit(const boost::function<void()>& initFunction,
+@@ -515,8 +515,14 @@ void handleClientInit(const boost::function<void()>& initFunction,
     sessionInfo["multi_session"] = options.multiSession();
  
     // Read versions from /etc/rstudio/r-versions
@@ -88,5 +88,5 @@ index 52523fc896..34dad727c4 100644
       {
         json::Object rVersionJson;
 -- 
-2.31.1
+2.33.0
 
diff --git a/patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch b/patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch
index 96eb6aa..7f61e9c 100644
--- a/patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch
+++ b/patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch
@@ -1,4 +1,4 @@
-From 36ed7d1c0036d40798a3ab5045f365e8e33692f3 Mon Sep 17 00:00:00 2001
+From 4834bd54840c7df650b10222597f06a312ce24c6 Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Sun, 20 Dec 2020 14:49:51 +0100
 Subject: [PATCH 7/7] detectRLocationsUsingR: Restore R_HOME at the end.
@@ -11,10 +11,10 @@ process is calling it, and its R_HOME may not be unset.
  1 file changed, 3 insertions(+)
 
 diff --git a/src/cpp/core/r_util/REnvironmentPosix.cpp b/src/cpp/core/r_util/REnvironmentPosix.cpp
-index 83b60d7a1b..a909631e25 100644
+index dbc9a9a1af..8ec66fd840 100644
 --- a/src/cpp/core/r_util/REnvironmentPosix.cpp
 +++ b/src/cpp/core/r_util/REnvironmentPosix.cpp
-@@ -489,6 +489,7 @@ bool detectRLocationsUsingR(const std::string& rScriptPath,
+@@ -492,6 +492,7 @@ bool detectRLocationsUsingR(const std::string& rScriptPath,
     // (the normal semantics of invoking the R script are that it overwrites
     // R_HOME and prints a warning -- this warning is co-mingled with the
     // output of R and messes up our parsing)
@@ -22,7 +22,7 @@ index 83b60d7a1b..a909631e25 100644
     core::system::setenv("R_HOME", "");
  
     // if no R path was specified for a module, the module binary path MUST be specified
-@@ -598,6 +599,8 @@ bool detectRLocationsUsingR(const std::string& rScriptPath,
+@@ -601,6 +602,8 @@ bool detectRLocationsUsingR(const std::string& rScriptPath,
        return false;
     }
  
@@ -32,5 +32,5 @@ index 83b60d7a1b..a909631e25 100644
  }
  #endif
 -- 
-2.31.1
+2.33.0