Release 1.1.9 Ammend

Reviewed-on: https://forgejo.neshweb.net///Neshura/cloudflare-dns-updater/pulls/36

.forgejo/workflows/build+release.yml

@@ -63,7 +63,7 @@ jobs:
                 name: Bundle .deb package
                 run: |
                     cargo deb
-                    DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~)
+                    DEBIAN_REF=$(cat Cargo.toml | grep -E "(^|\|)version =" | cut -f2- -d= | tr -d \" | tr -d " " | tr - \~)
                     echo "DEBIAN_REF=$DEBIAN_REF" >> dist/build.env
                     DEBIAN_REV=-$(cat Cargo.toml | grep -E "(^|\|)revision =" | cut -f2- -d= | tr -d \" | tr -d " ")
                     echo "DEBIAN_REV=$DEBIAN_REV" >> dist/build.env
@@ -137,7 +137,7 @@ jobs:
                 run: rm release_blobs/build.env
             -
                 name: Release New Version
-                uses: actions/forgejo-release@v1
+                uses: actions/forgejo-release@v2
                 with:
                     direction: upload
                     url: https://forgejo.neshweb.net

Cargo.lock

@@ -114,7 +114,7 @@ dependencies = [
 
 [[package]]
 name = "cloudflare-dns-updater"
-version = "1.1.6"
+version = "1.1.9"
 dependencies = [
  "chrono",
  "confy",

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["Neshura"]
 name = "cloudflare-dns-updater"
-version = "1.1.6"
+version = "1.1.9"
 edition = "2021"
 description = "Application for automatically updating Cloudflare DNS records"
 license = "GPL-3.0-or-later"

src/cloudflare.rs

@@ -64,7 +64,7 @@ impl CloudflareZone {
                     let entries = match response.json::<CloudflareApiResults>() {
                         Ok(data) => data,
                         Err(e) => {
-                            let err_msg = format!("Unable to parse API response. Error: {e}");
+                            let err_msg = format!("Unable to parse API response: {e}");
                             match connected_to_journal() {
                                 true => error!("[ERROR] {err_msg}"),
                                 false => eprintln!("[ERROR] {err_msg}"),
@@ -75,7 +75,7 @@ impl CloudflareZone {
 
                     Ok(entries.result)
                 } else {
-                    let err_msg = format!("Unable to fetch Cloudflare Zone Entries for {}. Error: {}",self.name ,response.status());
+                    let err_msg = format!("Unable to fetch Cloudflare Zone Entries for {}: {}",self.name ,response.status());
                     match connected_to_journal() {
                         true => error!("[ERROR] {err_msg}"),
                         false => eprintln!("[ERROR] {err_msg}"),
@@ -84,7 +84,7 @@ impl CloudflareZone {
                 }
             }
             Err(e) => {
-                let err_msg = format!("Unable to access Cloudflare API. Error: {e}");
+                let err_msg = format!("Unable to access Cloudflare API: {e}");
                 match connected_to_journal() {
                     true => error!("[ERROR] {err_msg}"),
                     false => eprintln!("[ERROR] {err_msg}"),
@@ -107,7 +107,7 @@ impl CloudflareZone {
                             self.validate_response(response)
                         },
                         Err(e) => {
-                            let err_msg = format!("Unable to access Cloudflare API. Error: {e}");
+                            let err_msg = format!("Unable to access Cloudflare API: {e}");
                             match connected_to_journal() {
                                 true => error!("[ERROR] {err_msg}"),
                                 false => eprintln!("[ERROR] {err_msg}"),
@@ -133,7 +133,7 @@ impl CloudflareZone {
                             self.validate_response(response)
                         },
                         Err(e) => {
-                            let err_msg = format!("Unable to access Cloudflare API. Error: {e}");
+                            let err_msg = format!("Unable to access Cloudflare API: {e}");
                             match connected_to_journal() {
                                 true => error!("[ERROR] {err_msg}"),
                                 false => eprintln!("[ERROR] {err_msg}"),
@@ -174,7 +174,7 @@ impl CloudflareZone {
                             self.validate_response(response)
                         },
                         Err(e) => {
-                            let err_msg = format!("Unable to access Cloudflare API. Error: {e}");
+                            let err_msg = format!("Unable to access Cloudflare API: {e}");
                             match connected_to_journal() {
                                 true => error!("[ERROR] {err_msg}"),
                                 false => eprintln!("[ERROR] {err_msg}"),
@@ -200,7 +200,7 @@ impl CloudflareZone {
                             self.validate_response(response)
                         },
                         Err(e) => {
-                            let err_msg = format!("Unable to access Cloudflare API. Error: {e}");
+                            let err_msg = format!("Unable to access Cloudflare API: {e}");
                             match connected_to_journal() {
                                 true => error!("[ERROR] {err_msg}"),
                                 false => eprintln!("[ERROR] {err_msg}"),
@@ -270,7 +270,7 @@ impl CloudflareZone {
         match Url::parse(input) {
             Ok(url) => Ok(url),
             Err(e) => {
-                let err_msg = format!("Unable to parse URL. Error: {}", e);
+                let err_msg = format!("Unable to parse URL: {}", e);
                 match connected_to_journal() {
                     true => error!("[ERROR] {err_msg}"),
                     false => eprintln!("[ERROR] {err_msg}"),
@@ -293,7 +293,7 @@ impl CloudflareZone {
             let data = match response.json::<CloudflareApiResult>() {
                 Ok(data) => data,
                 Err(e) => {
-                    let err_msg = format!("Unable to parse API response. Error: {e}");
+                    let err_msg = format!("Unable to parse API response: {e}");
                     match connected_to_journal() {
                         true => error!("[ERROR] {err_msg}"),
                         false => eprintln!("[ERROR] {err_msg}"),
@@ -305,7 +305,7 @@ impl CloudflareZone {
             match data.success {
                 true => Ok(()),
                 false => {
-                    let err_msg = format!("Unexpected error while updating DNS record. Info: {:?}", data);
+                    let err_msg = format!("Unexpected error while updating DNS record: {:?}", data);
                     match connected_to_journal() {
                         true => error!("[ERROR] {err_msg}"),
                         false => eprintln!("[ERROR] {err_msg}"),
@@ -314,7 +314,7 @@ impl CloudflareZone {
                 }
             }
         } else {
-            let err_msg = format!("Unable to post/put Cloudflare DNS entry. Error: {}", response.status());
+            let err_msg = format!("Unable to post/put Cloudflare DNS entry: {}", response.status());
             match connected_to_journal() {
                 true => error!("[ERROR] {err_msg}"),
                 false => eprintln!("[ERROR] {err_msg}"),

src/config.rs

@@ -37,7 +37,7 @@ impl InterfaceConfig {
         let interface_address = match self.interfaces.get(interface_name) {
             Some(address) => *address,
             None => {
-                let err_msg = "Malformed IP in interfaces.toml";
+                let err_msg = format!("Malformed or missing IP in interfaces.toml for interface {}", interface_name);
                 match connected_to_journal() {
                     true => error!("[ERROR] {err_msg}"),
                     false => eprintln!("[ERROR] {err_msg}"),

src/main.rs

@@ -24,8 +24,8 @@ struct Addresses {
 impl Addresses {
     fn new() -> Result<Self, Box<dyn Error>> {
         let mut ret = Self {
-            ipv4_uri: "https://am.i.mullvad.net/ip".to_owned(),
+            ipv4_uri: "http://ip4only.me/api/".to_owned(),
-            ipv6_uri: "https://ipv6.am.i.mullvad.net/ip".to_owned(),
+            ipv6_uri: "http://ip6only.me/api/".to_owned(),
             ipv4: Ipv4Addr::new(0, 0, 0, 0),
             ipv6: Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0)
         };
@@ -79,10 +79,10 @@ impl Addresses {
                 }
             }
             Err(e) => {
-                let warn_msg = format!("Unable to fetch IPv4 from '{}'. Error: {}", self.ipv4_uri, e);
+                let error_msg = format!("Unable to fetch IPv4 from '{}': {}", self.ipv4_uri, e);
                 match connected_to_journal() {
-                    true => warn!("[WARN] {warn_msg}"),
+                    true => error!("[ERROR] {error_msg}"),
-                    false => println!("[WARN] {warn_msg}"),
+                    false => eprintln!("[ERROR] {error_msg}"),
                 }
             }
         }
@@ -108,10 +108,10 @@ impl Addresses {
                 }
             }
             Err(e) => {
-                let warn_msg = format!("Unable to fetch IPv6 from '{}'. Error: {}", self.ipv6_uri, e);
+                let error_msg = format!("Unable to fetch IPv6 from '{}': {}", self.ipv6_uri, e);
                 match connected_to_journal() {
-                    true => warn!("[WARN] {warn_msg}"),
+                    true => error!("[ERROR] {error_msg}"),
-                    false => println!("[WARN] {warn_msg}"),
+                    false => eprintln!("[ERROR] {error_msg}"),
                 }
             }
         }
@@ -122,7 +122,7 @@ impl Addresses {
             Ok(res) => {
                 match res.status() {
                     StatusCode::OK => {
-                        let ip_string = res.text().expect("Returned data should always contain text").trim_end().to_owned();
+                        let ip_string = res.text().expect("Returned data should always contain text").trim_end().split(',').collect::<Vec<&str>>()[1].to_owned();
                         Ok(Ipv4Addr::from_str(ip_string.as_str()).expect("Returned IP should always be parseable"))
                     },
                     _ => {
@@ -145,7 +145,7 @@ impl Addresses {
             Ok(res) => {
                 match res.status() {
                     StatusCode::OK => {
-                        let ip_string = res.text().expect("Returned data should always contain text").trim_end().to_owned();
+                        let ip_string: String = res.text().expect("Returned data should always contain text").trim_end().split(',').collect::<Vec<&str>>()[1].to_owned();
                         Ok(Ipv6Addr::from_str(ip_string.as_str()).expect("Returned IP should always be parseable"))
                     },
                     _ => {