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
@@ -76,7 +76,7 @@ jobs:
                     path: dist
                     if-no-files-found: error
 
-    upload-release:
+    upload-generic-package:
         needs: build
         if: success()
         runs-on: docker
@@ -89,10 +89,19 @@ jobs:
                 run: |
                     echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \
                     --upload-file release_blobs/${{ github.event.repository.name }}-linux-amd64 \
-                    https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/generic/${{ github.event.repository.name }}/${{ github.ref_name }}/chellaris-rust-api-linux-amd64'
+                    https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/generic/${{ github.event.repository.name }}/${{ github.ref_name }}/${{ github.event.repository.name }}-linux-amd64'
                     curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \
                     --upload-file release_blobs/${{ github.event.repository.name }}-linux-amd64 \
-                    https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/generic/${{ github.event.repository.name }}/${{ github.ref_name }}/chellaris-rust-api-linux-amd64
+                    https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/generic/${{ github.event.repository.name }}/${{ github.ref_name }}/${{ github.event.repository.name }}-linux-amd64
+
+    upload-debian-package:
+        needs: build
+        if: success()
+        runs-on: docker
+        steps:
+            -
+                name: Downloading All Build Artifacts
+                uses: actions/download-artifact@v3
             -
                 name: Upload Debian Package to staging
                 run: |
@@ -115,9 +124,20 @@ jobs:
                     --upload-file release_blobs/${{ github.event.repository.name }}_"$DEBIAN_REF""$DEBIAN_REV"_amd64.deb \
                     https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/debian/pool/bookworm/main/upload
 
+    create-release:
+        needs: build
+        if: success()
+        runs-on: docker
+        steps:
+            -
+                name: Downloading All Build Artifacts
+                uses: actions/download-artifact@v3
+            -
+                name: Filter out env files
+                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.2"
+version = "1.1.9"
 dependencies = [
  "chrono",
  "confy",

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["Neshura"]
 name = "cloudflare-dns-updater"
-version = "1.1.2"
+version = "1.1.9"
 edition = "2021"
 description = "Application for automatically updating Cloudflare DNS records"
 license = "GPL-3.0-or-later"
@@ -16,12 +16,7 @@ assets = [
         "target/release/cloudflare-dns-updater",
         "/usr/local/bin/cloudflare-dns-updater",
         "755",
-    ],
+    ]
-    [
-        "debian/cloudflare-dns-updater-user.service",
-        "/lib/systemd/user/cloudflare-dns-updater.service",
-        "755",
-    ],
 ]
 systemd-units = { enable = false }
 

README.md

@@ -10,7 +10,7 @@ Further the application must be located in the same network as the configured zo
 The actual configuration happens in three or more files located in `~/.config/cloudflare-dns-updater/`:
 `config.toml` contains general configuration parameters for the application
 `interfaces.toml` contains all IPv6 interfaces available/used by the zone config files.  
-`.toml` files in `zone.d` contain settings for individual zones.
+`.toml` files in `zones.d` contain settings for individual zones.
 
 Example:
 
@@ -29,7 +29,7 @@ host_address = "::edcb:a098:7654:3210"
 example-interface = "::0123:4567:890a:bcde"   # static part of the IP, the rest will be dynamically generated using the host
 ```
 
-*zone.d/example.org.toml*
+*zones.d/example.org.toml*
 ```toml
 email = "owner@example.org"             # Email of User owning the Zone
 zone = "example.org"                    # Zone Name

debian/cloudflare-dns-updater.service

@@ -1,13 +0,0 @@
-[Unit]
-Description="Application for automatically updating Cloudflare DNS records"
-After=syslog.target
-After=network-online.target
-
-[Service]
-Type=simple
-ExecStart=/usr/local/bin/cloudflare-dns-updater
-Restart=always
-RestartSec=3
-
-[Install]
-WantedBy=multi-user.target

debian/cloudflare-dns-updater@.service

@@ -5,9 +5,10 @@ After=network-online.target
 
 [Service]
 Type=simple
+User=%i
 ExecStart=/usr/local/bin/cloudflare-dns-updater
 Restart=always
 RestartSec=3
 
 [Install]
-WantedBy=default.target
+WantedBy=multi-user.target

debian/postinst

@@ -1,36 +0,0 @@
-#!/bin/sh
-#DEBHELPER#
-
-# Also enable User Service
-
-# Automatically added by cargo-deb
-if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
-	if deb-systemd-helper --user debian-installed cloudflare-dns-updater.service; then
-		# This will only remove masks created by d-s-h on package removal.
-		deb-systemd-helper --user unmask cloudflare-dns-updater.service >/dev/null || true
-
-		if deb-systemd-helper --user --quiet was-enabled cloudflare-dns-updater.service; then
-			# Create new symlinks, if any.
-			deb-systemd-helper --user enable cloudflare-dns-updater.service >/dev/null || true
-		fi
-	fi
-
-	# Update the statefile to add new symlinks (if any), which need to be cleaned
-	# up on purge. Also remove old symlinks.
-	deb-systemd-helper --user update-state cloudflare-dns-updater.service >/dev/null || true
-fi
-# End automatically added section
-# Automatically added by cargo-deb
-if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
-	if [ -d /run/systemd/system ]; then
-	    USER="$(who | head -1 | awk '{print $1;}')"
-		runuser -l $USER -c "XDG_RUNTIME_DIR=/run/user/$(id -u $USER) systemctl --user daemon-reload >/dev/null || true"
-		if [ -n "$2" ]; then
-			_dh_action=restart
-		else
-			_dh_action=start
-		fi
-		runuser -l $USER -c "XDG_RUNTIME_DIR=/run/user/$(id -u $USER) deb-systemd-invoke --user $_dh_action cloudflare-dns-updater.service >/dev/null || true"
-	fi
-fi
-# End automatically added section

debian/postrm

@@ -1,27 +0,0 @@
-#!/bin/sh
-#DEBHELPER#
-
-# Also enable User Service
-
-# Automatically added by cargo-deb
-if [ -d /run/systemd/system ]; then
-  USER="$(who | head -1 | awk '{print $1;}')"
-	runuser -l $USER -c "XDG_RUNTIME_DIR=/run/user/$(id -u $USER) systemctl --user daemon-reload >/dev/null || true"
-fi
-# End automatically added section
-# Automatically added by cargo-deb
-if [ "$1" = "remove" ]; then
-	if [ -x "/usr/bin/deb-systemd-helper" ]; then
-	  USER="$(who | head -1 | awk '{print $1;}')"
-		runuser -l $USER -c "XDG_RUNTIME_DIR=/run/user/$(id -u $USER) deb-systemd-helper --user mask cloudflare-dns-updater.service >/dev/null || true"
-	fi
-fi
-
-if [ "$1" = "purge" ]; then
-	if [ -x "/usr/bin/deb-systemd-helper" ]; then
-	  USER="$(who | head -1 | awk '{print $1;}')"
-		runuser -l $USER -c "XDG_RUNTIME_DIR=/run/user/$(id -u $USER) deb-systemd-helper --user purge cloudflare-dns-updater.service >/dev/null || true"
-		runuser -l $USER -c "XDG_RUNTIME_DIR=/run/user/$(id -u $USER) deb-systemd-helper --user unmask cloudflare-dns-updater.service >/dev/null || true"
-	fi
-fi
-# End automatically added section

debian/prerm

@@ -1,11 +0,0 @@
-#!/bin/sh
-#DEBHELPER#
-
-# Also enable User Service
-
-# Automatically added by cargo-deb
-if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
-  USER="$(who | head -1 | awk '{print $1;}')"
-	runuser -l $USER -c "XDG_RUNTIME_DIR=/run/user/$(id -u $USER) deb-systemd-invoke --user stop cloudflare-dns-updater.service >/dev/null || true"
-fi
-# End automatically added section

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)
         };
@@ -61,19 +61,28 @@ impl Addresses {
         match self.get_v4() {
             Ok(ip) => {
                 if ip != self.ipv4 {
-                    let info_msg = format!("IPv4 changed from '{}' to '{}'", self.ipv4, ip);
+                    if ip == Ipv4Addr::new(0,0,0,0) {
-                    match connected_to_journal() {
+                        let warn_msg = "'0.0.0.0' detected as new IPv4, skipping changes".to_owned();
-                        true => info!("[INFO] {info_msg}"),
+                        match connected_to_journal() {
-                        false => println!("[INFO] {info_msg}"),
+                            true => warn!("[WARN] {warn_msg}"),
+                            false => println!("[WARN] {warn_msg}"),
+                        }
+                    }
+                    else {
+                        let info_msg = format!("IPv4 changed from '{}' to '{}'", self.ipv4, ip);
+                        match connected_to_journal() {
+                            true => info!("[INFO] {info_msg}"),
+                            false => println!("[INFO] {info_msg}"),
+                        }
+                        self.ipv4 = ip;
                     }
-                    self.ipv4 = ip;
                 }
             }
             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}"),
                 }
             }
         }
@@ -81,19 +90,28 @@ impl Addresses {
         match self.get_v6() {
             Ok(ip) => {
                 if ip != self.ipv6 {
-                    let info_msg = format!("IPv6 changed from '{}' to '{}'", self.ipv6, ip);
+                    if ip == Ipv6Addr::new(0,0,0,0,0,0,0,0) {
-                    match connected_to_journal() {
+                        let warn_msg = "'::' detected as new IPv6, skipping changes".to_owned();
-                        true => info!("[INFO] {info_msg}"),
+                        match connected_to_journal() {
-                        false => println!("[INFO] {info_msg}"),
+                            true => warn!("[WARN] {warn_msg}"),
+                            false => println!("[WARN] {warn_msg}"),
+                        }
+                    }
+                    else {
+                        let info_msg = format!("IPv6 changed from '{}' to '{}'", self.ipv6, ip);
+                        match connected_to_journal() {
+                            true => info!("[INFO] {info_msg}"),
+                            false => println!("[INFO] {info_msg}"),
+                        }
+                        self.ipv6 = ip;
                     }
-                    self.ipv6 = ip;
                 }
             }
             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}"),
                 }
             }
         }
@@ -104,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"))
                     },
                     _ => {
@@ -127,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"))
                     },
                     _ => {
@@ -638,7 +656,7 @@ fn main() {
                             if cf_zone.update(entry, r#type, &cf_entry.id, ipv6, ipv4).is_ok() {
                                 let info_msg = format!("Updated {} DNS Record for entry '{}' in zone '{}'", r#type, entry.name, zone.name);
                                 match connected_to_journal() {
-                                    true => warn!("[INFO] {info_msg}"),
+                                    true => info!("[INFO] {info_msg}"),
                                     false => println!("[INFO] {info_msg}"),
                                 }
                             }