Compare commits
6 Commits
4cdd157e3f
...
fix/vpn-ip
| Author | SHA1 | Date | |
|---|---|---|---|
| 7e2b133946 | |||
| 611e96b306 | |||
| f184ed957c | |||
| 2bf31c7ccc | |||
| f44f93e35a | |||
| 27571ddb3f |
@@ -61,6 +61,24 @@ urllib.request.urlretrieve(url, base + '/en_US-ryan-high.onnx')
|
|||||||
urllib.request.urlretrieve(url + '.json', base + '/en_US-ryan-high.onnx.json')
|
urllib.request.urlretrieve(url + '.json', base + '/en_US-ryan-high.onnx.json')
|
||||||
PYEOF
|
PYEOF
|
||||||
|
|
||||||
|
# ---------- Install Himalaya email CLI ----------
|
||||||
|
RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
|
||||||
|
import urllib.request, tarfile, os, shutil
|
||||||
|
url = 'https://github.com/pimalaya/himalaya/releases/download/v1.2.0/himalaya.x86_64-linux.tgz'
|
||||||
|
tgz = '/tmp/himalaya.tgz'
|
||||||
|
urllib.request.urlretrieve(url, tgz)
|
||||||
|
with tarfile.open(tgz) as t:
|
||||||
|
t.extractall('/tmp')
|
||||||
|
shutil.move('/tmp/himalaya', '/usr/local/bin/himalaya')
|
||||||
|
os.chmod('/usr/local/bin/himalaya', 0o755)
|
||||||
|
os.remove(tgz)
|
||||||
|
print('himalaya v1.2.0 installed')
|
||||||
|
PYEOF
|
||||||
|
|
||||||
|
# ---------- Install himalaya-ro wrapper ----------
|
||||||
|
COPY --chmod=0755 himalaya-ro.sh /usr/local/bin/himalaya-ro
|
||||||
|
|
||||||
|
|
||||||
# ---------- Runtime ----------
|
# ---------- Runtime ----------
|
||||||
USER hermes
|
USER hermes
|
||||||
ENV HERMES_HOME=/opt/data
|
ENV HERMES_HOME=/opt/data
|
||||||
|
|||||||
73
ai/hermes/himalaya-ro.sh
Normal file
73
ai/hermes/himalaya-ro.sh
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# ─────────────────────────────────────────────────────────────
|
||||||
|
# himalaya-ro — Read-only wrapper for himalaya
|
||||||
|
#
|
||||||
|
# Blocks destructive commands and logs audit trail.
|
||||||
|
# Pass-through for read-only commands (list, read, search).
|
||||||
|
#
|
||||||
|
# Usage: himalaya-ro [options] <command> [args...]
|
||||||
|
#
|
||||||
|
# Install: place in PATH before the real himalaya, or use
|
||||||
|
# `ln -sf himalaya-ro /usr/local/bin/himalaya`
|
||||||
|
# ─────────────────────────────────────────────────────────────
|
||||||
|
set -o pipefail
|
||||||
|
|
||||||
|
# ── Configuration ───────────────────────────────────────────
|
||||||
|
HIMALAYA_BIN="${HIMALAYA_BIN:-/usr/local/bin/himalaya}"
|
||||||
|
AUDIT_LOG="${HIMALAYA_AUDIT_LOG:-/var/log/himalaya-audit.log}"
|
||||||
|
|
||||||
|
# ── Destructive commands we block ──────────────────────────
|
||||||
|
BLOCKED_CMDS=(
|
||||||
|
"message move"
|
||||||
|
"message delete"
|
||||||
|
"message copy"
|
||||||
|
"flag add"
|
||||||
|
"flag remove"
|
||||||
|
"folder create"
|
||||||
|
"folder delete"
|
||||||
|
"folder rename"
|
||||||
|
"template send"
|
||||||
|
"account configure"
|
||||||
|
"account delete"
|
||||||
|
)
|
||||||
|
|
||||||
|
# ── Determine the subcommand being invoked ─────────────────
|
||||||
|
# Strip leading options (--account, --output, etc.) to find the verb
|
||||||
|
ARGS=()
|
||||||
|
SKIP_NEXT=false
|
||||||
|
for arg in "$@"; do
|
||||||
|
if $SKIP_NEXT; then
|
||||||
|
SKIP_NEXT=false
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
if [[ "$arg" == --* ]]; then
|
||||||
|
case "$arg" in
|
||||||
|
--account|--output|--page|--page-size|--folder|--color|--format)
|
||||||
|
SKIP_NEXT=true ;;
|
||||||
|
esac
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
ARGS+=("$arg")
|
||||||
|
done
|
||||||
|
|
||||||
|
# Build subcommand string and check against blocklist
|
||||||
|
CMD_STR=""
|
||||||
|
for ((i=0; i<${#ARGS[@]}; i++)); do
|
||||||
|
if [ -z "$CMD_STR" ]; then
|
||||||
|
CMD_STR="${ARGS[$i]}"
|
||||||
|
else
|
||||||
|
CMD_STR="$CMD_STR ${ARGS[$i]}"
|
||||||
|
fi
|
||||||
|
for blocked in "${BLOCKED_CMDS[@]}"; do
|
||||||
|
if [[ "$CMD_STR" == "$blocked" ]]; then
|
||||||
|
TS=$(date '+%Y-%m-%d %H:%M:%S')
|
||||||
|
echo "[AUDIT] $TS BLOCKED: himalaya $*" >> "$AUDIT_LOG"
|
||||||
|
echo "ERROR: Command 'himalaya $CMD_STR ...' is blocked by read-only policy." >&2
|
||||||
|
echo " Audit log: $AUDIT_LOG" >&2
|
||||||
|
exit 100
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
# ── Allow pass-through ─────────────────────────────────────
|
||||||
|
exec "$HIMALAYA_BIN" "$@"
|
||||||
@@ -1,16 +1,9 @@
|
|||||||
# Custom wg-easy with iptables-nft (nftables-backed iptables)
|
# Custom wg-easy with iptables-nft (nftables-backed iptables)
|
||||||
# Fixes crash-loop when host kernel lacks legacy iptable_nat module.
|
# Fixes crash-loop when host kernel lacks legacy iptable_nat module.
|
||||||
FROM weejewel/wg-easy:latest
|
FROM ghcr.io/wg-easy/wg-easy:latest
|
||||||
|
|
||||||
# Alpine's iptables-nft provides iptables that uses nftables kernel API
|
# The upstream image registers only iptables-legacy with update-alternatives.
|
||||||
# instead of the legacy iptable_nat module. This works on kernels
|
# iptables-nft binary exists but isn't registered as an alternative.
|
||||||
# where only nftables netfilter modules are available.
|
# Override the alternatives-managed symlinks directly.
|
||||||
RUN apk add --no-cache iptables-nft
|
RUN ln -sf /usr/sbin/iptables-nft /usr/sbin/iptables && \
|
||||||
|
ln -sf /usr/sbin/ip6tables-nft /usr/sbin/ip6tables
|
||||||
# Ensure iptables-nft takes priority over legacy iptables
|
|
||||||
RUN ln -sf /sbin/iptables-nft /sbin/iptables && \
|
|
||||||
ln -sf /sbin/iptables-nft-save /sbin/iptables-save && \
|
|
||||||
ln -sf /sbin/iptables-nft-restore /sbin/iptables-restore && \
|
|
||||||
ln -sf /sbin/ip6tables-nft /sbin/ip6tables && \
|
|
||||||
ln -sf /sbin/ip6tables-nft-save /sbin/ip6tables-save && \
|
|
||||||
ln -sf /sbin/ip6tables-nft-restore /sbin/ip6tables-restore
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ version: "3.8"
|
|||||||
services:
|
services:
|
||||||
wireguard:
|
wireguard:
|
||||||
build:
|
build:
|
||||||
context: ./vpn
|
context: .
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
image: wg-easy-iptables-nft:latest
|
image: wg-easy-iptables-nft:latest
|
||||||
container_name: wireguard
|
container_name: wireguard
|
||||||
|
|||||||
Reference in New Issue
Block a user