Compare commits
11 Commits
release/v1
...
v1.1.8
| Author | SHA1 | Date | |
|---|---|---|---|
| 26f87ebc20 | |||
| a1a8eab41a | |||
| b2ea6b1f7a | |||
| 592ff6a7ee | |||
| 0c0f952f7f | |||
| 2a18276884 | |||
| 2bdbc8af5a | |||
| 87bd5d2162 | |||
| 836d409e3b | |||
| e17b740415 | |||
| 0d151d36b9 |
3
.github/workflows/ci.yml
vendored
3
.github/workflows/ci.yml
vendored
@ -135,6 +135,7 @@ jobs:
|
|||||||
needs: [rust-format, clippy, rust-test, security-audit, frontend-lint]
|
needs: [rust-format, clippy, rust-test, security-audit, frontend-lint]
|
||||||
if: startsWith(github.ref, 'refs/tags/v')
|
if: startsWith(github.ref, 'refs/tags/v')
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 60
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
@ -166,7 +167,7 @@ jobs:
|
|||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
|||||||
@ -12,7 +12,7 @@ members = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "1.1.2"
|
version = "1.1.8"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
authors = ["Echo <echo@moon-dragon.us>"]
|
authors = ["Echo <echo@moon-dragon.us>"]
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
|||||||
10
Dockerfile
10
Dockerfile
@ -28,6 +28,14 @@ WORKDIR /usr/src/app
|
|||||||
|
|
||||||
# Cache dependencies by building a dummy project first
|
# Cache dependencies by building a dummy project first
|
||||||
COPY Cargo.toml Cargo.lock ./
|
COPY Cargo.toml Cargo.lock ./
|
||||||
|
COPY crates/pm-web/Cargo.toml crates/pm-web/Cargo.toml
|
||||||
|
COPY crates/pm-worker/Cargo.toml crates/pm-worker/Cargo.toml
|
||||||
|
COPY crates/pm-core/Cargo.toml crates/pm-core/Cargo.toml
|
||||||
|
COPY crates/pm-agent-client/Cargo.toml crates/pm-agent-client/Cargo.toml
|
||||||
|
COPY crates/pm-auth/Cargo.toml crates/pm-auth/Cargo.toml
|
||||||
|
COPY crates/pm-ca/Cargo.toml crates/pm-ca/Cargo.toml
|
||||||
|
COPY crates/pm-reports/Cargo.toml crates/pm-reports/Cargo.toml
|
||||||
|
COPY crates/migrate-secrets/Cargo.toml crates/migrate-secrets/Cargo.toml
|
||||||
RUN mkdir -p crates/pm-web/src crates/pm-worker/src crates/pm-core/src \
|
RUN mkdir -p crates/pm-web/src crates/pm-worker/src crates/pm-core/src \
|
||||||
crates/pm-agent-client/src crates/pm-auth/src crates/pm-ca/src \
|
crates/pm-agent-client/src crates/pm-auth/src crates/pm-ca/src \
|
||||||
crates/pm-reports/src crates/migrate-secrets/src
|
crates/pm-reports/src crates/migrate-secrets/src
|
||||||
@ -43,6 +51,7 @@ RUN cargo build --release 2>/dev/null || true
|
|||||||
|
|
||||||
# Now build the real project
|
# Now build the real project
|
||||||
COPY crates/ crates/
|
COPY crates/ crates/
|
||||||
|
COPY migrations/ migrations/
|
||||||
RUN cargo build --release
|
RUN cargo build --release
|
||||||
|
|
||||||
# Verify binaries exist
|
# Verify binaries exist
|
||||||
@ -84,6 +93,7 @@ RUN apt-get update && apt-get install -y \
|
|||||||
ca-certificates \
|
ca-certificates \
|
||||||
libssl3t64 \
|
libssl3t64 \
|
||||||
libfontconfig1 \
|
libfontconfig1 \
|
||||||
|
openssl \
|
||||||
postgresql-client-16 \
|
postgresql-client-16 \
|
||||||
argon2 \
|
argon2 \
|
||||||
curl \
|
curl \
|
||||||
|
|||||||
30
debian/changelog
vendored
30
debian/changelog
vendored
@ -1,3 +1,33 @@
|
|||||||
|
linux-patch-manager (1.1.8-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* Release v1.1.8
|
||||||
|
|
||||||
|
-- git-echo <git-echo@moon-dragon.us> Tue, 09 Jun 2026 11:47:58 -0500
|
||||||
|
|
||||||
|
linux-patch-manager (1.1.7-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* Release v1.1.7
|
||||||
|
|
||||||
|
-- git-echo <git-echo@moon-dragon.us> Tue, 09 Jun 2026 09:11:11 -0500
|
||||||
|
|
||||||
|
linux-patch-manager (1.1.6-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* Release v1.1.6
|
||||||
|
|
||||||
|
-- git-echo <git-echo@moon-dragon.us> Tue, 09 Jun 2026 08:10:52 -0500
|
||||||
|
|
||||||
|
linux-patch-manager (1.1.5-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* Release v1.1.5
|
||||||
|
|
||||||
|
-- git-echo <git-echo@moon-dragon.us> Mon, 08 Jun 2026 20:15:50 -0500
|
||||||
|
|
||||||
|
linux-patch-manager (1.1.4-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* Release v1.1.4
|
||||||
|
|
||||||
|
-- git-echo <git-echo@moon-dragon.us> Mon, 08 Jun 2026 17:30:35 -0500
|
||||||
|
|
||||||
linux-patch-manager (1.1.2-1) unstable; urgency=low
|
linux-patch-manager (1.1.2-1) unstable; urgency=low
|
||||||
|
|
||||||
* Release v1.1.2
|
* Release v1.1.2
|
||||||
|
|||||||
2
debian/control
vendored
2
debian/control
vendored
@ -1,5 +1,5 @@
|
|||||||
Package: linux-patch-manager
|
Package: linux-patch-manager
|
||||||
Version: 1.1.2-1
|
Version: 1.1.8-1
|
||||||
Architecture: amd64
|
Architecture: amd64
|
||||||
Maintainer: Moon Dragon <echo@moon-dragon.us>
|
Maintainer: Moon Dragon <echo@moon-dragon.us>
|
||||||
Installed-Size: 45000
|
Installed-Size: 45000
|
||||||
|
|||||||
85
debian/postinst
vendored
Executable file → Normal file
85
debian/postinst
vendored
Executable file → Normal file
@ -107,7 +107,27 @@ setup_database() {
|
|||||||
# Store password for config generation
|
# Store password for config generation
|
||||||
echo "${db_password}" > /tmp/.pm-db-password-new
|
echo "${db_password}" > /tmp/.pm-db-password-new
|
||||||
else
|
else
|
||||||
info "PostgreSQL user '${DB_USER}' already exists, skipping creation."
|
info "PostgreSQL user '${DB_USER}' already exists."
|
||||||
|
# Recover the DB password: try from existing config, or generate new.
|
||||||
|
local config_file="${CONFIG_DIR}/config.toml"
|
||||||
|
local existing_pw=""
|
||||||
|
if [[ -f "${config_file}" ]]; then
|
||||||
|
# Extract password from URL: postgres://user:PASSWORD@host/db
|
||||||
|
# Use @localhost anchor so passwords containing @ are extracted correctly.
|
||||||
|
existing_pw=$(sed -n 's|^url = "postgres://[^:]*:\(.*\)@localhost.*"|\1|p' "${config_file}" | head -1)
|
||||||
|
fi
|
||||||
|
if [[ -n "${existing_pw}" && "${existing_pw}" != "CHANGEME" ]]; then
|
||||||
|
# Config has a real password — sync it to PostgreSQL so the app can connect.
|
||||||
|
psql_run -c "ALTER ROLE ${DB_USER} WITH PASSWORD '${existing_pw}';" 2>/dev/null || true
|
||||||
|
echo "${existing_pw}" > /tmp/.pm-db-password-new
|
||||||
|
info "Synced DB password from existing config to PostgreSQL."
|
||||||
|
else
|
||||||
|
# No config or CHANGEME — generate a fresh password and update PostgreSQL.
|
||||||
|
db_password=$(openssl rand -base64 32 | tr -dc 'A-Za-z0-9' | head -c 32)
|
||||||
|
psql_run -c "ALTER ROLE ${DB_USER} WITH PASSWORD '${db_password}';" 2>/dev/null || true
|
||||||
|
echo "${db_password}" > /tmp/.pm-db-password-new
|
||||||
|
info "Generated new DB password for existing user."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Create database if not exists
|
# Create database if not exists
|
||||||
@ -207,8 +227,11 @@ generate_admin_password() {
|
|||||||
admin_password=$(openssl rand -base64 32 | tr -dc 'A-Za-z0-9!@#%^&*' | head -c 24)
|
admin_password=$(openssl rand -base64 32 | tr -dc 'A-Za-z0-9!@#%^&*' | head -c 24)
|
||||||
|
|
||||||
# Hash with argon2 (PHC format, compatible with the application)
|
# Hash with argon2 (PHC format, compatible with the application)
|
||||||
|
# Generate a random 16-character salt (argon2 requires minimum 8 characters)
|
||||||
|
local admin_salt
|
||||||
|
admin_salt=$(openssl rand -base64 24 | tr -dc 'A-Za-z0-9' | head -c 16)
|
||||||
local password_hash
|
local password_hash
|
||||||
password_hash=$(echo -n "${admin_password}" | argon2 salt -id -t 3 -m 65536 -p 1 -l 32 -e)
|
password_hash=$(echo -n "${admin_password}" | argon2 "${admin_salt}" -id -t 3 -m 16 -p 1 -l 32 -e)
|
||||||
|
|
||||||
# Update admin user password in database
|
# Update admin user password in database
|
||||||
# Only update if the placeholder hash is still present
|
# Only update if the placeholder hash is still present
|
||||||
@ -246,42 +269,56 @@ generate_admin_password() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# 7. Write config.toml with DB URL (only if file doesn't exist)
|
# 7. Write config.toml with DB URL
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Handles three scenarios:
|
||||||
|
# 1. No config file → create from example with real DB password
|
||||||
|
# 2. Config exists with CHANGEME → replace CHANGEME with real DB password
|
||||||
|
# 3. Config exists with real password → leave it alone (upgrade)
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
write_config() {
|
write_config() {
|
||||||
local config_file="${CONFIG_DIR}/config.toml"
|
local config_file="${CONFIG_DIR}/config.toml"
|
||||||
|
|
||||||
if [[ -f "${config_file}" ]]; then
|
# Resolve the DB password to use: from setup_database() or generate fresh.
|
||||||
info "Config file ${config_file} already exists, not overwriting."
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
info "Writing configuration file..."
|
|
||||||
|
|
||||||
# Get the DB password — use the one we just generated if we created the user
|
|
||||||
local db_password=""
|
local db_password=""
|
||||||
if [[ -f /tmp/.pm-db-password-new ]]; then
|
if [[ -f /tmp/.pm-db-password-new ]]; then
|
||||||
db_password=$(cat /tmp/.pm-db-password-new)
|
db_password=$(cat /tmp/.pm-db-password-new)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# If we don't have a password (user already existed), generate a new one
|
if [[ -f "${config_file}" ]]; then
|
||||||
# and update the PostgreSQL user so we can connect
|
# Check if the config still has the CHANGEME placeholder
|
||||||
if [[ -z "${db_password}" ]]; then
|
if grep -q 'CHANGEME' "${config_file}"; then
|
||||||
db_password=$(openssl rand -base64 32 | tr -dc 'A-Za-z0-9' | head -c 32)
|
if [[ -z "${db_password}" ]]; then
|
||||||
psql_run -c "ALTER ROLE ${DB_USER} WITH PASSWORD '${db_password}';" 2>/dev/null || true
|
# No password from setup_database() — generate a fresh one
|
||||||
|
db_password=$(openssl rand -base64 32 | tr -dc 'A-Za-z0-9' | head -c 32)
|
||||||
|
psql_run -c "ALTER ROLE ${DB_USER} WITH PASSWORD '${db_password}';" 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
info "Replacing CHANGEME placeholder in existing config with real DB password."
|
||||||
|
sed -i "s|postgres://patch_manager:CHANGEME@localhost/patch_manager|postgres://${DB_USER}:${db_password}@localhost/${DB_NAME}|" "${config_file}"
|
||||||
|
else
|
||||||
|
info "Config file ${config_file} already exists with a real password, leaving it unchanged."
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
# No config file — create from example
|
||||||
|
if [[ -z "${db_password}" ]]; then
|
||||||
|
db_password=$(openssl rand -base64 32 | tr -dc 'A-Za-z0-9' | head -c 32)
|
||||||
|
psql_run -c "ALTER ROLE ${DB_USER} WITH PASSWORD '${db_password}';" 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
info "Writing configuration file..."
|
||||||
|
cp /usr/share/patch-manager/config.example.toml "${config_file}"
|
||||||
|
sed -i "s|postgres://patch_manager:CHANGEME@localhost/patch_manager|postgres://${DB_USER}:${db_password}@localhost/${DB_NAME}|" "${config_file}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Copy example config and set the DB URL
|
|
||||||
cp /usr/share/patch-manager/config.example.toml "${config_file}"
|
|
||||||
sed -i "s|postgres://patch_manager:CHANGEME@localhost/patch_manager|postgres://${DB_USER}:${db_password}@localhost/${DB_NAME}|" "${config_file}"
|
|
||||||
chown patch-manager:patch-manager "${config_file}"
|
chown patch-manager:patch-manager "${config_file}"
|
||||||
chmod 640 "${config_file}"
|
chmod 640 "${config_file}"
|
||||||
|
|
||||||
info "Configuration written to ${config_file}"
|
info "Configuration written to ${config_file}"
|
||||||
}
|
}
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# 8. Generate JWT keys (idempotent)
|
# 8. Generate JWT keys (idempotent)
|
||||||
|
# Only generates if missing; regenerates verify.pem from signing.pem if lost.
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
generate_jwt_keys() {
|
generate_jwt_keys() {
|
||||||
if [[ ! -f "${CONFIG_DIR}/jwt/signing.pem" ]]; then
|
if [[ ! -f "${CONFIG_DIR}/jwt/signing.pem" ]]; then
|
||||||
@ -292,8 +329,14 @@ generate_jwt_keys() {
|
|||||||
chmod 600 "${CONFIG_DIR}/jwt/signing.pem"
|
chmod 600 "${CONFIG_DIR}/jwt/signing.pem"
|
||||||
chmod 644 "${CONFIG_DIR}/jwt/verify.pem"
|
chmod 644 "${CONFIG_DIR}/jwt/verify.pem"
|
||||||
info "JWT keys generated."
|
info "JWT keys generated."
|
||||||
|
elif [[ ! -f "${CONFIG_DIR}/jwt/verify.pem" ]]; then
|
||||||
|
info "Regenerating missing JWT verification key from existing signing key..."
|
||||||
|
openssl pkey -in "${CONFIG_DIR}/jwt/signing.pem" -pubout -out "${CONFIG_DIR}/jwt/verify.pem" 2>/dev/null
|
||||||
|
chown patch-manager:patch-manager "${CONFIG_DIR}/jwt/verify.pem"
|
||||||
|
chmod 644 "${CONFIG_DIR}/jwt/verify.pem"
|
||||||
|
info "JWT verification key regenerated."
|
||||||
else
|
else
|
||||||
info "JWT signing key already exists, skipping."
|
info "JWT keys already exist, skipping."
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "patch-manager-ui",
|
"name": "patch-manager-ui",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "1.1.2",
|
"version": "1.1.8",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@ -22,7 +22,7 @@ warn() { echo -e "${YELLOW}[WARN]${NC} $*"; }
|
|||||||
error() { echo -e "${RED}[ERROR]${NC} $*" >&2; exit 1; }
|
error() { echo -e "${RED}[ERROR]${NC} $*" >&2; exit 1; }
|
||||||
|
|
||||||
PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
VERSION="1.1.2"
|
VERSION="1.1.8"
|
||||||
RELEASE="1"
|
RELEASE="1"
|
||||||
PKG_NAME="linux-patch-manager"
|
PKG_NAME="linux-patch-manager"
|
||||||
DEB_NAME="${PKG_NAME}_${VERSION}-${RELEASE}_amd64.deb"
|
DEB_NAME="${PKG_NAME}_${VERSION}-${RELEASE}_amd64.deb"
|
||||||
|
|||||||
Reference in New Issue
Block a user