Merge pull request #15 from sireliah/firewall-ubuntu

Ask user if it is fine to check the firewall config

Author: sireliah

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "dragit"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["sireliah"]
 edition = "2018"
 build = "build.rs"

Cargo.toml

@@ -15,28 +15,33 @@
     </p>
   </description>
   <releases>
-        <release version="0.6.0" date="2021-06-02">
-            <description>
-              <p>Updated the discovery behaviour to be more resilient to the network/firewall issues</p>
-              <p>
-                Fixed the bug with connection hanging when you rejected the file.
-                Watch out, this change is not backward compatible, so make sure to update Dragit on all of your devices.
-              </p>
-              <p>
-                Added notification when Dragit is waiting for the file to be accepted.
-                This was indeed required, because one might have wondered if the program got the file or not.
-              </p>
-            </description>
-        </release>
-        <release version="0.5.3" date="2021-04-28">
-            <description>
-              <p>Updated all major dependencies to the newest versions.</p>
-              <p>This includes libp2p, gtk and several others.</p>
-            </description>
-        </release>
-        <release version="0.5.0" date="2021-03-06">
-            <description>First release in Flatpak</description>
-        </release>
+    <release version="0.6.1" date="2021-06-27">
+      <description>
+        <p>Made Dragit check firewalld config when the application is started.</p>
+      </description>
+    </release>
+    <release version="0.6.0" date="2021-06-02">
+      <description>
+        <p>Updated the discovery behaviour to be more resilient to the network/firewall issues</p>
+        <p>
+          Fixed the bug with connection hanging when you rejected the file.
+          Watch out, this change is not backward compatible, so make sure to update Dragit on all of your devices.
+        </p>
+        <p>
+          Added notification when Dragit is waiting for the file to be accepted.
+          This was indeed required, because one might have wondered if the program got the file or not.
+        </p>
+      </description>
+    </release>
+    <release version="0.5.3" date="2021-04-28">
+      <description>
+        <p>Updated all major dependencies to the newest versions.</p>
+        <p>This includes libp2p, gtk and several others.</p>
+      </description>
+    </release>
+    <release version="0.5.0" date="2021-03-06">
+      <description>First release in Flatpak</description>
+    </release>
     </releases>
   <launchable type="desktop-id">com.sireliah.Dragit.desktop</launchable>
   <screenshots>

com.sireliah.Dragit.metainfo.xml

@@ -42,7 +42,24 @@ impl AcceptFileDialog {
 pub struct FirewallDialog(gtk::MessageDialog);
 
 impl FirewallDialog {
-    pub fn new(window: &gtk::ApplicationWindow, config: &UserConfig) -> FirewallDialog {
+    pub fn new_for_check(window: &gtk::ApplicationWindow) -> FirewallDialog {
+        let text = concat!(
+            "Dragit can check if your firewall setup allows the application to work correctly.\n",
+            "You might be prompted for password.\n",
+            "\n",
+            "Would you like to check the firewall now?"
+        );
+        let dialog = gtk::MessageDialog::new(
+            Some(window),
+            gtk::DialogFlags::MODAL,
+            gtk::MessageType::Question,
+            gtk::ButtonsType::YesNo,
+            &text,
+        );
+        FirewallDialog(dialog)
+    }
+
+    pub fn new_for_config(window: &gtk::ApplicationWindow, config: &UserConfig) -> FirewallDialog {
         let port = config.get_port();
         let message = concat!(
             "Your current firewall configuration prevents Dragit from working.\n",
@@ -70,4 +87,9 @@ impl FirewallDialog {
         self.0.close();
         resp
     }
+
+    pub fn close(&self) {
+        self.0.hide();
+        self.0.close();
+    }
 }

src/dnd/dialogs.rs

@@ -146,17 +146,33 @@ fn handle_firewall(window: &gtk::ApplicationWindow) -> Result<(), Box<dyn Error>
     let config = UserConfig::new()?;
     let port = config.get_port();
 
-    let firewall = Firewall::new()?;
-    let required_services = firewall.check_rules_needed(port)?;
-
-    if required_services.0 || required_services.1 {
-        let dialog = FirewallDialog::new(window, &config);
-        let response = dialog.run();
-        match response {
-            gtk::ResponseType::Yes => firewall.handle(required_services)?,
+    if !config.get_firewall_checked() {
+        // Please note that on some OS'es like Ubuntu, polkit will require password for querying firewalld D-Bus interface.
+        let check_dialog = FirewallDialog::new_for_check(window);
+        let check_response = check_dialog.run();
+        check_dialog.close();
+
+        match check_response {
+            gtk::ResponseType::Yes => {
+                let firewall = Firewall::new()?;
+                let required_services = firewall.check_rules_needed(port)?;
+
+                if required_services.0 || required_services.1 {
+                    let dialog = FirewallDialog::new_for_config(window, &config);
+                    let response = dialog.run();
+                    match response {
+                        gtk::ResponseType::Yes => firewall.handle(required_services)?,
+                        gtk::ResponseType::No => info!("Not checking firewall configuration"),
+                        _ => warn!("Unexpected answer"),
+                    };
+                }
+            }
             gtk::ResponseType::No => info!("Not changing firewall configuration"),
             _ => warn!("Unexpected answer"),
         };
+
+        // Write to config that firewall was checked, not to ask user again.
+        config.set_firewall_checked(true)?;
     }
 
     Ok(())

src/dnd/mod.rs

@@ -9,6 +9,7 @@ use toml;
 
 // Unassigned in IANA
 const DEFAULT_LISTEN_PORT: u16 = 36571;
+const DEFAULT_FIREWALL_CHECKED: bool = false;
 
 fn get_timestamp() -> u64 {
     let now = SystemTime::now();
@@ -71,12 +72,19 @@ struct Config {
 
     #[serde(default = "default_port")]
     port: u16,
+
+    #[serde(default = "default_firewall_checked")]
+    firewall_checked: bool,
 }
 
 fn default_port() -> u16 {
     DEFAULT_LISTEN_PORT
 }
 
+fn default_firewall_checked() -> bool {
+    DEFAULT_FIREWALL_CHECKED
+}
+
 pub struct UserConfig {
     conf: Config,
     conf_path: PathBuf,
@@ -108,6 +116,7 @@ impl UserConfig {
                     None => base_dirs.home_dir().to_string_lossy().to_string(),
                 },
                 port: DEFAULT_LISTEN_PORT,
+                firewall_checked: DEFAULT_FIREWALL_CHECKED,
             };
             let toml = Self::serialize_config(config)?;
             let mut file = fs::File::create(&joined_path)?;
@@ -133,13 +142,32 @@ impl UserConfig {
         self.conf.port
     }
 
+    pub fn get_firewall_checked(&self) -> bool {
+        self.conf.firewall_checked
+    }
+
     pub fn set_downloads_dir(&self, path: &Path) -> Result<(), Error> {
         // Watch out, this ::create will truncate the file
         let mut file = fs::File::create(&self.conf_path.as_path())?;
 
         let config: Config = Config {
             downloads: path.to_string_lossy().to_string(),
             port: self.conf.port,
+            firewall_checked: self.conf.firewall_checked,
+        };
+        let toml = Self::serialize_config(config)?;
+        file.write_all(&toml.as_bytes())?;
+        Ok(())
+    }
+
+    pub fn set_firewall_checked(&self, value: bool) -> Result<(), Error> {
+        // Watch out, this ::create will truncate the file
+        let mut file = fs::File::create(&self.conf_path.as_path())?;
+
+        let config: Config = Config {
+            downloads: self.conf.downloads.to_owned(),
+            port: self.conf.port,
+            firewall_checked: value,
         };
         let toml = Self::serialize_config(config)?;
         file.write_all(&toml.as_bytes())?;