Develop #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

kweonminsung merged 29 commits into main from develop

Oct 30, 2025

.cargo/config.toml

-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    [env]
+    RUST_TEST_THREADS = "1"
+    # RUST_BACKTRACE = "1"

.github/workflows/ci.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,8 +14,11 @@ jobs: @@
       build:
         runs-on: ubuntu-latest
         steps:
-        - uses: actions/checkout@v5
+        - name: Checkout code
+          uses: actions/checkout@v5
         - name: Build
           run: cargo build --verbose
         - name: Run tests
           run: cargo test --verbose -- --test-threads=1

.github/workflows/update-openapi-docs.yml

-Original file line number
+Diff line change
@@ -0,0 +1,46 @@
+    name: Update OpenAPI Docs
+    on:
+      push:
+        branches: [ "main", "develop" ]
+        paths:
+          - "docs/openapi.yaml"
+      workflow_dispatch:
+    jobs:
+      build-docs:
+        runs-on: ubuntu-latest
+        steps:
+          - name: Checkout code
+            uses: actions/checkout@v5
+            with:
+              fetch-depth: 0
+          - name: Setup Node
+            uses: actions/setup-node@v6
+            with:
+              node-version: "24"
+          - name: Install Redocly CLI
+            run: npm install -g @redocly/cli
+          - name: Build OpenAPI docs
+            working-directory: docs
+            run: |
+              npx @redocly/cli build-docs openapi.yaml -o index.html
+          - name: Commit & Push updated docs (only on push, not PR)
+            run: |
+              git config user.name "github-actions"
+              git config user.email "[email protected]"
+              git add docs/index.html
+              # Only commit and push if there are changes
+              if ! git diff --cached --quiet; then
+                git commit -m "chore: update openapi docs"
+                git push origin ${GITHUB_REF#refs/heads/}
+              else
+                echo "No changes to commit."
+              fi

docs/index.html

Large diffs are not rendered by default.

docs/openapi.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -658,6 +658,7 @@ components: @@
             - name
             - primary_ns
             - primary_ns_ip
+            - primary_ns_ipv6
             - admin_email
             - ttl
             - refresh
@@ Expand All / @@ -679,6 +680,10 @@ components: @@
               type: string
               format: ipv4
               example: 127.0.0.1
+            primary_ns_ipv6:
+              type: string
+              format: ipv6
+              example: "::1"
             admin_email:
               type: string
               format: email
@@ Expand Down Expand Up / @@ -724,10 +729,12 @@ components: @@
           required:
             - name
             - primary_ns
-            - primary_ns_ip
             - admin_email
             - ttl
             - serial
+          anyOf:
+            - required: [primary_ns_ip]
+            - required: [primary_ns_ipv6]
           properties:
             name:
               type: string
@@ Expand All / @@ -739,6 +746,10 @@ components: @@
               type: string
               format: ipv4
               example: 127.0.0.1
+            primary_ns_ipv6:
+              type: string
+              format: ipv6
+              example: "::1"
             admin_email:
               type: string
               format: email
@@ Expand Down @@

src/api/dto.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,8 @@ pub struct GetZoneResponse { @@
         pub id: i32,
         pub name: String,
         pub primary_ns: String,
-        pub primary_ns_ip: String,
+        pub primary_ns_ip: Option<String>,
+        pub primary_ns_ipv6: Option<String>,
         pub admin_email: String,
         pub ttl: i32,
         pub serial: Option<i32>,
@@ Expand All / @@ -24,6 +25,7 @@ impl GetZoneResponse { @@
                 name: zone.name.clone(),
                 primary_ns: zone.primary_ns.clone(),
                 primary_ns_ip: zone.primary_ns_ip.clone(),
+                primary_ns_ipv6: zone.primary_ns_ipv6.clone(),
                 admin_email: zone.admin_email.clone(),
                 ttl: zone.ttl,
                 serial: Some(zone.serial),
@@ Expand All / @@ -50,7 +52,7 @@ impl GetRecordResponse { @@
             GetRecordResponse {
                 id: record.id,
                 name: record.name.clone(),
-                record_type: record.record_type.to_str().to_string(),
+                record_type: record.record_type.to_string(),
                 value: record.value.clone(),
                 ttl: record.ttl,
                 priority: record.priority,
@@ Expand All / @@ -63,7 +65,8 @@ impl GetRecordResponse { @@
     pub struct CreateZoneRequest {
         pub name: String,
         pub primary_ns: String,
-        pub primary_ns_ip: String,
+        pub primary_ns_ip: Option<String>,
+        pub primary_ns_ipv6: Option<String>,
         pub admin_email: String,
         pub ttl: i32,
         pub serial: i32,
@@ Expand Down @@

src/api/service/auth.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -20,10 +20,10 @@ impl AuthService {
  
            };

            // Check if the token is expired

            if let Some(expires_at) = &stored_token.expires_at {

                if Utc::now() > *expires_at {

                    return Err("Token has expired".to_string());

                }

            if let Some(expires_at) = &stored_token.expires_at

                && Utc::now() > *expires_at

            {

                return Err("Token has expired".to_string());

            }

            // Update last_used_at to current time

src/api/service/record.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -7,6 +7,7 @@ use crate::{
  
                record_history::RecordHistory,

            },

        },

        serializer::utils::{to_relative_domain, to_fqdn},

        log_error,

    };

    use chrono::Utc;

    @@ -79,18 +80,23 @@ impl RecordService {
  
            let record_type = RecordType::from_str(&create_record_request.record_type)

                .map_err(|_| format!("Invalid record type: {}", create_record_request.record_type))?;

            // CNAME validation for '@' name

            if record_type == RecordType::CNAME && create_record_request.name == "@" {

                return Err("CNAME record cannot have '@' as name".to_string());

            }

            // SOA validation

            if record_type == RecordType::SOA {

                log_error!("Cannot create SOA record manually");

                return Err("Cannot create SOA record manually".to_string());

            }

            // Check if zone exists and fetch existing records in the zone for CNAME validation

            match zone_repository

            // Check if zone exists

            let zone = match zone_repository

                .get_by_id(create_record_request.zone_id)

                .await

            {

                Ok(Some(_)) => {}

                Ok(Some(zone)) => zone,

                Ok(None) => {

                    return Err(format!(

                        "Zone with id {} not found",

    @@ -103,7 +109,19 @@ impl RecordService {
  
                }

            };

            // CNAME validation - fetch records from the same zone for efficient validation

            // Prevent manual creation of records related to primary_ns

            let primary_ns_relative_name = to_relative_domain(&to_fqdn(&zone.primary_ns), &zone.name);

            if (record_type == RecordType::NS && create_record_request.name == "@")

                || (record_type == RecordType::A && create_record_request.name == primary_ns_relative_name)

                || (record_type == RecordType::AAAA && create_record_request.name == primary_ns_relative_name)

            {

                return Err(

                    "Cannot manually create records that are automatically generated for the primary NS"

                        .to_string(),

                );

            }

            // CNAME validation

            let existing_records_in_zone = match record_repository

                .get_by_zone_id(create_record_request.zone_id)

                .await

    @@ -200,30 +218,47 @@ impl RecordService {
  
            }?;

            // Check if zone exists

            match zone_repository

            let zone = match zone_repository

                .get_by_id(update_record_request.zone_id)

                .await

            {

                Ok(Some(_)) => {}

                Ok(Some(zone)) => zone,

                Ok(None) => {

                    return Err("Zone not found".to_string());

                }

                Err(e) => {

                    log_error!("Failed to fetch zone: {}", e);

                    return Err("Failed to fetch zone".to_string());

                }

            }

            };

            // Validate record type

            let record_type = RecordType::from_str(&update_record_request.record_type)

                .map_err(|_| format!("Invalid record type: {}", update_record_request.record_type))?;

            // CNAME validation for '@' name

            if record_type == RecordType::CNAME && update_record_request.name == "@" {

                return Err("CNAME record cannot have '@' as name".to_string());

            }

            // SOA validation

            if record_type == RecordType::SOA {

                log_error!("Cannot update to SOA record type");

                return Err("Cannot update to SOA record type".to_string());

            }

            // Prevent manual update of records related to primary_ns

            let primary_ns_relative_name = to_relative_domain(&to_fqdn(&zone.primary_ns), &zone.name);

            if (record_type == RecordType::NS && update_record_request.name == "@")

                || (record_type == RecordType::A && update_record_request.name == primary_ns_relative_name)

                || (record_type == RecordType::AAAA && update_record_request.name == primary_ns_relative_name)

            {

                return Err(

                    "Cannot manually update records that are automatically generated for the primary NS"

                        .to_string(),

                );

            }

            // CNAME validation

            let existing_records = match record_repository

                .get_by_name(&update_record_request.name)

src/api/service/zone.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -41,6 +41,15 @@ impl ZoneService { @@
             let zone_repository = get_zone_repository();
             let zone_history_repository = get_zone_history_repository();
+            // Validate that at least one of primary_ns_ip or primary_ns_ipv6 is present
+            if create_zone_request.primary_ns_ip.is_none()
+                && create_zone_request.primary_ns_ipv6.is_none()
+            {
+                return Err(
+                    "At least one of primary_ns_ip or primary_ns_ipv6 must be provided".to_string(),
+                );
+            }
             // Check if zone already exists
             match zone_repository.get_by_name(&create_zone_request.name).await {
                 Ok(Some(_)) => {
@@ Expand All / @@ -61,6 +70,7 @@ impl ZoneService { @@
                     name: create_zone_request.name.clone(),
                     primary_ns: create_zone_request.primary_ns.clone(),
                     primary_ns_ip: create_zone_request.primary_ns_ip.clone(),
+                    primary_ns_ipv6: create_zone_request.primary_ns_ipv6.clone(),
                     admin_email: create_zone_request.admin_email.clone(),
                     ttl: create_zone_request.ttl,
                     serial: create_zone_request.serial,
@@ Expand Down Expand Up / @@ -105,6 +115,15 @@ impl ZoneService { @@
             let zone_repository = get_zone_repository();
             let zone_history_repository = get_zone_history_repository();
+            // Validate that at least one of primary_ns_ip or primary_ns_ipv6 is present
+            if update_zone_request.primary_ns_ip.is_none()
+                && update_zone_request.primary_ns_ipv6.is_none()
+            {
+                return Err(
+                    "At least one of primary_ns_ip or primary_ns_ipv6 must be provided".to_string(),
+                );
+            }
             // Check if zone exists
             match zone_repository.get_by_id(zone_id).await {
                 Ok(Some(_)) => {}
@@ Expand Down Expand Up / @@ -139,6 +158,7 @@ impl ZoneService { @@
                     name: update_zone_request.name.clone(),
                     primary_ns: update_zone_request.primary_ns.clone(),
                     primary_ns_ip: update_zone_request.primary_ns_ip.clone(),
+                    primary_ns_ipv6: update_zone_request.primary_ns_ipv6.clone(),
                     admin_email: update_zone_request.admin_email.clone(),
                     ttl: update_zone_request.ttl,
                     serial: update_zone_request.serial,
@@ Expand Down @@

src/cli/dns.rs

-Original file line number
+Diff line change
@@ -1,4 +1,7 @@
-    use crate::{log_debug, socket::client::DaemonSocketClient};
+    use crate::{
+        log_debug,
+        socket::{client::DaemonSocketClient, dto::DaemonCommandKind},
+    };
     use clap::Subcommand;
     #[derive(Subcommand, Debug)]
@@ Expand All @@
     }
     async fn write_dns_config(client: &DaemonSocketClient) -> Result<(), String> {
-        let res = client.send_command("dns_write_config", None).await?;
+        let res = client
+            .send_command(DaemonCommandKind::DnsWriteConfig, None)
+            .await?;
         log_debug!("DNS configuration write result: {:?}", res);
         Ok(())
     }
     async fn reload_dns_config(client: &DaemonSocketClient) -> Result<(), String> {
-        let res = client.send_command("dns_reload", None).await?;
+        let res = client
+            .send_command(DaemonCommandKind::DnsReload, None)
+            .await?;
         log_debug!("DNS configuration reload result: {:?}", res);
         Ok(())
     }
     async fn get_dns_status(client: &DaemonSocketClient) -> Result<(), String> {
-        let res = client.send_command("dns_status", None).await?;
+        let res = client
+            .send_command(DaemonCommandKind::DnsStatus, None)
+            .await?;
         log_debug!("DNS status result: {:?}", res);
@@ Expand Down @@

src/cli/status.rs

-Original file line number
+Diff line change
@@ -1,13 +1,18 @@
     use crate::{
         log_debug,
-        socket::{client::DaemonSocketClient, dto::DaemonStatusResponse},
+        socket::{
+            client::DaemonSocketClient,
+            dto::{DaemonCommandKind, DaemonStatusResponse},
+        },
     };
     pub async fn handle_command() -> Result<(), String> {
         let client = DaemonSocketClient::new();
         // Create socket request
-        let res = client.send_command("status", None).await?;
+        let res = client
+            .send_command(DaemonCommandKind::Status, None)
+            .await?;
         log_debug!("Status command result: {:?}", res);
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Develop #53

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!