From 50e735e1a9eb46ed888a4c863864ac442d03de1f Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 11 Apr 2025 01:01:18 +0000 Subject: [PATCH 1/4] Update last_login of user (#26) Reviewed-on: https://git.kundeng.us/phoenix/icarus_auth/pulls/26 Co-authored-by: phoenix Co-committed-by: phoenix --- src/callers/login.rs | 5 ++++- src/repo/mod.rs | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/src/callers/login.rs b/src/callers/login.rs index 6f2908e..83347e1 100644 --- a/src/callers/login.rs +++ b/src/callers/login.rs @@ -51,13 +51,16 @@ pub mod endpoint { let (token_literal, duration) = token_stuff::create_token(&key).unwrap(); if token_stuff::verify_token(&key, &token_literal) { + let current_time = time::OffsetDateTime::now_utc(); + let _ = repo::user::update_last_login(&pool, &user, ¤t_time).await; + ( StatusCode::OK, Json(response::Response { message: String::from("Successful"), data: vec![icarus_models::login_result::LoginResult { id: user.id, - username: user.username, + username: user.username.clone(), token: token_literal, token_type: String::from(token_stuff::TOKENTYPE), expiration: duration, diff --git a/src/repo/mod.rs b/src/repo/mod.rs index b8a8c8c..a58bab5 100644 --- a/src/repo/mod.rs +++ b/src/repo/mod.rs @@ -42,6 +42,39 @@ pub mod user { } } + pub async fn update_last_login( + pool: &sqlx::PgPool, + user: &icarus_models::user::User, + time: &time::OffsetDateTime, + ) -> Result { + let result = sqlx::query( + r#" + UPDATE "user" SET last_login = $1 WHERE id = $2 RETURNING last_login + "#, + ) + .bind(time) + .bind(user.id) + .fetch_optional(pool) + .await + .map_err(|e| { + eprintln!("Error updating time: {}", e); + e + }); + + match result { + Ok(row) => match row { + Some(r) => { + let last_login: time::OffsetDateTime = r + .try_get("last_login") + .map_err(|_e| sqlx::Error::RowNotFound)?; + Ok(last_login) + } + None => Err(sqlx::Error::RowNotFound), + }, + Err(err) => Err(err), + } + } + pub async fn exists(pool: &sqlx::PgPool, username: &String) -> Result { let result = sqlx::query( r#" -- 2.43.0 From 17af1a00c06fe6e9da22c63817f7b06120386260 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 11 Apr 2025 01:07:20 +0000 Subject: [PATCH 2/4] Add docker (#28) Reviewed-on: https://git.kundeng.us/phoenix/icarus_auth/pulls/28 Co-authored-by: phoenix Co-committed-by: phoenix --- .dockerignore.yaml | 19 ++++++++++++ Dockerfile | 75 +++++++++++++++++++++++++++++++++++++++++++++ docker-compose.yaml | 54 ++++++++++++++++++++++++++++++++ docker_run.txt | 13 ++++++++ 4 files changed, 161 insertions(+) create mode 100644 .dockerignore.yaml create mode 100644 Dockerfile create mode 100644 docker-compose.yaml create mode 100644 docker_run.txt diff --git a/.dockerignore.yaml b/.dockerignore.yaml new file mode 100644 index 0000000..9b144ce --- /dev/null +++ b/.dockerignore.yaml @@ -0,0 +1,19 @@ +# Ignore build artifacts +target/ +pkg/ + +# Ignore git directory +.git/ + +# Ignore environment files (configure via docker-compose instead) +.env* + +# Ignore IDE/editor specific files +.idea/ +.vscode/ + +# Ignore OS specific files +*.DS_Store + +# Add any other files/directories you don't need in the image +# e.g., logs/, tmp/ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..48e6b75 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,75 @@ +# Stage 1: Build the application +# Use a specific Rust version for reproducibility. Choose one that matches your development environment. +# Using slim variant for smaller base image +FROM rust:1.86 as builder + +# Set the working directory inside the container +WORKDIR /usr/src/app + +# Install build dependencies if needed (e.g., for certain crates like sqlx with native TLS) +# RUN apt-get update && apt-get install -y pkg-config libssl-dev + +# Install build dependencies if needed (e.g., git for cloning) +RUN apt-get update && apt-get install -y --no-install-recommends \ + pkg-config libssl3 \ + ca-certificates \ + openssh-client git \ + && rm -rf /var/lib/apt/lists/* + +# << --- ADD HOST KEY HERE --- >> +# Replace 'yourgithost.com' with the actual hostname (e.g., github.com) +RUN mkdir -p -m 0700 ~/.ssh && \ + ssh-keyscan git.kundeng.us >> ~/.ssh/known_hosts + +# Copy Cargo manifests +COPY Cargo.toml Cargo.lock ./ + +# Build *only* dependencies to leverage Docker cache +# This dummy build caches dependencies as a separate layer +RUN --mount=type=ssh mkdir src && \ + echo "fn main() {println!(\"if you see this, the build broke\")}" > src/main.rs && \ + cargo build --release --quiet && \ + rm -rf src target/release/deps/icarus_auth* # Clean up dummy build artifacts (replace icarus_auth) + +# Copy the actual source code +COPY src ./src +# If you have other directories like `templates` or `static`, copy them too +# COPY templates ./templates +# COPY static ./static +COPY .env ./.env +COPY migrations ./migrations + +# << --- SSH MOUNT ADDED HERE --- >> +# Build *only* dependencies to leverage Docker cache +# This dummy build caches dependencies as a separate layer +# Mount the SSH agent socket for this command +RUN --mount=type=ssh \ + cargo build --release --quiet + +# Stage 2: Create the final, smaller runtime image +# Use a minimal base image like debian-slim or even distroless for security/size +FROM ubuntu:24.04 + +# Install runtime dependencies if needed (e.g., SSL certificates) +RUN apt-get update && apt-get install -y ca-certificates libssl-dev libssl3 && rm -rf /var/lib/apt/lists/* + +# Set the working directory +WORKDIR /usr/local/bin + +# Copy the compiled binary from the builder stage +# Replace 'icarus_auth' with the actual name of your binary (usually the crate name) +COPY --from=builder /usr/src/app/target/release/icarus_auth . + +# Copy other necessary files like .env (if used for runtime config) or static assets +# It's generally better to configure via environment variables in Docker though +COPY --from=builder /usr/src/app/.env . +COPY --from=builder /usr/src/app/migrations ./migrations +# COPY --from=builder /usr/src/app/templates ./templates +# COPY --from=builder /usr/src/app/static ./static + +# Expose the port your Axum app listens on (e.g., 3000 or 8000) +EXPOSE 3000 + +# Set the command to run your application +# Ensure this matches the binary name copied above +CMD ["./icarus_auth"] \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..38c1b41 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,54 @@ +version: '3.8' # Use a recent version + +services: + # Your Rust Application Service + app: + build: . # Tells docker-compose to build the Dockerfile in the current directory + container_name: icarus_auth # Optional: Give the container a specific name + ports: + # Map host port 8000 to container port 3000 (adjust as needed) + # Format: "HOST_PORT:CONTAINER_PORT" + - "8000:3000" + environment: + # Pass environment variables to your Rust application + # RUST_LOG: info # Example: Set log level + # IMPORTANT: Configure DATABASE_URL to connect to the 'db' service + # The hostname 'db' matches the service name defined below. + DATABASE_URL: postgresql://icarus_op:password@db:5432/icarus_auth + # Add any other environment variables your app needs + # APP_HOST: 0.0.0.0 + # APP_PORT: 3000 + depends_on: + db: + condition: service_healthy # Wait for the DB to be healthy before starting the app + restart: unless-stopped # Optional: Restart policy + + # PostgreSQL Database Service + db: + image: postgres:17.4-alpine # Use an official Postgres image (Alpine variant is smaller) + container_name: icarus_auth_db # Optional: Give the container a specific name + environment: + # These MUST match the user, password, and database name in the DATABASE_URL above + POSTGRES_USER: icarus_op + POSTGRES_PASSWORD: password + POSTGRES_DB: icarus_auth + volumes: + # Persist database data using a named volume + - postgres_data:/var/lib/postgresql/data + ports: [] + # Optional: Expose port 5432 ONLY if you need to connect directly from your host machine (e.g., for debugging) + # - "5432:5432" + # pass: + healthcheck: + # Checks if Postgres is ready to accept connections + test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"] + interval: 10s + timeout: 5s + retries: 5 + start_period: 10s + restart: always # Optional: Restart policy + +# Define the named volume for data persistence +volumes: + postgres_data: + driver: local # Use the default local driver \ No newline at end of file diff --git a/docker_run.txt b/docker_run.txt new file mode 100644 index 0000000..bc0f021 --- /dev/null +++ b/docker_run.txt @@ -0,0 +1,13 @@ + +# Docker stuff +#Build app +docker-compose build --ssh default app + +# Rebuild and bring up +docker-compose up -d --force-recreate app + +# Bring it down +docker-compose down -v + +# Pruning +docker system prune -a \ No newline at end of file -- 2.43.0 From a855db9ecc8c2703c9ac8f0bd96e51ad9db9409b Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 11 Apr 2025 23:57:37 +0000 Subject: [PATCH 3/4] Workflow changes (#30) Reviewed-on: https://git.kundeng.us/phoenix/icarus_auth/pulls/30 Co-authored-by: phoenix Co-committed-by: phoenix --- .gitea/workflows/tag_release.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitea/workflows/tag_release.yml b/.gitea/workflows/tag_release.yml index ca7ddef..9bcd646 100644 --- a/.gitea/workflows/tag_release.yml +++ b/.gitea/workflows/tag_release.yml @@ -4,8 +4,6 @@ on: push: branches: - devel - tags: - - 'v*' # Trigger on tags matching v* jobs: release: @@ -52,6 +50,4 @@ jobs: body: | Release of version ${{ steps.version.outputs.project_tag_release }} # draft: false - # prerelease: ${{ startsWith(github.ref, 'v') == false }} # prerelease if not a valid release tag - - + # prerelease: ${{ startsWith(github.ref, 'v') == false }} # prerelease if not a valid release tag \ No newline at end of file -- 2.43.0 From 6dec9942cc0e3fbc192a6dbc820ad48ad38f57fb Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 12 Apr 2025 00:16:34 +0000 Subject: [PATCH 4/4] Version bump (#29) Reviewed-on: https://git.kundeng.us/phoenix/icarus_auth/pulls/29 Co-authored-by: phoenix Co-committed-by: phoenix --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index f975e99..c4d8cf2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icarus_auth" -version = "0.3.2" +version = "0.3.4" edition = "2024" rust-version = "1.86" -- 2.43.0