77dbd3d499
7 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
| 77dbd3d499 |
feat: Multi-source AppStore with version management and updates UI (Phases 1-3)
Implement comprehensive multi-source catalog system with automatic fallback,
advanced version tracking, and rich update management interfaces.
## Phase 1: Backend Infrastructure (COMPLETE)
### UCI Configuration
- **New**: `/etc/config/secubox-appstore`
- 4 source types: GitHub (remote), local web (remote), USB (local), embedded (fallback)
- Priority-based fallback (1=highest, 999=embedded last resort)
- Settings: auto_sync, force_source, check_updates_on_boot, notify_updates
- Update checking with configurable intervals
### Catalog Sync Script
- **New**: `/usr/sbin/secubox-catalog-sync` (364 lines)
- Automatic multi-source fallback by priority
- Download tools: uclient-fetch, wget, curl (auto-detect)
- HTTP caching: ETag support, 304 Not Modified handling
- JSON validation before use
- Metadata tracking with jq
- Logging to syslog
- Source types: remote (HTTPS/HTTP), local (filesystem), embedded (ROM)
### CLI Enhancement
- **Modified**: `/usr/sbin/secubox-appstore`
- New commands: `sync [source]`, `check-updates [--json]`, `changelog <app> [version]`
- `get_active_catalog()`: Reads from cache or embedded
- `sync_catalog()`: Wrapper for secubox-catalog-sync
- `check_updates()`: Version comparison with opkg
- `get_changelog()`: Extracts from catalog JSON
### Metadata Structure
- **New**: `/usr/share/secubox/catalog-metadata.json.example`
- Active source tracking
- Source status (online/offline/error)
- ETag cache for HTTP sources
- Installed apps version tracking
- Update statistics
### Makefile Updates
- **Modified**: `secubox-core/Makefile`
- PKG_RELEASE: 5 → 6
- Added conffiles: `/etc/config/secubox-appstore`
- Install secubox-catalog-sync binary
- Install catalog-metadata.json.example
- Added dependency: +jq
- postinst: Create cache directories (/var/cache/secubox/catalogs, /var/lib/secubox)
## Phase 2: RPCD Backend (COMPLETE)
### New RPC Methods
- **Modified**: `/usr/libexec/rpcd/luci.secubox`
- `get_catalog_sources()`: List configured sources from UCI, status from metadata
- `set_catalog_source(source)`: Configure force_source in UCI
- `sync_catalog([source])`: Trigger catalog sync (auto-fallback or specific)
- `check_updates()`: Compare installed vs catalog versions
- `get_app_versions(app_id)`: Detailed version info (pkg, app, installed, catalog)
- `get_changelog(app_id, from, to)`: Extract changelog from catalog
- `get_widget_data(app_id)`: Widget metrics (Phase 5 prep)
All methods integrate with:
- UCI config parsing (`config_load`, `config_foreach`)
- Metadata file reading (`/var/lib/secubox/catalog-metadata.json`)
- Catalog reading (`/var/cache/secubox/catalogs/*.json` or embedded)
- opkg version checking
## Phase 3: Frontend LuCI Views (COMPLETE)
### API Module Enhancement
- **Modified**: `secubox-admin/api.js`
- New RPC declarations: 7 new methods
- Exports: `getCatalogSources`, `setCatalogSource`, `syncCatalog`,
`checkUpdates`, `getAppVersions`, `getChangelog`, `getWidgetData`
### Catalog Sources Management
- **New**: `view/secubox-admin/catalog-sources.js` (370 lines)
- Live source status display (online/offline/error)
- Priority-based ordering
- Active source indicator
- Per-source actions: Sync, Test, Set Active, Enable/Disable
- Summary stats: Total sources, active source, updates available
- Auto-refresh every 30 seconds
- Timestamp formatting (relative: "5 minutes ago", "2 days ago")
### Updates Manager
- **New**: `view/secubox-admin/updates.js` (380 lines)
- Available updates list with version comparison
- Changelog preview in update cards
- Version arrows: "0.3.0-1 → 0.4.0-2"
- Per-app actions: Update Now, View Full Changelog, Skip Version
- Batch update: "Update All" button
- Check for Updates: Sync + check flow
- Auto-refresh every 60 seconds
- No updates state: Checkmark with message
### Apps Manager Enhancement
- **Modified**: `view/secubox-admin/apps.js`
- Load update info on page load
- Update available badges (warning style)
- Version display with tooltip (installed → available)
- Visual indicators: `.has-update`, `.version-outdated` classes
- New filter: "Updates Available" / "Installed" / "Not Installed"
- Changelog button on all apps (installed or not)
- Update button for apps with available updates
- `updateApp()`: Shows changelog before update
- `viewChangelog()`: Modal with version history
- `filterByStatus()`: Filter by update/install status
### Menu Integration
- **Modified**: `menu.d/luci-app-secubox-admin.json`
- New entries:
- "Updates" (order: 25) → `/admin/secubox/admin/updates`
- "Catalog Sources" (order: 27) → `/admin/secubox/admin/catalog-sources`
- Placed between Apps Manager and App Settings
## Data Flow Architecture
```
User Action (Web UI)
↓
LuCI View (catalog-sources.js, updates.js, apps.js)
↓
API Module (api.js RPC calls)
↓
RPCD Backend (luci.secubox)
↓
CLI Scripts (secubox-appstore, secubox-catalog-sync)
↓
Data Layer
├── UCI Config (/etc/config/secubox-appstore)
├── Cache (/var/cache/secubox/catalogs/*.json)
├── Metadata (/var/lib/secubox/catalog-metadata.json)
└── Embedded (/usr/share/secubox/catalog.json)
```
## Fallback Logic
1. User triggers sync (or auto-sync)
2. secubox-catalog-sync reads UCI config
3. Sorts sources by priority (1 = GitHub, 2 = Local Web, 3 = USB, 999 = Embedded)
4. Attempts each source in order:
- GitHub HTTPS → timeout/fail → Next
- Local Web → unreachable → Next
- USB → not mounted → Next
- Embedded → Always succeeds (ROM)
5. First successful source becomes active
6. Metadata updated with status, ETag, timestamp
7. Cache written to `/var/cache/secubox/catalogs/<source>.json`
## Version Tracking
- **PKG_VERSION**: OpenWrt package version (e.g., "0.4.0")
- **PKG_RELEASE**: Build release number (e.g., "2")
- **pkg_version**: Full package string "0.4.0-2" (in catalog)
- **app_version**: Underlying app version (e.g., "0.4.0")
- **installed_version**: From `opkg list-installed`
- **catalog_version**: From active catalog JSON
- **Comparison**: Uses `opkg compare-versions` for semantic versioning
## Storage Layout
```
/etc/config/secubox-appstore # UCI configuration
/var/cache/secubox/catalogs/ # Downloaded catalogs (755/644)
├── github.json
├── local_web.json
└── usb.json
/var/lib/secubox/ # Runtime metadata (700/600)
└── catalog-metadata.json
/usr/share/secubox/catalog.json # Embedded fallback (ROM)
```
## Key Features
✅ **Multi-source support**: GitHub + Web + USB + Embedded
✅ **Automatic fallback**: Priority-based with retry logic
✅ **HTTP optimization**: ETag caching, 304 Not Modified
✅ **Version management**: PKG + App versions, changelog tracking
✅ **Update notifications**: Badges, filters, dedicated updates page
✅ **Offline capable**: USB and embedded sources work without internet
✅ **Live status**: Auto-refresh, real-time source health
✅ **User control**: Manual sync, force specific source, enable/disable sources
## Files Modified (8)
- package/secubox/secubox-core/Makefile
- package/secubox/secubox-core/root/usr/libexec/rpcd/luci.secubox
- package/secubox/secubox-core/root/usr/sbin/secubox-appstore
- package/secubox/luci-app-secubox-admin/htdocs/luci-static/resources/secubox-admin/api.js
- package/secubox/luci-app-secubox-admin/htdocs/luci-static/resources/view/secubox-admin/apps.js
- package/secubox/luci-app-secubox-admin/root/usr/share/luci/menu.d/luci-app-secubox-admin.json
## Files Created (4)
- package/secubox/secubox-core/root/etc/config/secubox-appstore
- package/secubox/secubox-core/root/usr/sbin/secubox-catalog-sync
- package/secubox/secubox-core/root/usr/share/secubox/catalog-metadata.json.example
- package/secubox/luci-app-secubox-admin/htdocs/luci-static/resources/view/secubox-admin/catalog-sources.js
- package/secubox/luci-app-secubox-admin/htdocs/luci-static/resources/view/secubox-admin/updates.js
## Next Steps (Phase 4-5)
- Phase 4: Enrich catalog.json with changelog sections
- Phase 5: Widget system (renderer + templates for security/network/monitoring)
- Phase 6: Auto-sync service with cron
- Phase 7: Optimizations (signature validation, compression, CDN)
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|||
| 2787b8c222 |
feat(secubox-core): sync mailinabox plugin catalog with main catalog for consistency
Updated secubox-app-mailinabox plugin catalog to match the main catalog.json entry. Changes to plugin catalog (plugins/catalog/secubox-app-mailinabox.json): - category: "productivity" → "hosting" (more accurate classification) - min_storage_mb: 1024 → 2048 (realistic for email server with attachments) - status: "stable" → "beta" (matches maturity level) - tags: added "hosting" tag - capabilities: added "hosting" capability - notes: added "Port 25 must be accessible" (important for email server) Context: SecuBox uses two catalog sources: 1. Main catalog.json - Used by get_appstore_apps RPCD method for Apps Manager UI 2. Individual plugin catalogs - Used by secubox-appstore CLI for package detection This ensures both sources provide consistent metadata. Integration with luci-app-secubox-admin: ✅ secubox-app-mailinabox is now fully integrated into the admin interface ✅ Installation detection works automatically via opkg package checking ✅ Apps Manager will show: - "Install" button if package not installed - "Configure" and "Remove" buttons if package is installed ✅ Status detection flow: 1. API.getApps() → reads main catalog.json 2. API.getModules() → calls secubox-appstore list --json 3. secubox-appstore checks if secubox-app-mailinabox is installed via opkg 4. Returns status in modules list 5. Frontend displays appropriate buttons based on status Also incremented PKG_RELEASE: 4 → 5 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com> |
|||
| e7c9411d79 |
feat: Release v0.8.2 - Admin Control Center, Documentation Mirror & Docker Automation
This release adds major new features for SecuBox management and deployment: ## New Features ### 1. LuCI Admin Control Center (luci-app-secubox-admin) - Unified admin dashboard for managing all SecuBox appstore plugins - **Control Panel**: Real-time stats, system health, alerts, quick actions - **Apps Manager**: Browse catalog, install/remove apps with search & filtering - **App Settings**: Per-app configuration, start/stop controls - **System Health**: Live monitoring (CPU, RAM, disk) with auto-refresh - **System Logs**: Centralized log viewer with download capability - Fully integrated with existing RPCD backend (luci.secubox) - Mobile-responsive design with polished UI components ### 2. Documentation Mirror in SecuBox Bonus - Integrated complete development documentation into luci-app-secubox-bonus - 64+ documentation files now available offline at /luci-static/secubox/docs/ - Beautiful landing page (index-main.html) with 4 sections: - Development guides & references - Live module demos - Tutorials & blog posts - Marketing campaign pages - Accessible locally on router without internet connection ### 3. Automated Docker Plugin Installation - Enhanced secubox-appstore CLI with full Docker automation - One-click installation from web UI now fully automated: - Auto-detects Docker runtime from catalog - Discovers and executes control scripts (*ctl install) - Pulls Docker images automatically - Creates directories and configures UCI - Enables init services - No manual CLI steps required for Docker apps - Works for all Docker apps: AdGuard Home, Mail-in-a-Box, Nextcloud, etc. ### 4. Mail-in-a-Box Plugin - New Docker-based email server plugin (secubox-app-mailinabox) - Complete package with: - UCI configuration (8 port mappings, feature flags) - Control script (mailinaboxctl) with install/check/update/status/logs - Procd init script with auto-restart - Catalog manifest (category: hosting, maturity: beta) - Network mode: host (required for mail server) - Persistent storage: mail, SSL, data, DNS volumes ## Improvements ### Build System - Updated local-build.sh to include luci-app-* packages from package/secubox/ - Now automatically discovers and builds luci-app-secubox-admin and similar packages - Fixed Makefile include paths for feed structure ### Package Releases - Incremented PKG_RELEASE for all 31 SecuBox packages - Ensures clean upgrade path from previous versions ### Catalog Updates - Mail-in-a-Box entry moved from "productivity" to "hosting" category - Status changed to "beta" reflecting community Docker image maturity - Storage requirement increased: 1024MB → 2048MB - Added port 25 accessibility note ## Files Changed ### New Packages (2) - package/secubox/luci-app-secubox-admin/ (12 files) - package/secubox/secubox-app-mailinabox/ (4 files) ### Enhanced Packages (1) - package/secubox/luci-app-secubox-bonus/ (65 new docs files) ### Modified Core (3) - package/secubox/secubox-core/root/usr/sbin/secubox-appstore - package/secubox/secubox-core/root/usr/share/secubox/catalog.json - secubox-tools/local-build.sh ### All Makefiles (31 packages) - Incremented PKG_RELEASE for clean upgrade path ## Technical Details **Admin Control Center Architecture:** - Frontend: 5 views (dashboard, apps, settings, health, logs) - API: Wrapper around luci.secubox RPCD methods - Components: Reusable UI library (cards, badges, alerts, loaders) - Styling: Common + admin-specific CSS with responsive design - Auto-refresh: Polling for live updates (5-30s intervals) **Docker Automation Flow:** ``` Web UI → RPCD → secubox-appstore CLI → opkg install → *ctl install → docker pull → directories → UCI config → init enable → ✓ Ready ``` **Access Points:** - Admin Control: http://router/cgi-bin/luci/admin/secubox/admin/ - Documentation: http://router/luci-static/secubox/index-main.html - Demos: http://router/luci-static/secubox/demo-*.html 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com> |
|||
| 4325197e35 |
fix(packages): add PKG_ARCH:=all and resolve build conflicts
- Add PKG_ARCH:=all to all 29 SecuBox packages for architecture independence - Fix secubox-core: remove /var directory creation (conflicts with OpenWRT symlink) - Fix luci-app-secubox: remove PKG_FILE_MODES causing build errors - Refactor luci-app-network-tweaks: migrate files/ to root/ structure - Set correct permissions on fix-permissions.sh (755) Fixes: - secubox-core now builds successfully (no /var conflict) - luci-app-secubox installs without file conflicts - All packages properly marked as architecture-independent 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com> |
|||
| dd588e0520 |
fix(secubox): complete LuCI interface fixes - all views now functional
Fixed 5 major issues in SecuBox LuCI interface:
1. AppStore Empty (secubox-core v0.8.0-r3)
- Simplified get_appstore_apps RPCD method
- Removed complex error handling that was failing silently
- Added catalog.json (38 KB, 37 plugins) to Makefile installation
- Result: AppStore now displays 37 plugins in 8 categories
2. Dashboard/Components Empty (secubox-core v0.8.0-r3)
- Implemented 3 new RPCD methods:
* get_dashboard_data - Module counts and system uptime
* get_system_health - CPU, memory, disk metrics with health score
* get_alerts - System threshold alerts
- Result: Dashboard shows health score 93/100, system metrics
3. Modules View Empty (luci-app-secubox v0.7.1-r1)
- Fixed API method name mismatches in api.js:
* modules → getModules
* status → getStatus
* module_info → getModuleInfo
* health → getHealth
- Updated ACL with all new RPCD method names
- Added debug logging to modules.js
- Removed conflicting config files
- Result: 61 modules displayed with working filters
4. System Hub Components Empty (luci-app-system-hub v0.5.1-r3)
- Fixed RPCD backend call: modules → getModules
- Updated ACL to allow new SecuBox method names
- Result: 61 components displayed
5. Catalog/Profile/Template Files
- Added 39 individual plugin catalog files
- Added 5 profile JSON files (enterprise, home-office, etc.)
- Added 2 template files (firewall-zone, nginx-vhost)
- Updated Makefile to install all catalog files
Version bumps:
- secubox-core: 0.8.0-r1 → 0.8.0-r3
- luci-app-secubox: 0.7.0-r6 → 0.7.1-r1
- luci-app-system-hub: 0.5.1-r2 → 0.5.1-r3
Files modified: 13 modified, 46 added, 2 deleted
Lines of code: ~300+ added
RPCD methods: 3 added, 5 fixed
ACL files: 2 updated
Status: Production ready - all backend tests passing
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|||
| 86d71c8dde |
feat(secubox-core): add plugins/catalog directory structure
Adds the missing /usr/share/secubox/plugins/catalog/ directory that is documented but was not created by the package installer. Changes: - Create plugins/catalog directory structure - Update Makefile to install catalog directory - Add README explaining module catalog format - Add example module catalog JSON file as reference Directory structure: - /usr/share/secubox/modules/ - Runtime module metadata (empty by design) - /usr/share/secubox/plugins/catalog/ - Module catalog manifests - /usr/share/secubox/scripts/ - Shared helper scripts This completes the directory structure documented in the README. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com> |
|||
| d2f56e0aab |
feat(secubox-core): implement modular framework foundation v0.8.0
Add comprehensive SecuBox Core Framework - production-ready modular infrastructure for OpenWrt-based security appliances. ## Core Components ### Service Infrastructure - procd-managed secubox-core daemon - UCI configuration schema (/etc/config/secubox) - First-boot provisioning system - Automatic directory structure creation - Device ID generation ### CLI Interface (secubox) Complete command-line interface with 6 main commands: - app: Module/AppStore management - profile: Profile and template engine - device: Device operations and info - net: Network management tools - diag: Diagnostics and health checks - ai: AI copilot stub (experimental) ### Module Management (AppStore) - Catalog-based module discovery (22 modules) - Installation/removal workflows - Dependency resolution via opkg - Lifecycle hooks (pre/post install/remove) - Module health monitoring - JSON and table output formats ### Profile Engine - Declarative configuration (YAML/JSON) - Module orchestration - UCI override system - Dry-run validation - Configuration export ### Diagnostics System - CPU, memory, storage monitoring - Network connectivity tests - Service health checks - Configurable thresholds - Color-coded output - Diagnostic report generation ### Recovery System - Automatic snapshot creation - Configuration backup/restore - Rollback capability - Interactive recovery mode - Snapshot management (keep last 5) ### ubus RPC API (luci.secubox) Complete RPC interface with 20+ methods: - getStatus, getVersion, reload - getModules, installModule, removeModule - listProfiles, applyProfile, validateProfile - runDiagnostics, getHealth, getLogs - createSnapshot, restoreSnapshot, listSnapshots ### Supporting Tools - secubox-verify: Module signature verification - common.sh: Shared helper functions - Example profiles ## Technical Details **Package**: secubox-core v0.8.0 **Dependencies**: bash, libubox, libubus, libuci, rpcd, jsonfilter **Size**: ~85KB (source) **Memory**: ~16MB footprint **Files**: 16 files total ## Architecture Native OpenWrt integration: - procd for service management - ubus for RPC communication - UCI for configuration - opkg for package management - BusyBox-compatible scripts ## Module Discovery Automatically discovers 22 existing SecuBox modules: - adguardhome, auth-guardian, bandwidth-manager - cdn-cache, client-guardian, crowdsec-dashboard - domoticz, ksm-manager, lyrion, magicmirror - media-flow, mqtt-bridge, netdata-dashboard - netifyd-dashboard, network-modes, nextcloud - secubox-hub, system-hub, traffic-shaper - vhost-manager, wireguard-dashboard, zigbee2mqtt ## Deployment Status ✅ Tested on router (root@192.168.8.191) ✅ All core functionality verified ✅ Module discovery working (22/22) ✅ ubus API operational ✅ Health checks passing ✅ Recovery system functional ## Documentation - README.md: Comprehensive user documentation (11KB) - IMPLEMENTATION.md: Technical implementation details (16KB) - Example profile: home-basic.json ## Next Phase (v0.9.0) - LuCI WebUI integration - Enhanced profile templating - Module installation workflows - Dashboard views 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com> |