gandalf/secubox-openwrt
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(validate): fix module checker exits

Browse Source
This commit is contained in:
CyberMind-FR 2026-01-06 10:19:54 +01:00
parent 0402282d8b
commit b3d1e5a740
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
secubox-tools/validate-modules.sh
View File

@ -29,13 +29,13 @@ echo ""
# Function to print error # Function to print error
error() { error() {
echo -e "${RED}❌ ERROR: $1${NC}" echo -e "${RED}❌ ERROR: $1${NC}"
((ERRORS++)) ERRORS=$((ERRORS + 1))
} }
# Function to print warning # Function to print warning
warn() { warn() {
echo -e "${YELLOW}⚠️ WARNING: $1${NC}" echo -e "${YELLOW}⚠️ WARNING: $1${NC}"
((WARNINGS++)) WARNINGS=$((WARNINGS + 1))
} }
# Function to print success # Function to print success
@ -63,9 +63,11 @@ while IFS= read -r module_dir; do
rpcd_name=$(basename "$rpcd_script") rpcd_name=$(basename "$rpcd_script")
# Extract ubus object names from JavaScript files # Extract ubus object names from JavaScript files
set +e
js_objects=$(find "$module_dir/htdocs" -name "*.js" -type f 2>/dev/null | \ js_objects=$(find "$module_dir/htdocs" -name "*.js" -type f 2>/dev/null | \
xargs grep -h "object:" 2>/dev/null | \ xargs grep -h "object:" 2>/dev/null | \
grep -o "'[^']*'" | sort -u | tr -d "'") grep -o "'[^']*'" | sort -u | tr -d "'")
set -e
if [ -n "$js_objects" ]; then if [ -n "$js_objects" ]; then
# Check if RPCD script name matches any ubus object # Check if RPCD script name matches any ubus object
@ -234,12 +236,17 @@ while IFS= read -r module_dir; do
module_name=$(basename "$module_dir") module_name=$(basename "$module_dir")
# Extract ubus object names from JavaScript # Extract ubus object names from JavaScript
set +e
js_objects=$(find "$module_dir/htdocs" -name "*.js" -type f 2>/dev/null | \ js_objects=$(find "$module_dir/htdocs" -name "*.js" -type f 2>/dev/null | \
xargs grep -h "object:" 2>/dev/null | \ xargs grep -h "object:" 2>/dev/null | \
grep -o "'[^']*'" | sort -u | tr -d "'") grep -o "'[^']*'" | sort -u | tr -d "'")
set -e
if [ -n "$js_objects" ]; then if [ -n "$js_objects" ]; then
for obj in $js_objects; do for obj in $js_objects; do
if [[ "$obj" == "service" || "$obj" == "file" ]]; then
continue
fi
# Check if object starts with 'luci.' # Check if object starts with 'luci.'
if [[ $obj == luci.* ]]; then if [[ $obj == luci.* ]]; then
success "$module_name: ubus object '$obj' follows naming convention (luci.* prefix)" success "$module_name: ubus object '$obj' follows naming convention (luci.* prefix)"