Fa206 multi select

fapolicy_analyzer/glade/confirm_change_dialog.glade

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.38.2 -->
+<!--
+  Copyright Concurrent Technologies Corporation 2021
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+<interface>
+  <requires lib="gtk+" version="3.22"/>
+  <object class="GtkDialog" id="confirmChangeDialog">
+    <property name="can-focus">False</property>
+    <property name="title" translatable="yes">Confirm Trust Changes</property>
+    <property name="window-position">center-on-parent</property>
+    <property name="type-hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can-focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
+            <child>
+              <object class="GtkButton" id="yesButton">
+                <property name="label" translatable="yes">Yes</property>
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="noButton">
+                <property name="label" translatable="yes">No</property>
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancelButton">
+                <property name="label" translatable="yes">Cancel</property>
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkTextView" id="confirmInfo">
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="editable">False</property>
+            <property name="justification">center</property>
+            <property name="cursor-visible">False</property>
+            <property name="accepts-tab">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-8">yesButton</action-widget>
+      <action-widget response="-9">noButton</action-widget>
+      <action-widget response="-6">cancelButton</action-widget>
+    </action-widgets>
+  </object>
+</interface>

fapolicy_analyzer/glade/searchable_list.glade

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.38.2 -->
 <!--
   Copyright Concurrent Technologies Corporation 2021
 
@@ -15,8 +16,6 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -->
-
-<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.22"/>
   <object class="GtkBox" id="searchableList">
@@ -85,7 +84,7 @@
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
                     <child internal-child="selection">
-                      <object class="GtkTreeSelection"/>
+                      <object class="GtkTreeSelection" id="treeSelection"/>
                     </child>
                   </object>
                 </child>

fapolicy_analyzer/glade/system_trust_database_admin.glade

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.38.2 -->
 <!--
   Copyright Concurrent Technologies Corporation 2021
 
@@ -15,8 +16,6 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -->
-
-<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.22"/>
   <object class="GtkBox" id="systemTrustDatabaseAdmin">
@@ -58,7 +57,7 @@
             <property name="layout-style">expand</property>
             <child>
               <object class="GtkButton" id="addBtn">
-                <property name="label" translatable="yes">Add File To Ancillary Trust Database</property>
+                <property name="label" translatable="yes">Add To Ancillary Trust Database</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can-focus">True</property>

fapolicy_analyzer/locale/fapolicy_analyzer.pot

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fapolicy-analyzer snapshot\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-01-13 11:49-0500\n"
+"POT-Creation-Date: 2022-01-21 10:10-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -18,21 +18,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: fapolicy_analyzer/ui/ancillary_trust_database_admin.py:89
-#: fapolicy_analyzer/ui/system_trust_database_admin.py:99
+#: fapolicy_analyzer/ui/ancillary_trust_database_admin.py:94
+#: fapolicy_analyzer/ui/system_trust_database_admin.py:103
 msgid ""
 "File: {trust.path}\n"
 "Size: {trust.size}\n"
 "SHA256: {trust.hash}"
 msgstr ""
 
-#: fapolicy_analyzer/ui/ancillary_trust_database_admin.py:99
-#: fapolicy_analyzer/ui/system_trust_database_admin.py:108
+#: fapolicy_analyzer/ui/ancillary_trust_database_admin.py:104
+#: fapolicy_analyzer/ui/system_trust_database_admin.py:112
 msgid ""
 "{fs.stat(trust.path)}\n"
 "SHA256: {fs.sha(trust.path)}"
 msgstr ""
 
+#: fapolicy_analyzer/ui/confirm_change_dialog.py:37
+msgid "{deletions} file{plural(deletions)} will be untrusted."
+msgstr ""
+
+#: fapolicy_analyzer/ui/confirm_change_dialog.py:42
+msgid "{additions} file{plural(additions)} will be trusted."
+msgstr ""
+
+#: fapolicy_analyzer/ui/confirm_change_dialog.py:48
+msgid ""
+"{total - (total_changes)} file{plural(total - (total_changes))} from the "
+"System Trust Database will be unaffected."
+msgstr ""
+
+#: fapolicy_analyzer/ui/confirm_change_dialog.py:58
+msgid "Do you wish to continue?"
+msgstr ""
+
 #: fapolicy_analyzer/ui/deploy_confirm_dialog.py:44
 msgid "Reverting to previous settings in {i+1} seconds"
 msgstr ""
@@ -268,27 +286,27 @@ msgid "An error occurred trying to retrieve the group list. Please try again."
 msgstr ""
 
 #: fapolicy_analyzer/ui/strings.py:122
-msgid "Trust Database Read Failure"
+msgid "Trust Database"
 msgstr ""
 
 #: fapolicy_analyzer/ui/strings.py:123
 msgid ""
 "\n"
-"              The fapolicyd trusted resources database\n"
-"                   could not be opened and/or read.\n"
+"The fapolicyd trusted resources database\n"
+"could not be opened and/or read.\n"
 "\n"
-"                   Typical reasons for this failure:\n"
+"Typical reasons for this failure:\n"
 "\n"
-"    1. The user does not have read permissions to access\n"
-"               the database directory or its contents.\n"
-"                    [Default: /var/lib/fapolicyd]\n"
+"1. The user does not have read permissions to access\n"
+"the database directory or its contents.\n"
+"[Default: /var/lib/fapolicyd]\n"
 "\n"
-"    2. The database does not exist or was not initialized.\n"
+"2. The database does not exist or was not initialized.\n"
 "\n"
-"           Either the fapolicyd daemon package has not been\n"
-"       installed or if installed, has not been executed. The first\n"
-"           execution of the fapolicyd daemon will create and\n"
-"                     populate the trust database.\n"
+"Either the fapolicyd daemon package has not been\n"
+"installed or if installed, has not been executed. The first\n"
+"execution of the fapolicyd daemon will create and\n"
+"populate the trust database.\n"
 "    "
 msgstr ""
 
@@ -319,6 +337,23 @@ msgstr ""
 msgid "Untrust"
 msgstr ""
 
+#: fapolicy_analyzer/glade/confirm_change_dialog.glade:23
+msgid "Confirm Trust Changes"
+msgstr ""
+
+#: fapolicy_analyzer/glade/confirm_change_dialog.glade:37
+msgid "Yes"
+msgstr ""
+
+#: fapolicy_analyzer/glade/confirm_change_dialog.glade:50
+msgid "No"
+msgstr ""
+
+#: fapolicy_analyzer/glade/confirm_change_dialog.glade:63
+#: fapolicy_analyzer/glade/trust_reconciliation_dialog.glade:67
+msgid "Cancel"
+msgstr ""
+
 #: fapolicy_analyzer/glade/deploy_confirm_dialog.glade:27
 msgid "Keep these trust changes?"
 msgstr ""
@@ -381,16 +416,16 @@ msgstr ""
 msgid "x"
 msgstr ""
 
-#: fapolicy_analyzer/glade/searchable_list.glade:126
+#: fapolicy_analyzer/glade/searchable_list.glade:125
 msgid "page0"
 msgstr ""
 
 #: fapolicy_analyzer/glade/splash_screen.glade:44
 msgid "Initializing File Access Policy Analyzer..."
 msgstr ""
 
-#: fapolicy_analyzer/glade/system_trust_database_admin.glade:61
-msgid "Add File To Ancillary Trust Database"
+#: fapolicy_analyzer/glade/system_trust_database_admin.glade:60
+msgid "Add To Ancillary Trust Database"
 msgstr ""
 
 #: fapolicy_analyzer/glade/trust_file_details.glade:60
@@ -409,10 +444,6 @@ msgstr ""
 msgid "Trust Reconsiliation"
 msgstr ""
 
-#: fapolicy_analyzer/glade/trust_reconciliation_dialog.glade:67
-msgid "Cancel"
-msgstr ""
-
 #: fapolicy_analyzer/glade/unapplied_changes_dialog.glade:25
 msgid "Unapplied Changes"
 msgstr ""

fapolicy_analyzer/tests/test_ancillary_trust_database_admin.py

@@ -67,7 +67,7 @@ def test_updates_trust_details(widget, mocker):
     mocker.patch(
         "ui.ancillary_trust_database_admin.fs.stat", return_value="stat for foo file"
     )
-    trust = MagicMock(status="T", path="/tmp/foo", size=1, hash="abc", spec=Trust)
+    trust = [MagicMock(status="T", path="/tmp/foo", size=1, hash="abc", spec=Trust)]
     widget.on_trust_selection_changed(trust)
     widget.trustFileDetails.set_in_database_view.assert_called_with(
         "File: /tmp/foo\nSize: 1\nSHA256: abc"
@@ -87,7 +87,7 @@ def test_updates_trust_details_for_deleted_files(widget, mocker):
     mocker.patch(
         "ui.ancillary_trust_database_admin.fs.stat", return_value="stat for foo file"
     )
-    trust = MagicMock(path="/tmp/foo")
+    trust = [MagicMock(path="/tmp/foo")]
     widget.on_trust_selection_changed(trust)
     widget.trustFileDetails.set_in_database_view.assert_not_called()
     widget.trustFileDetails.set_on_file_system_view.assert_called_with(
@@ -136,7 +136,7 @@ def test_on_trustBtn_clicked(widget, mock_dispatch, mocker):
     mocker.patch(
         "ui.ancillary_trust_database_admin.fs.stat", return_value="stat for foo file"
     )
-    trust = MagicMock(path="/tmp/foo")
+    trust = [MagicMock(path="/tmp/foo")]
     widget.on_trust_selection_changed(trust)
     widget.get_object("trustBtn").clicked()
     mock_dispatch.assert_called_with(
@@ -166,7 +166,7 @@ def test_on_untrustBtn_clicked(widget, mock_dispatch, mocker):
     mocker.patch(
         "ui.ancillary_trust_database_admin.fs.stat", return_value="stat for foo file"
     )
-    trust = MagicMock(path="/tmp/foo")
+    trust = [MagicMock(path="/tmp/foo")]
     widget.on_trust_selection_changed(trust)
     widget.get_object("untrustBtn").clicked()
     mock_dispatch.assert_called_with(