Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] SAML login error. #14686

Merged
merged 1 commit into from
May 29, 2019
Merged

[FIX] SAML login error. #14686

merged 1 commit into from
May 29, 2019

Conversation

Hudell
Copy link
Contributor

@Hudell Hudell commented May 29, 2019

Closes #14664

@Stuw
Copy link

Stuw commented May 29, 2019

Aplied fix manually. It works.

--- /opt/rocketchat/programs/server/app/app.js.bak      2019-05-29 20:03:49.134198228 +0000
+++ /opt/rocketchat/programs/server/app/app.js  2019-05-29 20:21:34.620443576 +0000
@@ -109648,14 +109648,17 @@
     const fullName = loginResult.profile.cn || loginResult.profile.username || loginResult.profile.displayName;
     let eppnMatch = false; // Check eppn

-    let user = Meteor.users.findOne({
-      eppn: eduPersonPrincipalName
-    });
+    let user = null;

-    if (user) {
-      eppnMatch = true;
-    } // If eppn is not exist
+    if (eduPersonPrincipalName) {
+      user = Meteor.users.findOne({
+        eppn: eduPersonPrincipalName
+      });

+      if (user) {
+        eppnMatch = true;
+      } // If eppn is not exist
+    }

     if (!user) {
       user = Meteor.users.findOne({

@sampaiodiego sampaiodiego added this to the 1.1.1 milestone May 29, 2019
@sampaiodiego sampaiodiego merged commit 53093e0 into develop May 29, 2019
@sampaiodiego sampaiodiego deleted the fix.saml-login branch May 29, 2019 20:32
sampaiodiego pushed a commit that referenced this pull request May 30, 2019
@sampaiodiego sampaiodiego mentioned this pull request May 30, 2019
sampaiodiego pushed a commit that referenced this pull request May 30, 2019
Kailash0311 pushed a commit to WideChat/Rocket.Chat that referenced this pull request Jul 2, 2019
* [FIX] Load messages after disconnect and message box scroll missing (RocketChat#14668)

* Removing unnecesary federation configs (RocketChat#14674)

* [FIX] SAML login error. (RocketChat#14686)

* Bump version to 1.1.1

* Service Account broadcast room callback added

* Service Account Callback completed

* CLI errors fixed

* [NEW] Service Account one-tap login complete

* Callbacks modified

* Service Accounts directory tab added

* [NEW] Service Accounts Login method

* Typo fixed

* CLI errors fixed

* CLI errors fixed

* [FIX] Anonymous chat read (RocketChat#14717)

* Prevent errors when allowing anonymous read

* getSingleMessage for anonymous users

* Fix register user when allow read and write anonymous is enabled

* Fix anonymous with sidebar extended as default

Co-authored-by: ubergeekzone <ubergeekzone@gmail.com>

* [FIX] User Real Name being erased when not modified (RocketChat#14711)

* [FIX] User status information on User Info panel (RocketChat#14763)

* [FIX] Anonymous chat read (RocketChat#14717)

* Prevent errors when allowing anonymous read

* getSingleMessage for anonymous users

* Fix register user when allow read and write anonymous is enabled

* Fix anonymous with sidebar extended as default

Co-authored-by: ubergeekzone <ubergeekzone@gmail.com>

* Bump version to 1.1.2

* [New] Service Account directory feature

* CLI errors fixed

* UsernameExists meteor method fixed

* Sync commit

* [NEW] Add loading animation to webdav file picker (RocketChat#14759)

* [NEW] Service Account subscription method added

* changed mongo version for snap from 3.2.7 to 3.4.20 (RocketChat#14838)

* add _hidden for messages loaded by thread (RocketChat#14837)

* Regression: thread loading parent msg if is not loaded (RocketChat#14839)

* [IMPROVE] Layout of livechat manager pages to new style (RocketChat#13900)

* [FIX] Removes E2E action button, icon and banner when E2E is disabled. (RocketChat#14810)

* add _hidden for messages loaded by thread (RocketChat#14837)

* Regression: thread loading parent msg if is not loaded (RocketChat#14839)

* Bump version to 1.1.3

* [IMPROVE] Adds link to download generated user data file (RocketChat#14175)

* [FIX] Error when using Download My Data or Export My Data (RocketChat#14645)

* [NEW] Custom User Status (RocketChat#13933)

Co-Authored-By: Tasso Evangelista <tasso@tassoevan.me>
Co-Authored-By: Guilherme Gazzo <guilhermegazzo@gmail.com>
Co-Authored-By: wreiske <wreiske@mieweb.com>

* Bump version to 1.2.0-rc.0

* Allow debugging of cached collections by name (RocketChat#14859)

* Regression: Allow debugging of cached collections by name (RocketChat#14862)

* Regression: Fix desktop notifications not being sent (RocketChat#14860)

* Broadcast Room name change handled

* Lint errors fixed

* getLoginToken method refactored

* Console statements removed

* Sidebar header permission modified

* Merge branch service-accounts

* Added service account directory search translation key

* Subscribers count added

* [FIX] Custom status fixes (RocketChat#14853)

* Fixes for status message text presence issues
Added statusText to several api endpoints
Changed statusMessage to statusText since that is what it is called everywhere

* Fixed slash command for changing status

* Fixed the "name is required" issue

* Make sure the status is set blank if selecting a default status... we don't want an "online" status when someone is actually offline!

* Fixes display of custom status on the room header

* Changed the header of DM rooms to query the server for the user status text when it is not found on the internal collection

* Changed Custom Status methods to check if the user is logged in

* Improved code readability

* Fix getting status list before logging in

* Bump version to 1.2.0-rc.1

* [FIX] LinkedIn OAuth login (RocketChat#14887)

* [NEW] Show App bundles and its apps (RocketChat#14886)

* Bump version to 1.2.0-rc.2

* Bump version to 1.2.0

* Bump version to 1.3.0-develop

* [FIX] Not showing local app on App Details (RocketChat#14894)

* Unread counter added in popver

* Get linked service account method added
Kailash0311 pushed a commit to WideChat/Rocket.Chat that referenced this pull request Jul 2, 2019
* [FIX] Load messages after disconnect and message box scroll missing (RocketChat#14668)

* Removing unnecesary federation configs (RocketChat#14674)

* [FIX] SAML login error. (RocketChat#14686)

* Bump version to 1.1.1

* Service Account broadcast room callback added

* Service Account Callback completed

* CLI errors fixed

* [NEW] Service Account one-tap login complete

* Callbacks modified

* Service Accounts directory tab added

* [NEW] Service Accounts Login method

* Typo fixed

* CLI errors fixed

* CLI errors fixed

* [FIX] Anonymous chat read (RocketChat#14717)

* Prevent errors when allowing anonymous read

* getSingleMessage for anonymous users

* Fix register user when allow read and write anonymous is enabled

* Fix anonymous with sidebar extended as default

Co-authored-by: ubergeekzone <ubergeekzone@gmail.com>

* [FIX] User Real Name being erased when not modified (RocketChat#14711)

* [FIX] User status information on User Info panel (RocketChat#14763)

* [FIX] Anonymous chat read (RocketChat#14717)

* Prevent errors when allowing anonymous read

* getSingleMessage for anonymous users

* Fix register user when allow read and write anonymous is enabled

* Fix anonymous with sidebar extended as default

Co-authored-by: ubergeekzone <ubergeekzone@gmail.com>

* Bump version to 1.1.2

* [New] Service Account directory feature

* CLI errors fixed

* UsernameExists meteor method fixed

* Sync commit

* [NEW] Add loading animation to webdav file picker (RocketChat#14759)

* [NEW] Service Account subscription method added

* changed mongo version for snap from 3.2.7 to 3.4.20 (RocketChat#14838)

* add _hidden for messages loaded by thread (RocketChat#14837)

* Regression: thread loading parent msg if is not loaded (RocketChat#14839)

* [IMPROVE] Layout of livechat manager pages to new style (RocketChat#13900)

* [FIX] Removes E2E action button, icon and banner when E2E is disabled. (RocketChat#14810)

* add _hidden for messages loaded by thread (RocketChat#14837)

* Regression: thread loading parent msg if is not loaded (RocketChat#14839)

* Bump version to 1.1.3

* [IMPROVE] Adds link to download generated user data file (RocketChat#14175)

* [FIX] Error when using Download My Data or Export My Data (RocketChat#14645)

* [NEW] Custom User Status (RocketChat#13933)

Co-Authored-By: Tasso Evangelista <tasso@tassoevan.me>
Co-Authored-By: Guilherme Gazzo <guilhermegazzo@gmail.com>
Co-Authored-By: wreiske <wreiske@mieweb.com>

* Bump version to 1.2.0-rc.0

* Allow debugging of cached collections by name (RocketChat#14859)

* Regression: Allow debugging of cached collections by name (RocketChat#14862)

* Regression: Fix desktop notifications not being sent (RocketChat#14860)

* Broadcast Room name change handled

* Lint errors fixed

* getLoginToken method refactored

* Console statements removed

* Sidebar header permission modified

* Merge branch service-accounts

* Added service account directory search translation key

* Subscribers count added

* [FIX] Custom status fixes (RocketChat#14853)

* Fixes for status message text presence issues
Added statusText to several api endpoints
Changed statusMessage to statusText since that is what it is called everywhere

* Fixed slash command for changing status

* Fixed the "name is required" issue

* Make sure the status is set blank if selecting a default status... we don't want an "online" status when someone is actually offline!

* Fixes display of custom status on the room header

* Changed the header of DM rooms to query the server for the user status text when it is not found on the internal collection

* Changed Custom Status methods to check if the user is logged in

* Improved code readability

* Fix getting status list before logging in

* Bump version to 1.2.0-rc.1

* [FIX] LinkedIn OAuth login (RocketChat#14887)

* [NEW] Show App bundles and its apps (RocketChat#14886)

* Bump version to 1.2.0-rc.2

* Bump version to 1.2.0

* Bump version to 1.3.0-develop

* [FIX] Not showing local app on App Details (RocketChat#14894)

* Unread counter added in popver

* Get linked service account method added

* get cloud generated public key for marketplace licenses (RocketChat#14851)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Wrong user when logging using SAML with RocketChat 1.1.0
4 participants