Pass username from Windows to login page.

Signed-off-by: alex-z <blackslayer4@gmail.com>

diff --git a/NEXTCLOUD.cmake b/NEXTCLOUD.cmake
index d34e682af89bbd5cbcad642856d3141718ede266..576ca81564cc2559e12dac3286a5f2bab87d110d 100644 (file)
--- a/NEXTCLOUD.cmake
+++ b/NEXTCLOUD.cmake
@@ -13,6 +13,7 @@ set( APPLICATION_REV_DOMAIN "com.nextcloud.desktopclient" )
 set( APPLICATION_VIRTUALFILE_SUFFIX "nextcloud" CACHE STRING "Virtual file suffix (not including the .)")
 set( APPLICATION_OCSP_STAPLING_ENABLED OFF )
 set( APPLICATION_FORBID_BAD_SSL OFF )
+set( APPLICATION_LOGIN_WITH_SYSTEM_USERNAME OFF )
 
 set( LINUX_PACKAGE_SHORTNAME "nextcloud" )
 set( LINUX_APPLICATION_ID "${APPLICATION_REV_DOMAIN}.${LINUX_PACKAGE_SHORTNAME}")

diff --git a/config.h.in b/config.h.in
index e9eff6c929629eef492b5647eeb3766b60e56c78..2aebdb6b5777298a1e79afd9a03bdbd491d2c641 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -31,6 +31,7 @@
 #cmakedefine APPLICATION_VIRTUALFILE_SUFFIX "@APPLICATION_VIRTUALFILE_SUFFIX@"
 #cmakedefine APPLICATION_OCSP_STAPLING_ENABLED "@APPLICATION_OCSP_STAPLING_ENABLED@"
 #cmakedefine APPLICATION_FORBID_BAD_SSL "@APPLICATION_FORBID_BAD_SSL@"
+#cmakedefine APPLICATION_LOGIN_WITH_SYSTEM_USERNAME "@APPLICATION_LOGIN_WITH_SYSTEM_USERNAME@"
 #define APPLICATION_DOTVIRTUALFILE_SUFFIX "." APPLICATION_VIRTUALFILE_SUFFIX
 #cmakedefine01 ENFORCE_VIRTUAL_FILES_SYNC_FOLDER
 

diff --git a/src/common/utility.h b/src/common/utility.h
index 349791644ef3b66df8e7784c2904b4fe6b8ba90a..45df7f647cd09963cc0ad024a141775d0587915c 100644 (file)
--- a/src/common/utility.h
+++ b/src/common/utility.h
@@ -242,6 +242,11 @@ namespace Utility {
      */
     OCSYNC_EXPORT bool isPathWindowsDrivePartitionRoot(const QString &path);
 
+    /**
+     * @brief Retrieves current logged-in user name from the OS
+     */
+    OCSYNC_EXPORT QString getCurrentUserName();
+
 #ifdef Q_OS_WIN
     OCSYNC_EXPORT bool registryKeyExists(HKEY hRootKey, const QString &subKey);
     OCSYNC_EXPORT QVariant registryGetKeyValue(HKEY hRootKey, const QString &subKey, const QString &valueName);

diff --git a/src/common/utility_mac.cpp b/src/common/utility_mac.cpp
index f11cf0b8f010ada2e7cca7c0ba1e5991918881df..d3a3d480a0e159648b1792969ab6d37f9139ad58 100644 (file)
--- a/src/common/utility_mac.cpp
+++ b/src/common/utility_mac.cpp
@@ -136,4 +136,9 @@ static bool hasDarkSystray_private()
     return returnValue;
 }
 
+QString Utility::getCurrentUserName()
+{
+    return {};
+}
+
 } // namespace OCC

diff --git a/src/common/utility_unix.cpp b/src/common/utility_unix.cpp
index d994757383bdbe1c72f867af49468f835fbbf103..887213f09ace7a99696ad8d7c270ce3daa233aef 100644 (file)
--- a/src/common/utility_unix.cpp
+++ b/src/common/utility_unix.cpp
@@ -108,4 +108,9 @@ static inline bool hasDarkSystray_private()
     return true;
 }
 
+QString Utility::getCurrentUserName()
+{
+    return {};
+}
+
 } // namespace OCC

diff --git a/src/common/utility_win.cpp b/src/common/utility_win.cpp
index 2c14ccb1fc8cb8ac26c51c5663f82cf7291463dc..5637a023e4d5a022b893d0691c8338a4c8b6adcd 100644 (file)
--- a/src/common/utility_win.cpp
+++ b/src/common/utility_win.cpp
@@ -20,6 +20,7 @@
 #include "utility.h"
 
 #include <comdef.h>
+#include <Lmcons.h>
 #include <shlguid.h>
 #include <shlobj.h>
 #include <string>
@@ -380,6 +381,17 @@ QString Utility::formatWinError(long errorCode)
     return QStringLiteral("WindowsError: %1: %2").arg(QString::number(errorCode, 16), QString::fromWCharArray(_com_error(errorCode).ErrorMessage()));
 }
 
+QString Utility::getCurrentUserName()
+{
+    TCHAR username[UNLEN + 1] = {0};
+    DWORD len = sizeof(username) / sizeof(TCHAR);
+    
+    if (!GetUserName(username, &len)) {
+        qCWarning(lcUtility) << "Could not retrieve Windows user name." << formatWinError(GetLastError());
+    }
+
+    return QString::fromWCharArray(username);
+}
 
 Utility::NtfsPermissionLookupRAII::NtfsPermissionLookupRAII()
 {

diff --git a/src/gui/creds/flow2auth.cpp b/src/gui/creds/flow2auth.cpp
index 54b7b28a816b52a4b46e8735a0a6dac2288c3b64..9873a2705a08da0c31868237eced554cffcdbbdb 100644 (file)
--- a/src/gui/creds/flow2auth.cpp
+++ b/src/gui/creds/flow2auth.cpp
@@ -132,6 +132,16 @@ void Flow2Auth::fetchNewToken(const TokenAction action)
 
 
         _loginUrl = loginUrl;
+
+        if (Theme::instance()->loginWithSystemUserName()) {
+            const auto userName = Utility::getCurrentUserName();
+            if (!userName.isEmpty()) {
+                auto query = QUrlQuery(_loginUrl);
+                query.addQueryItem(QStringLiteral("user"), userName);
+                _loginUrl.setQuery(query);
+            }
+        }
+
         _pollToken = pollToken;
         _pollEndpoint = pollEndpoint;
 

diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index ff7f58e607ff056026a8488bf8ae0c0c5af0e5a7..330b12902653634f863350808431cedea5b61dd3 100644 (file)
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -417,6 +417,15 @@ bool Theme::forbidBadSSL() const
 #endif
 }
 
+bool Theme::loginWithSystemUserName() const
+{
+#ifdef APPLICATION_LOGIN_WITH_SYSTEM_USERNAME
+    return true;
+#else
+    return false;
+#endif
+}
+
 QString Theme::forceConfigAuthType() const
 {
     return QString();

diff --git a/src/libsync/theme.h b/src/libsync/theme.h
index 6b9aefb255a7618d748f5cd3f8a89292499efed8..6ab8fb3f70a8bf335a1f370ebd775f79a81941f0 100644 (file)
--- a/src/libsync/theme.h
+++ b/src/libsync/theme.h
@@ -254,6 +254,13 @@ public:
      */
     virtual bool forbidBadSSL() const;
 
+    /**
+     * Use current logged in username from the system
+     *
+     * When true, the Web login form will be pre-filled with system user name
+     */
+    bool loginWithSystemUserName() const;
+
     /**
      * This is only usefull when previous version had a different overrideServerUrl
      * with a different auth type in that case You should then specify "http" or "shibboleth".