Add the daemon config UI

fapolicy_analyzer/glade/config_admin_page.glade

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.38.2 -->
+<!--
+  Copyright Concurrent Technologies Corporation 2022
+
+  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.24"/>
+  <object class="GtkPaned" id="configAdminPage">
+    <property name="visible">True</property>
+    <property name="can_focus">True</property>
+    <property name="orientation">vertical</property>
+    <child>
+      <object class="GtkFrame">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">False</property>
+        <property name="vexpand">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkBox" id="configContentArea">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">False</property>
+            <property name="vexpand">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+        </child>
+        <child type="label_item">
+          <placeholder/>
+        </child>
+      </object>
+      <packing>
+        <property name="resize">True</property>
+        <property name="shrink">True</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="configStatusFrame">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <placeholder/>
+        </child>
+        <child type="label_item">
+          <placeholder/>
+        </child>
+      </object>
+      <packing>
+        <property name="resize">False</property>
+        <property name="shrink">True</property>
+      </packing>
+    </child>
+  </object>
+</interface>

fapolicy_analyzer/glade/config_text_view.glade

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.38.2 -->
+<!--
+  Copyright Concurrent Technologies Corporation 2022
+
+  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.24"/>
+  <object class="GtkScrolledWindow" id="configTextView">
+    <property name="visible">True</property>
+    <property name="can_focus">True</property>
+    <property name="shadow_type">in</property>
+    <child>
+      <object class="GtkViewport">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkSourceView" id="configText">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

fapolicy_analyzer/glade/rules_text_view.glade → fapolicy_analyzer/glade/editable_text_view.glade

@@ -18,18 +18,18 @@
 -->
 <interface>
   <requires lib="gtk+" version="3.22"/>
-  <object class="GtkScrolledWindow" id="rulesTextView">
+  <object class="GtkScrolledWindow" id="editableTextView">
     <property name="visible">True</property>
-    <property name="can-focus">True</property>
-    <property name="shadow-type">in</property>
+    <property name="can_focus">True</property>
+    <property name="shadow_type">in</property>
     <child>
       <object class="GtkViewport" id="viewport">
         <property name="visible">True</property>
-        <property name="can-focus">False</property>
+        <property name="can_focus">False</property>
         <child>
           <object class="GtkSourceView" id="textView">
             <property name="visible">True</property>
-            <property name="can-focus">True</property>
+            <property name="can_focus">True</property>
             <property name="editable">True</property>
             <property name="monospace">True</property>
             <property name="show_line_numbers">True</property>

fapolicy_analyzer/glade/rules_status_info.glade → fapolicy_analyzer/glade/editor_status_info.glade

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.38.2 -->
 <!--
   Copyright Concurrent Technologies Corporation 2022
 
@@ -18,7 +18,7 @@
 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <object class="GtkFrame" id="rulesStatusInfo">
+  <object class="GtkFrame" id="editorStatusInfo">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="label_xalign">0</property>

fapolicy_analyzer/glade/main_window.glade

@@ -212,6 +212,16 @@
                             <signal name="activate" handler="on_fapdStartMenu_activate" swapped="no"/>
                           </object>
                         </child>
+                        <child>
+                          <object class="GtkImageMenuItem" id="configMenuItem">
+                            <property name="label">Config</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="use_stock">True</property>
+                            <signal name="activate" handler="on_configAdminMenu_activate" swapped="no"/>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>

fapolicy_analyzer/tests/mocks.py

@@ -77,6 +77,10 @@ def mock_rule():
     return MagicMock(id=1, text="Mock Rule Number 1", is_valid=True, info=[])
 
 
+def mock_config():
+    return MagicMock(config_text="Config Text", is_valid=True)
+
+
 class mock_System:
     def ancillary_trust(self):
         return [mock_trust()]

fapolicy_analyzer/tests/rules/test_rules_admin_page.py

@@ -176,7 +176,7 @@ def test_handles_rules_exception(mock_dispatch, mock_system_feature):
 def test_populates_text_editor(mock_system_feature, mocker):
     mock_text_renderer = MagicMock()
     mocker.patch(
-        "fapolicy_analyzer.ui.rules.rules_admin_page.RulesTextView.render_rules",
+        "fapolicy_analyzer.ui.rules.rules_admin_page.RulesTextView.render_text",
         mock_text_renderer,
     )
     mock_system_feature.on_next(

fapolicy_analyzer/tests/rules/test_rules_text_view.py

@@ -36,7 +36,7 @@ def test_creates_widget(widget):
 
 
 def test_renders_rules(widget):
-    widget.render_rules("foo/")
+    widget.render_text("foo/")
 
     textView = widget.get_object("textView")
     textBuffer = textView.get_buffer()
@@ -50,10 +50,10 @@ def test_renders_rules(widget):
 
 def test_handles_bad_language_file(mocker):
     mocker.patch(
-        "fapolicy_analyzer.ui.rules.rules_text_view.resources.path",
+        "fapolicy_analyzer.ui.editable_text_view.resources.path",
         return_value="bad path",
     )
-    mock_logger = mocker.patch("fapolicy_analyzer.ui.rules.rules_text_view.logging")
+    mock_logger = mocker.patch("fapolicy_analyzer.ui.editable_text_view.logging")
     widget = RulesTextView()
     assert widget is not None
     mock_logger.warning.assert_has_calls(

fapolicy_analyzer/tests/test_config_admin_page.py

@@ -0,0 +1,123 @@
+# Copyright Concurrent Technologies Corporation 2023
+#
+# 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/>.
+
+import context  # noqa: F401 # isort: skip
+from unittest.mock import MagicMock
+
+import gi
+import pytest
+
+from callee import Attrs, InstanceOf
+from mocks import mock_System
+from rx.subject import Subject
+
+from fapolicy_analyzer.redux import Action
+from fapolicy_analyzer.ui.actions import (
+    ADD_NOTIFICATION,
+    APPLY_CHANGESETS,
+    MODIFY_CONFIG_TEXT,
+)
+from fapolicy_analyzer.ui.config_admin_page import ConfigAdminPage
+from fapolicy_analyzer.ui.store import init_store
+from fapolicy_analyzer.ui.strings import (
+    CONFIG_TEXT_LOAD_ERROR,
+)
+
+
+gi.require_version("Gtk", "3.0")
+from gi.repository import Gtk  # isort: skip
+
+initial_system = {
+    "config_text": MagicMock(error=None, loading=False, config_text=""),
+    "changesets": MagicMock(),
+    "system": MagicMock(),
+}
+
+
+@pytest.fixture()
+def mock_dispatch(mocker):
+    return mocker.patch("fapolicy_analyzer.ui.config_admin_page.dispatch")
+
+
+@pytest.fixture()
+def mock_system_feature(mocker):
+    mockSystemFeature = Subject()
+    mocker.patch(
+        "fapolicy_analyzer.ui.config_admin_page.get_system_feature",
+        return_value=mockSystemFeature,
+    )
+    yield mockSystemFeature
+    mockSystemFeature.on_completed()
+
+
+@pytest.fixture
+def widget(mock_dispatch, mock_system_feature):
+    init_store(mock_System())
+    return ConfigAdminPage()
+
+
+def test_creates_widget(widget):
+    assert type(widget.get_ref()) is Gtk.Paned
+
+
+@pytest.mark.usefixtures("widget")
+def test_populates_text_editor(mock_system_feature, mocker):
+    mock_text_renderer = MagicMock()
+    mocker.patch(
+        "fapolicy_analyzer.ui.config_admin_page.ConfigTextView.render_text",
+        mock_text_renderer,
+    )
+    mock_system_feature.on_next(
+        {
+            **initial_system,
+            "config_text": MagicMock(
+                error=None,
+                config_text="foo",
+                loading=False,
+            ),
+        }
+    )
+    mock_text_renderer.assert_called_once_with("foo")
+
+
+@pytest.mark.usefixtures("widget")
+def test_handles_config_text_exception(mock_dispatch, mock_system_feature):
+    mock_dispatch.reset_mock()
+    mock_system_feature.on_next(
+        {
+            **initial_system,
+            "config_text": MagicMock(error="foo", loading=False),
+        }
+    )
+    mock_dispatch.assert_called_with(
+        InstanceOf(Action)
+        & Attrs(
+            type=ADD_NOTIFICATION,
+            payload=Attrs(text=CONFIG_TEXT_LOAD_ERROR),
+        )
+    )
+
+
+def test_handles_config_text_change(widget, mock_dispatch):
+    widget._text_view.config_changed("new config")
+    mock_dispatch.assert_called_with(
+        InstanceOf(Action) & Attrs(type=MODIFY_CONFIG_TEXT, payload="new config")
+    )
+
+
+def test_save_click_valid(widget, mock_dispatch):
+    widget._text_view.config_changed("allow perm=any all : all")
+    widget.on_save_clicked()
+    mock_dispatch.assert_called_with(InstanceOf(Action) & Attrs(type=APPLY_CHANGESETS))

fapolicy_analyzer/ui/actions.py

@@ -74,6 +74,12 @@
 MODIFY_RULES_TEXT = "MODIFY_RULES_TEXT"
 ERROR_RULES_TEXT = "ERROR_RULES_TEXT"
 
+REQUEST_CONFIG_TEXT = "REQUEST_CONFIG_TEXT"
+RECEIVED_CONFIG_TEXT = "RECEIVED_CONFIG_TEXT"
+MODIFY_CONFIG_TEXT = "MODIFY_CONFIG_TEXT"
+ERROR_CONFIG_TEXT = "ERROR_CONFIG_TEXT"
+
+
 PROFILING_INIT_EVENT = "PROFILING_INIT"
 START_PROFILING_REQUEST = "START_PROFILING_REQUEST"
 START_PROFILING_RESPONSE = "START_PROFILING_RESPONSE"
@@ -274,6 +280,22 @@ def error_rules_text(error: str) -> Action:
     return _create_action(ERROR_RULES_TEXT, error)
 
 
+def request_config_text() -> Action:
+    return _create_action(REQUEST_CONFIG_TEXT)
+
+
+def received_config_text(config_text: str) -> Action:
+    return _create_action(RECEIVED_CONFIG_TEXT, config_text)
+
+
+def modify_config_text(config_text: str) -> Action:
+    return _create_action(MODIFY_CONFIG_TEXT, config_text)
+
+
+def error_config_text(error: str) -> Action:
+    return _create_action(ERROR_CONFIG_TEXT, error)
+
+
 def profiler_init() -> Action:
     return _create_action(PROFILING_INIT_EVENT)