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

Browse Source
This commit is contained in:
CyberMind-FR 2026-01-27 15:56:27 +01:00
parent 5a9627a2d6
commit 888ad50f79
2 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
package/secubox/luci-app-metablogizer/root/usr/libexec/rpcd/luci.metablogizer
View File

@ -41,6 +41,15 @@ get_next_port() {
echo $port echo $port
} }
# Fix permissions for web serving (755 for dirs, 644 for files)
fix_permissions() {
local dir="$1"
[ -d "$dir" ] || return 1
chmod 755 "$dir"
find "$dir" -type d -exec chmod 755 {} \;
find "$dir" -type f -exec chmod 644 {} \;
}
# Status method - get overall status and list all sites # Status method - get overall status and list all sites
method_status() { method_status() {
local enabled runtime detected_runtime nginx_running site_count local enabled runtime detected_runtime nginx_running site_count
@ -188,7 +197,10 @@ method_create_site() {
git clone "$gitea_url/$gitea_repo.git" "$SITES_ROOT/$name" 2>/dev/null || true git clone "$gitea_url/$gitea_repo.git" "$SITES_ROOT/$name" 2>/dev/null || true
fi fi
# 4. Create default index.html with OG tags if no content # 4. Fix permissions for web serving
fix_permissions "$SITES_ROOT/$name"
# 5. Create default index.html with OG tags if no content
if [ ! -f "$SITES_ROOT/$name/index.html" ]; then if [ ! -f "$SITES_ROOT/$name/index.html" ]; then
cat > "$SITES_ROOT/$name/index.html" <<EOF cat > "$SITES_ROOT/$name/index.html" <<EOF
<!DOCTYPE html> <!DOCTYPE html>
@ -223,7 +235,7 @@ method_create_site() {
EOF EOF
fi fi
# 5. Detect runtime and configure accordingly # 6. Detect runtime and configure accordingly
local current_runtime=$(detect_runtime) local current_runtime=$(detect_runtime)
local port="" local port=""
local server_address="192.168.255.1" local server_address="192.168.255.1"
@ -252,7 +264,7 @@ EOF
[ -n "$port" ] && uci set "$UCI_CONFIG.$section_id.port=$port" [ -n "$port" ] && uci set "$UCI_CONFIG.$section_id.port=$port"
uci set "$UCI_CONFIG.$section_id.runtime=$current_runtime" uci set "$UCI_CONFIG.$section_id.runtime=$current_runtime"
# 6. Create HAProxy backend # 7. Create HAProxy backend
local backend_name="metablog_$(echo "$name" | sed 's/[^a-zA-Z0-9]/_/g')" local backend_name="metablog_$(echo "$name" | sed 's/[^a-zA-Z0-9]/_/g')"
uci set "haproxy.$backend_name=backend" uci set "haproxy.$backend_name=backend"
@ -272,7 +284,7 @@ EOF
uci set "haproxy.$server_name.check=1" uci set "haproxy.$server_name.check=1"
uci set "haproxy.$server_name.enabled=1" uci set "haproxy.$server_name.enabled=1"
# 7. Create HAProxy vhost # 8. Create HAProxy vhost
local vhost_name=$(echo "$domain" | sed 's/[^a-zA-Z0-9]/_/g') local vhost_name=$(echo "$domain" | sed 's/[^a-zA-Z0-9]/_/g')
local acme_val="0" local acme_val="0"
[ "$ssl" = "1" ] && acme_val="1" [ "$ssl" = "1" ] && acme_val="1"
@ -430,6 +442,9 @@ method_sync_site() {
result=$(git pull 2>&1) result=$(git pull 2>&1)
local rc=$? local rc=$?
# Fix permissions after pull
fix_permissions "$site_path"
json_init json_init
if [ $rc -eq 0 ]; then if [ $rc -eq 0 ]; then
json_add_boolean "success" 1 json_add_boolean "success" 1
@ -449,6 +464,9 @@ method_sync_site() {
result=$(git clone "$gitea_url/$gitea_repo.git" "$site_path" 2>&1) result=$(git clone "$gitea_url/$gitea_repo.git" "$site_path" 2>&1)
local rc=$? local rc=$?
# Fix permissions after clone
fix_permissions "$site_path"
json_init json_init
if [ $rc -eq 0 ]; then if [ $rc -eq 0 ]; then
json_add_boolean "success" 1 json_add_boolean "success" 1
@ -654,6 +672,7 @@ method_upload_file() {
# Create directory structure if needed # Create directory structure if needed
local dir_path=$(dirname "$file_path") local dir_path=$(dirname "$file_path")
mkdir -p "$dir_path" mkdir -p "$dir_path"
chmod 755 "$dir_path"
# Decode base64 content and write file # Decode base64 content and write file
echo "$content" | base64 -d > "$file_path" 2>/dev/null echo "$content" | base64 -d > "$file_path" 2>/dev/null
@ -661,6 +680,8 @@ method_upload_file() {
if [ $rc -eq 0 ]; then if [ $rc -eq 0 ]; then
chmod 644 "$file_path" chmod 644 "$file_path"
# Ensure parent directories are also accessible
chmod 755 "$site_path"
json_init json_init
json_add_boolean "success" 1 json_add_boolean "success" 1
json_add_string "filename" "$filename" json_add_string "filename" "$filename"

17
package/secubox/secubox-app-metablogizer/files/usr/sbin/metablogizerctl
View File

@ -18,6 +18,14 @@ log_error() { echo "[ERROR] $*" >&2; }
uci_get() { uci -q get ${CONFIG}.$1; } uci_get() { uci -q get ${CONFIG}.$1; }
uci_set() { uci set ${CONFIG}.$1="$2" && uci commit ${CONFIG}; } uci_set() { uci set ${CONFIG}.$1="$2" && uci commit ${CONFIG}; }
fix_permissions() {
local dir="$1"
[ -d "$dir" ] || return 1
chmod 755 "$dir"
find "$dir" -type d -exec chmod 755 {} \;
find "$dir" -type f -exec chmod 644 {} \;
}
usage() { usage() {
cat <<'EOF' cat <<'EOF'
MetaBlogizer - Static Site Publisher MetaBlogizer - Static Site Publisher
@ -205,11 +213,11 @@ EOF
log_warn "Git clone failed, using placeholder" log_warn "Git clone failed, using placeholder"
mkdir -p "$SITES_ROOT/$name" mkdir -p "$SITES_ROOT/$name"
} }
# Set proper permissions for web serving
chmod -R 755 "$SITES_ROOT/$name"
find "$SITES_ROOT/$name" -type f -exec chmod 644 {} \;
fi fi
# Always fix permissions for web serving
fix_permissions "$SITES_ROOT/$name"
# Configure runtime # Configure runtime
case "$runtime" in case "$runtime" in
uhttpd) uhttpd)
@ -397,6 +405,9 @@ cmd_sync() {
rm -rf /tmp/metablog-sync-$$ rm -rf /tmp/metablog-sync-$$
fi fi
# Fix permissions for web serving
fix_permissions "$site_dir"
log_info "Sync complete" log_info "Sync complete"
} }