Changeset 1186:beb5a473fd54

Timestamp:

04/30/25 15:05:57 (8 hours ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Tags:

tip

Message:

SimBrief MFA login is supported

Files:

• locale/en/mlx.po (modified) (1 diff)
• locale/hu/mlx.po (modified) (1 diff)
• src/mlx/gui/cef.py (modified) (6 diffs)
• src/mlx/gui/gui.py (modified) (1 diff)

locale/en/mlx.po

@@ -916 +916 @@
 "the password is stored as text, and anybody who can access "
 "your files will be able to read it."
+
+msgid "simbrief_mfa_code_title"
+msgstr "Enter MFA code"
+
+msgid "simbrief_mfa_code_needed"
+msgstr ""
+"An MFA code is sent by Navigraph to your\n"
+"e-mail address to complete the login.\n"
+"Check your e-mail for the code and enter it below."
+
+msgid "simbrief_mfa_code"
+msgstr "MFA code:"
+
+msgid "simbrief_mfa_code_tooltip"
+msgstr "Enter the code received by e-mail."
 
 msgid "simbrief_extra_fuel"

locale/hu/mlx.po

@@ -915 +915 @@
 "mindig újból beírnod. Vedd azonban figyelembe, hogy a jelszót szövegként "
 "tároljuk, ezért bárki elolvashatja, aki hozzáfér a fájljaidhoz."
+
+msgid "simbrief_mfa_code_title"
+msgstr "2FA kód bírása"
+
+msgid "simbrief_mfa_code_needed"
+msgstr ""
+"A Navigraph egy, a kétlépcsős azonosításhoz szükséges\n"
+"kódot küldött az e-mail címedre a belépéshez.\n"
+"Keresd meg a kódot a leveleid között és írd be."
+
+msgid "simbrief_mfa_code"
+msgstr "2FA kód:"
+
+msgid "simbrief_mfa_code_tooltip"
+msgstr "Írd be az e-mailben kapott kódot."
 
 msgid "simbrief_extra_fuel"

src/mlx/gui/cef.py

@@ -57 +57 @@
 SIMBRIEF_RESULT_ERROR_LOGIN_FAILED = 13
 
+#-----------------------------------------------------------------------------
+
+class SimBriefMFACodeDialog(Gtk.Dialog):
+    """A dialog window to ask for the SimBrief (Navigraph) MFA code."""
+    def __init__(self, gui):
+        """Construct the dialog."""
+        super(SimBriefMFACodeDialog, self).__init__(WINDOW_TITLE_BASE + " - " +
+                                                    xstr("simbrief_mfa_code_title"),
+                                                    gui.mainWindow,
+                                                    Gtk.DialogFlags.MODAL)
+        self.add_button(xstr("button_cancel"), Gtk.ResponseType.CANCEL)
+        self.add_button(xstr("button_ok"), Gtk.ResponseType.OK)
+
+        contentArea = self.get_content_area()
+
+        contentAlignment = Gtk.Alignment(xalign = 0.5, yalign = 0.5,
+                                         xscale = 0.0, yscale = 0.0)
+        contentAlignment.set_padding(padding_top = 4, padding_bottom = 16,
+                                     padding_left = 8, padding_right = 8)
+
+        contentArea.pack_start(contentAlignment, False, False, 0)
+
+        contentVBox = Gtk.VBox()
+        contentAlignment.add(contentVBox)
+
+        label = Gtk.Label(xstr("simbrief_mfa_code_needed"))
+        label.set_line_wrap(True)
+        label.set_justify(Gtk.Justification.CENTER)
+        label.set_alignment(0.5, 0.0)
+
+        contentVBox.pack_start(label, False, False, 0)
+
+        tableAlignment = Gtk.Alignment(xalign = 0.5, yalign = 0.5,
+                                       xscale = 0.0, yscale = 0.0)
+        tableAlignment.set_padding(padding_top = 24, padding_bottom = 0,
+                                   padding_left = 0, padding_right = 0)
+
+        table = Gtk.Table(1, 2)
+        table.set_row_spacings(4)
+        table.set_col_spacings(16)
+        table.set_homogeneous(False)
+
+        tableAlignment.add(table)
+        contentVBox.pack_start(tableAlignment, True, True, 0)
+
+        label = Gtk.Label(xstr("simbrief_mfa_code"))
+        label.set_use_underline(True)
+        label.set_alignment(0.0, 0.5)
+        table.attach(label, 0, 1, 0, 1)
+
+        self._mfaCode = Gtk.Entry()
+        self._mfaCode.set_width_chars(16)
+        self._mfaCode.set_tooltip_text(xstr("simbrief_mfa_code_tooltip"))
+        table.attach(self._mfaCode, 1, 2, 0, 1)
+        label.set_mnemonic_widget(self._mfaCode)
+
+
+    @property
+    def mfaCode(self):
+        """Get the MFA code entered."""
+        return self._mfaCode.get_text()
+
+    def run(self):
+        """Run the dialog."""
+        self.show_all()
+
+        response = super(SimBriefMFACodeDialog, self).run()
+
+        self.hide()
+
+        return response
+
 #------------------------------------------------------------------------------
 
@@ -82 +154 @@
 
 
-    def __init__(self):
+    def __init__(self, gui):
         """Construct the handler."""
         self._browser = None
@@ -92 +164 @@
         self._lastProgress = SIMBRIEF_PROGRESS_SEARCHING_BROWSER
         self._timeoutID = None
+        self._gui = gui
 
     def initialize(self):
@@ -155 +228 @@
             js +="form.submit();"
             frame.ExecuteJavascript(js)
+        elif url.startswith("https://identity.api.navigraph.com//mfaEmail"):
+            dialog = SimBriefMFACodeDialog(self._gui)
+            response = dialog.run()
+
+            if response!=Gtk.ResponseType.OK:
+                self._updateProgress(SIMBRIEF_PROGRESS_WAITING_LOGIN,
+                                     SIMBRIEF_RESULT_ERROR_LOGIN_FAILED, None)
+                return
+
+            mfaCode = dialog.mfaCode
+            js = "form=document.getElementById(\"form1\");"
+            js +="form.txtcdvl.value=\"" + mfaCode + "\";"
+            js +="form.btnApprove.click();"
+            frame.ExecuteJavascript(js)
+        elif url.startswith("https://identity.api.navigraph.com/mfaFailed"):
+            self._updateProgress(SIMBRIEF_PROGRESS_WAITING_LOGIN,
+                                 SIMBRIEF_RESULT_ERROR_LOGIN_FAILED, None)
         elif url.startswith("https://www.simbrief.com/ofp/ofp.loader.api.php"):
             self._updateProgress(SIMBRIEF_PROGRESS_WAITING_RESULT,
@@ -201 +291 @@
 #------------------------------------------------------------------------------
 
-def initialize(initializedCallback):
+def initialize(initializedCallback, gui):
     """Initialize the Chrome Embedded Framework."""
     global _toQuit, _simBriefHandler
@@ -208 +298 @@
     GObject.threads_init()
 
-    _simBriefHandler = SimBriefHandler()
+    _simBriefHandler = SimBriefHandler(gui)
     GObject.timeout_add(100, _initializeCEF, [], initializedCallback)
 

src/mlx/gui/gui.py

@@ -1999 +1999 @@
         It checks if we already know the PID, and if not, asks the user whether
         to register."""
-        cef.initialize(self._cefInitialized)
+        cef.initialize(self._cefInitialized, self)
 
         if not self.config.pilotID and not self.config.password: