Merge ~jibel/ubiquity:encryption_recovery_key into ubiquity:master

[Jean-Baptiste Lallement]

Make the recovery key editable and optional.
Make default recovery key 48 digits long.

This is an update of the recovery key feature that landed in previous release (21.04)

This updated version brings the following changes:
 * the recovery key is optional.
 * the recovery key is editable.
 * the default recovery key is a 48 digits number.

It also fixes an issue where the recovery key fields were not displayed in manual partitioning mode with an encrypted partition.

The default key is now generated with 'secrets' instead of uuid4().

The layout of the UI has been adapted a bit to fit on a small screen but one test had to be updated to relax the constraint on the minimal screen height.

The package builds in a PPA:
https://launchpad.net/~jibel/+archive/ubuntu/ppa/+build/21620546

The package has been tested in a VM on Ubuntu Desktop.

ea93e5b... by Jean-Baptiste Lallement on 2021-06-03

Reformat changelog and removed comments

[Didier Roche-Tolomelli (didrocks)]

With latest changes, LGTM! Thanks.

review: Approve

[Sebastien Bacher (seb128)]

it seems like the change there got merged, unsure why launchpad didn't change the status but could someone from the ubiquity team close it now?

diff --git a/debian/changelog b/debian/changelog
index 96772f9..b7d7a6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ubiquity (21.10.2) UNRELEASED; urgency=medium
+
+  * Recovery key: 48 digits number by default, optional and editable
+    (LP: #1928860)
+
+ -- Jean-Baptiste Lallement <[e-mail]>  Mon, 31 May 2021 14:21:30 +0200
+
 ubiquity (21.10.1) impish; urgency=medium
 
   * choose-mirror: hirsute -> impish
diff --git a/debian/ubiquity.templates b/debian/ubiquity.templates
index 1d7d3ed..5fcc8c8 100644
--- a/debian/ubiquity.templates
+++ b/debian/ubiquity.templates
@@ -1723,10 +1723,20 @@ Template: ubiquity/text/domain_connection_error
 Type: text
 _Description: Failed to connect to domain.
 
-Template: ubiquity/text/show_recovery_key_location_label
+Template: ubiquity/text/recovery_key_enable
 Type: text
 _Description:
- Show recovery key:
+ Enable recovery key:
+
+Template: ubiquity/text/recovery_key_label
+Type: text
+_Description:
+ Recovery key:
+
+Template: ubiquity/text/verified_recovery_key_label
+Type: text
+_Description:
+ Confirm recovery key:
 
 Template: ubiquity/text/show_recovery_key
 Type: text
@@ -1763,3 +1773,27 @@ Template: ubiquity/text/recovery_key_filename
 Type: text
 _Description:
  Enter recovery key filename
+
+Template: ubiquity/text/recovery_mismatch
+Type: text
+_Description: Passwords do not match
+
+Template: ubiquity/text/recovery_too_short
+Type: text
+_Description: Short password
+
+Template: ubiquity/text/recovery_weak
+Type: text
+_Description: Weak password
+
+Template: ubiquity/text/recovery_fair
+Type: text
+_Description: Fair password
+
+Template: ubiquity/text/recovery_good
+Type: text
+_Description: Good password
+
+Template: ubiquity/text/recovery_strong
+Type: text
+_Description: Strong password
diff --git a/gui/gtk/stepPartCrypto.ui b/gui/gtk/stepPartCrypto.ui
index e8ba049..a0734c5 100644
--- a/gui/gtk/stepPartCrypto.ui
+++ b/gui/gtk/stepPartCrypto.ui
@@ -20,7 +20,7 @@
     <property name="left-padding">24</property>
     <property name="right-padding">24</property>
     <child>
-      <!-- n-columns=2 n-rows=10 -->
+      <!-- n-columns=2 n-rows=11 -->
       <object class="GtkGrid" id="crypto_grid">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
@@ -61,7 +61,8 @@
             <property name="halign">start</property>
             <property name="label" translatable="yes">Disk encryption protects your files in case you lose your computer. It requires you to enter a security key each time the computer starts up.</property>
             <property name="wrap">True</property>
-            <property name="max-width-chars">132</property>
+            <property name="width-chars">92</property>
+            <property name="max-width-chars">92</property>
             <property name="xalign">0</property>
           </object>
           <packing>
@@ -75,15 +76,16 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">&lt;span foreground="darkred"&gt;Warning:&lt;/span&gt; If you lose your personal security key and recovery key, all data will be lost.
-</property>
+            <property name="label" translatable="yes">&lt;span foreground="darkred"&gt;Warning:&lt;/span&gt; If you lose your personal security key and recovery key, all data will be lost.</property>
             <property name="use-markup">True</property>
             <property name="wrap">True</property>
+            <property name="width-chars">92</property>
+            <property name="max-width-chars">92</property>
             <property name="xalign">0</property>
           </object>
           <packing>
             <property name="left-attach">0</property>
-            <property name="top-attach">7</property>
+            <property name="top-attach">8</property>
             <property name="width">2</property>
           </packing>
         </child>
@@ -103,7 +105,7 @@
           </packing>
         </child>
         <child>
-          <!-- n-columns=3 n-rows=3 -->
+          <!-- n-columns=3 n-rows=2 -->
           <object class="GtkGrid" id="password_grid">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
@@ -113,11 +115,10 @@
               <object class="GtkEntry" id="password">
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
-                <property name="hexpand">True</property>
                 <property name="visibility">False</property>
                 <property name="invisible-char">●</property>
                 <property name="activates-default">True</property>
-                <property name="width-chars">20</property>
+                <property name="width-chars">36</property>
                 <signal name="changed" handler="info_loop" swapped="no"/>
               </object>
               <packing>
@@ -129,11 +130,10 @@
               <object class="GtkEntry" id="verified_password">
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
-                <property name="hexpand">True</property>
                 <property name="visibility">False</property>
                 <property name="invisible-char">●</property>
                 <property name="activates-default">True</property>
-                <property name="width-chars">20</property>
+                <property name="width-chars">36</property>
                 <signal name="changed" handler="info_loop" swapped="no"/>
               </object>
               <packing>
@@ -148,7 +148,7 @@
                 <property name="show-tabs">False</property>
                 <property name="show-border">False</property>
                 <child>
-                  <object class="GtkFixed" id="empty">
+                  <object class="GtkFixed" id="password/empty">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                   </object>
@@ -272,6 +272,7 @@
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="label" translatable="yes">Mismatch</property>
+                    <property name="wrap">True</property>
                     <property name="xalign">0</property>
                     <attributes>
                       <attribute name="scale" value="0.83333333333329995"/>
@@ -308,15 +309,6 @@
             <child>
               <placeholder/>
             </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
             <property name="left-attach">1</property>
@@ -335,12 +327,12 @@
           </object>
           <packing>
             <property name="left-attach">0</property>
-            <property name="top-attach">8</property>
+            <property name="top-attach">9</property>
           </packing>
         </child>
         <child>
           <object class="GtkCheckButton" id="crypto_overwrite_space">
-            <property name="label" translatable="yes">Overwrite the available space first</property>
+            <property name="label" translatable="yes">Overwrite the available space first.</property>
             <property name="use-action-appearance">False</property>
             <property name="visible">True</property>
             <property name="can-focus">True</property>
@@ -350,21 +342,6 @@
           </object>
           <packing>
             <property name="left-attach">1</property>
-            <property name="top-attach">8</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="crypto_extra_time">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="margin-left">24</property>
-            <property name="label" translatable="yes">&lt;span weight="light" size="small"&gt;The installation may take much longer.&lt;/span&gt;</property>
-            <property name="use-markup">True</property>
-            <property name="single-line-mode">True</property>
-            <property name="xalign">0</property>
-          </object>
-          <packing>
-            <property name="left-attach">1</property>
             <property name="top-attach">9</property>
           </packing>
         </child>
@@ -373,15 +350,16 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">A recovery key is generated and will be temporarily saved on the live system. You can select an alternate location. Save this file and keep it in a safe place elsewhere before rebooting. </property>
+            <property name="margin-top">18</property>
+            <property name="label" translatable="yes">A recovery key is generated and will be temporarily saved on the live system. You can enter your own and can select an alternate location. Save this file and keep it in a safe place elsewhere before rebooting. </property>
             <property name="wrap">True</property>
-            <property name="max-width-chars">132</property>
+            <property name="width-chars">72</property>
+            <property name="max-width-chars">72</property>
             <property name="xalign">0</property>
           </object>
           <packing>
-            <property name="left-attach">0</property>
+            <property name="left-attach">1</property>
             <property name="top-attach">4</property>
-            <property name="width">2</property>
           </packing>
         </child>
         <child>
@@ -395,7 +373,7 @@
           </object>
           <packing>
             <property name="left-attach">0</property>
-            <property name="top-attach">5</property>
+            <property name="top-attach">7</property>
           </packing>
         </child>
         <child>
@@ -437,32 +415,79 @@
           </object>
           <packing>
             <property name="left-attach">1</property>
+            <property name="top-attach">7</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="recovery_key_label">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="label" translatable="yes">Recovery key:</property>
+            <property name="justify">right</property>
+            <property name="single-line-mode">True</property>
+            <property name="xalign">1</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
             <property name="top-attach">5</property>
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="show_key_box">
+          <object class="GtkLabel" id="verified_recovery_key_label">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="label" translatable="yes">Confirm the recovery key:</property>
+            <property name="justify">right</property>
+            <property name="single-line-mode">True</property>
+            <property name="xalign">1</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">6</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="recovery_key_enable">
+            <property name="label" translatable="yes">Enable recovery key</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="valign">start</property>
+            <property name="margin-top">18</property>
+            <property name="draw-indicator">True</property>
+            <signal name="toggled" handler="on_recovery_key_enable_toggled" swapped="no"/>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">4</property>
+          </packing>
+        </child>
+        <child>
+          <!-- n-columns=3 n-rows=2 -->
+          <object class="GtkGrid" id="recovery_grid">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
+            <property name="row-spacing">6</property>
+            <property name="column-spacing">6</property>
             <child>
               <object class="GtkEntry" id="recovery_key">
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
-                <property name="editable">False</property>
                 <property name="visibility">False</property>
                 <property name="invisible-char">●</property>
                 <property name="activates-default">True</property>
-                <property name="width-chars">30</property>
+                <property name="width-chars">36</property>
                 <property name="secondary-icon-name">view-reveal-symbolic</property>
                 <property name="primary-icon-activatable">False</property>
                 <property name="primary-icon-sensitive">False</property>
                 <property name="secondary-icon-tooltip-text" translatable="yes">	</property>
+                <property name="secondary-icon-tooltip-markup" translatable="yes">	</property>
+                <signal name="changed" handler="info_loop" swapped="no"/>
                 <signal name="icon-press" handler="on_recovery_key_toggle_visibility" swapped="no"/>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
@@ -474,29 +499,214 @@
                 <signal name="clicked" handler="on_recovery_key_generate_button" swapped="no"/>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="verified_recovery_key">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="visibility">False</property>
+                <property name="invisible-char">●</property>
+                <property name="activates-default">True</property>
+                <property name="width-chars">36</property>
+                <property name="primary-icon-activatable">False</property>
+                <property name="primary-icon-sensitive">False</property>
+                <signal name="changed" handler="info_loop" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkNotebook" id="recovery_strength">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="show-tabs">False</property>
+                <property name="show-border">False</property>
+                <child>
+                  <object class="GtkFixed" id="recovery/empty">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                  </object>
+                </child>
+                <child type="tab">
+                  <placeholder/>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="recovery_too_short">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes">Short password</property>
+                    <property name="xalign">0</property>
+                    <attributes>
+                      <attribute name="scale" value="0.83333333333329995"/>
+                      <attribute name="foreground" value="#8b8b00000000"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child type="tab">
+                  <placeholder/>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="recovery_weak">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes">Weak password</property>
+                    <property name="xalign">0</property>
+                    <attributes>
+                      <attribute name="scale" value="0.83333333333329995"/>
+                      <attribute name="foreground" value="#8b8b00000000"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child type="tab">
+                  <placeholder/>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="recovery_fair">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes">Fair password</property>
+                    <property name="xalign">0</property>
+                    <attributes>
+                      <attribute name="scale" value="0.83333333333329995"/>
+                      <attribute name="foreground" value="#ffff8c8c0000"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child type="tab">
+                  <placeholder/>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="recovery_good">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes">Good password</property>
+                    <property name="xalign">0</property>
+                    <attributes>
+                      <attribute name="scale" value="0.83333333333329995"/>
+                      <attribute name="foreground" value="#000064640000"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
+                <child type="tab">
+                  <placeholder/>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="recovery_strong">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes">Strong password</property>
+                    <property name="xalign">0</property>
+                    <attributes>
+                      <attribute name="scale" value="0.83333333333329995"/>
+                      <attribute name="foreground" value="#000064640000"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="position">5</property>
+                  </packing>
+                </child>
+                <child type="tab">
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="left-attach">2</property>
+                <property name="top-attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkNotebook" id="recovery_match">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="show-tabs">False</property>
+                <property name="show-border">False</property>
+                <child>
+                  <object class="GtkFixed" id="recovery_empty2">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                  </object>
+                </child>
+                <child type="tab">
+                  <placeholder/>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="recovery_mismatch">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes">Mismatch</property>
+                    <property name="wrap">True</property>
+                    <property name="xalign">0</property>
+                    <attributes>
+                      <attribute name="scale" value="0.83333333333329995"/>
+                      <attribute name="foreground" value="#8b8b00000000"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage" id="recovery_ok">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="stock">gtk-apply</property>
+                  </object>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child type="tab">
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="left-attach">2</property>
+                <property name="top-attach">1</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="left-attach">1</property>
-            <property name="top-attach">6</property>
+            <property name="top-attach">5</property>
+            <property name="height">2</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="show_recovery_key_location_label">
+          <object class="GtkLabel" id="crypto_extra_time">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">Show recovery key:</property>
-            <property name="justify">right</property>
+            <property name="margin-left">24</property>
+            <property name="label" translatable="yes">&lt;span weight="light" size="small"&gt;The installation may take much longer.&lt;/span&gt;</property>
+            <property name="use-markup">True</property>
             <property name="single-line-mode">True</property>
-            <property name="xalign">1</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">6</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">10</property>
           </packing>
         </child>
         <child>
diff --git a/tests/test_gtkui.py b/tests/test_gtkui.py
index 215ab18..a33829d 100644
--- a/tests/test_gtkui.py
+++ b/tests/test_gtkui.py
@@ -71,7 +71,7 @@ class TestFrontend(unittest.TestCase):
             # Anything smaller will need to use Alt+Ctrl+Pgd/Right
             # Scrollbars anyone?
             # self.assertLessEqual(alloc.width, 640, page.module.NAME)  # fixme
-            self.assertLessEqual(alloc.height, 556, page.module.NAME)
+            self.assertLessEqual(alloc.height, 744, page.module.NAME)  # 768 - 24px (top panel)
             if page.module.NAME == 'partman':
                 ui.allow_change_step(False)
 
@@ -121,6 +121,7 @@ class TestFrontend(unittest.TestCase):
                 # setup page.
                 'password_strength', 'hostname_error_label',
                 'password_error_label', 'username_error_label',
+                'recovery_strength',
                 # Pulled straight from debconf into the UI on progress.
                 'install_progress_text',
                 # Contains just the traceback.
diff --git a/ubiquity/plugins/ubi-partman.py b/ubiquity/plugins/ubi-partman.py
index fd7efa8..521ab06 100644
--- a/ubiquity/plugins/ubi-partman.py
+++ b/ubiquity/plugins/ubi-partman.py
@@ -148,7 +148,7 @@ class PageGtk(PageBase):
         for wdg in all_widgets:
             setattr(self, wdg, builder.get_object(wdg))
 
-        # Crypto page
+        # Crypto page, used for both primary and recovery keys
         self.password_strength_pages = {
             'empty': 0,
             'too_short': 1,
@@ -213,12 +213,12 @@ class PageGtk(PageBase):
         # Define a list to save grub imformation
         self.grub_options = []
 
-        from gi.repository import Pango
-        self.recovery_key.modify_font(Pango.font_description_from_string('monospace'))
         default_recovery_key_location = os.path.join(misc.get_live_user_home(), 'recovery.key')
         self.recovery_key_location.set_text(default_recovery_key_location)
         self.recovery_key.set_visibility(False)
         self.recovery_key.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, 'view-reveal-symbolic')
+        self.verified_recovery_key.set_visibility(False)
+        self.enable_recovery_key(False)
 
     def on_link_clicked(self, widget, uri):
         misc.launch_uri(uri)
@@ -285,7 +285,14 @@ class PageGtk(PageBase):
             return
         crypto_widgets += [
             ('verified_crypto_label', 'crypto_label', 'bottom', 1, 1),
-            ('crypto_warning', 'verified_crypto_label', 'bottom', 2, 1),
+            ('recovery_key_enable', 'verified_crypto_label', 'bottom', 1, 1),
+            ('recovery_key_warning', 'recovery_key_enable', 'right', 1, 1),
+            ('recovery_grid', 'recovery_key_warning', 'bottom', 1, 2),
+            ('recovery_key_label', 'recovery_grid', 'left', 1, 1),
+            ('verified_recovery_key_label', 'recovery_key_label', 'bottom', 1, 1),
+            ('recovery_key_location_label', 'verified_recovery_key_label', 'bottom', 1, 1),
+            ('key_location_box', 'recovery_key_location_label', 'right', 1, 1),
+            ('crypto_warning', 'recovery_key_location_label', 'bottom', 2, 1),
             ('crypto_extra_label', 'crypto_warning', 'bottom', 1, 1),
             ('crypto_overwrite_space', 'crypto_extra_label', 'right', 1, 1),
             ('crypto_extra_time', 'crypto_overwrite_space', 'bottom', 1, 1)]
@@ -302,9 +309,12 @@ class PageGtk(PageBase):
             widget.show()
 
     def generate_recovery_key(self):
-        from uuid import uuid4
-        key = str(uuid4().int >> 64)[:16]
+        if not self.recovery_key_enable.get_active():
+            return
+        from secrets import randbelow
+        key = str(randbelow(10**48)).zfill(48)
         self.recovery_key.set_text(key)
+        self.verified_recovery_key.set_text(key)
 
     def on_advanced_features_clicked(self, widget):
         from gi.repository import Gtk
@@ -385,9 +395,34 @@ class PageGtk(PageBase):
         from gi.repository import Gtk
         visibility = self.recovery_key.get_visibility()
         self.recovery_key.set_visibility(not visibility)
+        self.verified_recovery_key.set_visibility(not visibility)
         self.recovery_key.set_icon_from_icon_name(
             Gtk.EntryIconPosition.SECONDARY, ('view-conceal-symbolic', 'view-reveal-symbolic')[visibility])
 
+    def on_recovery_key_enable_toggled(self, widget):
+        self.enable_recovery_key(widget.get_active())
+
+    def enable_recovery_key(self, enable=False):
+        self.recovery_key_warning.set_sensitive(enable)
+        self.recovery_key_label.set_sensitive(enable)
+        self.recovery_key.set_sensitive(enable)
+        self.recovery_key_generate_button.set_sensitive(enable)
+        self.verified_recovery_key_label.set_sensitive(enable)
+        self.verified_recovery_key.set_sensitive(enable)
+        self.recovery_key_location_label.set_sensitive(enable)
+        self.recovery_key_location.set_sensitive(enable)
+        self.recovery_key_button.set_sensitive(enable)
+
+        if enable:
+            self.generate_recovery_key()
+        else:
+            self.recovery_key.set_text("")
+            self.verified_recovery_key.set_text("")
+            self.recovery_strength.set_current_page(
+                self.password_strength_pages['empty'])
+            self.recovery_match.set_current_page(
+                self.password_match_pages['empty'])
+
     def should_show_bitlocker_page(self):
         return ('bitlocker' in self.extra_options or
                 os.environ.get('SHOW_BITLOCKER_UI', '0') == '1')
@@ -1090,8 +1125,15 @@ class PageGtk(PageBase):
             self.partition_dialog_okbutton.set_sensitive(True)
 
         for widget in ['password_grid', 'crypto_label', 'crypto_warning',
-                       'verified_crypto_label', 'crypto_extra_label',
-                       'crypto_overwrite_space', 'crypto_extra_time']:
+                       'verified_crypto_label',
+                       'crypto_extra_label',
+                       'crypto_overwrite_space', 'crypto_extra_time',
+                       'recovery_key_enable', 'recovery_key_warning',
+                       'recovery_grid',
+                       'recovery_key_label',
+                       'verified_recovery_key_label',
+                       'recovery_key_location_label',
+                       'key_location_box']:
             getattr(getattr(self, widget), action)()
 
     def show_overwrite_space(self, show_hide):
@@ -1639,6 +1681,28 @@ class PageGtk(PageBase):
             self.password_strength.set_current_page(
                 self.password_strength_pages['empty'])
 
+        # Recovery key
+        recovery = self.recovery_key.get_text()
+        vrecovery = self.verified_recovery_key.get_text()
+
+        if recovery:
+            if recovery != vrecovery:
+                # It's okay to reuse complete since it'll stay False if it's
+                # already false from previous check and switch to False
+                # otherwise.
+                # In either case, we don't want to proceed if the password or
+                # the recovery are invalid.
+                complete = False
+                self.recovery_match.set_current_page(
+                    self.password_match_pages['mismatch'])
+            else:
+                self.recovery_match.set_current_page(
+                    self.password_match_pages['ok'])
+
+            txt = validation.human_password_strength(recovery)[0]
+            self.recovery_strength.set_current_page(
+                self.password_strength_pages[txt])
+
         self.controller.allow_go_forward(complete)
         self.partition_dialog_okbutton.set_sensitive(complete)
         return complete
@@ -1662,7 +1726,10 @@ class PageGtk(PageBase):
             return False
 
     def get_recovery_keys(self):
-        return self.recovery_key.get_text()
+        if self.info_loop(None):
+            return self.recovery_key.get_text()
+        else:
+            return False
 
 
 class PageKde(PageBase):
diff --git a/ubiquity/validation.py b/ubiquity/validation.py
index 9a08b4e..a782acc 100644
--- a/ubiquity/validation.py
+++ b/ubiquity/validation.py
@@ -116,6 +116,12 @@ def password_strength(password):
         strength = 1
     if strength < 0:
         strength = 0
+
+    # Recovery keys are 48 digits number and cannot be considered "fair"
+    # so set it a level higher
+    if len(password) >= 48 and strength < 0.75:
+        strength = 0.8
+
     return strength