Adding contentIsolation to the loginForm and removing the already dep…

…recated/automated onlineCheckMethod config option
IsmaelMartinez · Nov 25, 2024 · 1cc81cf · 1cc81cf
1 parent e430d4b
commit 1cc81cf
Show file tree

Hide file tree

Showing 9 changed files with 107 additions and 85 deletions.
diff --git a/app/config/README.md b/app/config/README.md
@@ -60,7 +60,6 @@ Here is the list of available arguments and its usage:
 | minimized                       | Boolean to start the application minimized                                                          | false               |
 | notificationMethod | Notification method to be used by the application (`web`/`electron`) | *web*, electron |
 | ntlmV2enabled                   | Set enable-ntlm-v2 value                                                                 | 'true'                |
-| onlineCheckMethod  **automated - please remove**             | Type of network test for checking online status.                                          | *https*, dns, native, none                |
 | optInTeamsV2                    | Boolean to opt in to use Teams V2                                                                   | false               |
 | partition                       | BrowserWindow webpreferences partition                                                    | persist:teams-4-linux                |
 | proxyServer                     | Proxy Server with format address:port (string)                                                  | null                |

diff --git a/app/config/index.js b/app/config/index.js
@@ -279,13 +279,6 @@ function extractYargConfig(configObject, appVersion) {
 				describe: 'Set enable-ntlm-v2 value',
 				type: 'string'
 			},
-			onlineCheckMethod: {
-				deprecated: 'It has been automated.\n Please remove this option from your config file',
-				default: 'https',
-				describe: 'Type of network test for checking online status.',
-				type: 'string',
-				choices: ['https', 'dns', 'native', 'none']
-			},
 			optInTeamsV2: {
 				default: false,
 				describe: 'Opt in to use Teams V2',

diff --git a/app/login/README.md b/app/login/README.md
@@ -2,8 +2,6 @@
 
 This code handles the login dialog that appears when the app can login using ntlm.
 
-[index.js](index.js) is the entry point that creates an electron browser window with the [login.html](login.html) content.
-
-The [formSender.js](formSender.js) is the minimum js code that is needed to send the code username/password to the electron app in order to callback with the values.
+[index.js](index.js) is the entry point that creates an electron browser window with the [login.html](login.html) content. The login.html is a simple html form that sends the username/password to the electron app using the formSender function.
 
 The username/password aren't cached and the browserWindow gets remove once the form is submit.
diff --git a/app/login/formSender.js b/app/login/formSender.js
diff --git a/app/login/index.js b/app/login/index.js
@@ -1,6 +1,6 @@
 const { app, ipcMain, BrowserWindow } = require('electron');
 const { execSync } = require('child_process');
-// const path = require('path');
+const path = require('path');
 
 let isFirstLoginTry = true;
 
@@ -15,9 +15,7 @@ exports.loginService = function loginService(parentWindow, callback) {
 		show: false,
 		autoHideMenuBar: true,
 		webPreferences: {
-			contextIsolation: false,
-			nodeIntegration: true
-			//preload: path.join(__dirname, 'preload.js')
+			preload: path.join(__dirname, 'preload.js')
 		}
 	});
 	win.once('ready-to-show', () => {

diff --git a/app/login/login.html b/app/login/login.html
@@ -22,7 +22,15 @@
                 color: rgb(255, 255, 255);">
     </form>
 
-    <script src='formSender.js'></script>
+    <script>
+        function sendForm(event) {
+            event.preventDefault();
+            window.api.submitForm({
+            	username: document.getElementById('username').value,
+            	password: document.getElementById('password').value,
+            });
+        }
+    </script>
 </body>
 
 </html>
diff --git a/com.github.IsmaelMartinez.teams_for_linux.appdata.xml b/com.github.IsmaelMartinez.teams_for_linux.appdata.xml
@@ -14,6 +14,14 @@
 	<url type="bugtracker">https://github.com/IsmaelMartinez/teams-for-linux/issues</url>
 	<launchable type="desktop-id">com.github.IsmaelMartinez.teams_for_linux.desktop</launchable>
 	<releases>
+		<release version="1.12.1" date="2024-11-25">
+			<description>
+				<ul>
+					<li>Improving security on the loginForm by removing the need of contentIsolation</li>
+					<li>Removing the already deprecated `onlineCheckMethod` option from the config options</li>
+				</ul>
+			</description>
+		</release>
 		<release version="1.12.0" date="2024-11-15">
 			<description>
 				<ul>