Rust 2024

Author: rblaine95

Cargo.lock

@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.dependencies]
 base64 = "0.22.1"
 clap = { version = "4.5", features = ["derive"] }
-cloudflare = { version = "0.11", features = ["rustls-tls"] }
+cloudflare = { version = "0.13", features = ["rustls-tls"] }
 color-eyre = "0.6"
 futures = "0.3"
 heck = "0.5"

Cargo.toml

@@ -3,5 +3,5 @@ domainName = "bunkerlab.net"
 encryptionKey = "bunkerlab"
 
 [cloudflare]
-apiKey = "changeme"
-zoneId = "changeme"
+apiKey = "t9eq7RmAHmhrMSk1wiYf5ezSJxfT28mth4iJqO8Y"
+zoneId = "511186bc1f225fa035f02f5595c1fcf9"

config.toml

@@ -1,7 +1,7 @@
 [package]
 name = "dnfs-lib"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 base64.workspace = true

dnfs-lib/Cargo.toml

@@ -9,23 +9,23 @@ use std::{
 use base64::prelude::*;
 use cloudflare::framework::async_api;
 use color_eyre::{
-    eyre::{OptionExt, WrapErr},
     Result,
+    eyre::{OptionExt, WrapErr},
 };
 use futures::stream::{self, StreamExt};
 use heck::ToKebabCase;
 use hickory_resolver::{
+    AsyncResolver,
     name_server::{GenericConnector, TokioRuntimeProvider},
     proto::rr::rdata::TXT,
-    AsyncResolver,
 };
 use magic_crypt::MagicCryptTrait;
 use securefmt::Debug;
 use tracing::debug;
 
 use crate::{
     file_record::FileRecord,
-    helpers::{write_txt_record, DNFSError, MAX_CHUNK_SIZE},
+    helpers::{DNFSError, MAX_CHUNK_SIZE, write_txt_record},
 };
 
 #[derive(Debug, Clone)]

dnfs-lib/src/file.rs

@@ -2,19 +2,19 @@
 #![forbid(unsafe_code)]
 
 use cloudflare::{endpoints::dns, framework::async_api};
-use color_eyre::{eyre::WrapErr, Result};
+use color_eyre::{Result, eyre::WrapErr};
 use futures::stream::{self, StreamExt};
 use hickory_resolver::{
+    AsyncResolver,
     name_server::{GenericConnector, TokioRuntimeProvider},
     proto::rr::rdata::TXT,
-    AsyncResolver,
 };
 use securefmt::Debug;
 use tracing::{debug, info};
 
 use crate::{
     file::File,
-    helpers::{get_all_files, get_record_id, write_txt_record, DNFSError},
+    helpers::{DNFSError, get_all_files, get_record_id, write_txt_record},
 };
 
 #[derive(Debug, Clone)]
@@ -120,13 +120,14 @@ impl FileRecord {
     ) -> Result<String> {
         let fqdn = format!("{name}.dnfs.{domain_name}", name = self.name);
         let content = format!(
-                "v={version} chunks={chunks} size={size} sha256hash={sha256} mime={mime} extension={extension}",
-                version = self.version,
-                chunks = self.chunks,
-                size = self.size,
-                sha256 = self.sha256,
-                mime = self.mime,
-                extension = self.extension.clone().unwrap_or_default());
+            "v={version} chunks={chunks} size={size} sha256hash={sha256} mime={mime} extension={extension}",
+            version = self.version,
+            chunks = self.chunks,
+            size = self.size,
+            sha256 = self.sha256,
+            mime = self.mime,
+            extension = self.extension.clone().unwrap_or_default()
+        );
         write_txt_record(&fqdn, &content, cf_client, zone_identifier, dry_run).await
     }
 

dnfs-lib/src/file_record.rs

@@ -4,9 +4,9 @@
 use cloudflare::{endpoints::dns, framework::async_api};
 use color_eyre::eyre::Result;
 use hickory_resolver::{
+    AsyncResolver,
     name_server::{GenericConnector, TokioRuntimeProvider},
     proto::rr::rdata::TXT,
-    AsyncResolver,
 };
 use securefmt::Debug;
 use thiserror::Error;

dnfs-lib/src/helpers.rs

@@ -1,7 +1,7 @@
 [package]
 name = "dnfs"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 dnfs-lib = { path = "../dnfs-lib" }

dnfs/Cargo.toml

@@ -1,13 +1,13 @@
 // This is extremely safe, it says so right here!
-#![forbid(unsafe_code)]
+#![deny(unsafe_code)]
 
 use std::{
     io::{self, Write},
     path::Path,
 };
 
-use clap::{arg, Args, Parser, Subcommand};
-use cloudflare::framework::{async_api, auth, Environment, HttpApiClientConfig};
+use clap::{Args, Parser, Subcommand, arg};
+use cloudflare::framework::{Environment, HttpApiClientConfig, async_api, auth};
 use color_eyre::eyre::Result;
 use config::Config;
 use dnfs_lib::{
@@ -16,8 +16,8 @@ use dnfs_lib::{
     helpers::{check_usage_agreement, get_all_files},
 };
 use hickory_resolver::{
-    config::{ResolverConfig, ResolverOpts},
     TokioAsyncResolver,
+    config::{ResolverConfig, ResolverOpts},
 };
 use securefmt::Debug;
 use tracing::{debug, warn};
@@ -90,15 +90,21 @@ async fn main() -> Result<()> {
 
     // Default log level is `info`
     if std::env::var("RUST_LOG").is_err() {
-        std::env::set_var("RUST_LOG", "info");
+        #[allow(unsafe_code)]
+        unsafe {
+            std::env::set_var("RUST_LOG", "info");
+        }
     }
     tracing_subscriber::fmt()
         .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
         .with_writer(io::stderr)
         .init();
 
     // Default number of jobs for streams is 4
-    std::env::set_var("JOBS", cli.global.jobs.to_string());
+    #[allow(unsafe_code)]
+    unsafe {
+        std::env::set_var("JOBS", cli.global.jobs.to_string());
+    }
 
     // Load config
     let config = Config::new(Path::new("config.toml"))?;
@@ -191,7 +197,9 @@ async fn main() -> Result<()> {
             } else {
                 warn!("BE CAREFUL!");
                 warn!("This will purge all DNFS Files from the DNS zone");
-                print!("Are you sure you want to purge all data? This action cannot be undone. (y/N): ");
+                print!(
+                    "Are you sure you want to purge all data? This action cannot be undone. (y/N): "
+                );
                 io::stdout().flush().unwrap();
 
                 let mut input = String::new();
@@ -220,11 +228,11 @@ async fn main() -> Result<()> {
 mod tests {
     use std::path::Path;
 
-    use hickory_resolver::{config, TokioAsyncResolver};
+    use hickory_resolver::{TokioAsyncResolver, config};
 
     use crate::File;
 
-    use super::{check_usage_agreement, Config};
+    use super::{Config, check_usage_agreement};
 
     #[test]
     fn test_config() {