Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
test-integration-block-dns-any,
test-integration-docker-block,
]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 10
permissions:
contents: write
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ test.integration: test.integration.block test.integration.audit test.integration

.PHONY: test.integration.block
test.integration.block:
sudo bash tests/block.sh
bash tests/block.sh

.PHONY: test.integration.audit
test.integration.audit:
sudo bash tests/audit.sh
bash tests/audit.sh

.PHONY: test.integration.docker-block
test.integration.docker-block:
sudo bash tests/docker-block.sh
bash tests/docker-block.sh

.PHONY: test.integration.block-dns-any
test.integration.block-dns-any:
sudo bash tests/block-dns-any.sh
bash tests/block-dns-any.sh

# All tests - For local development with no agent running
.PHONY: test
Expand Down
4 changes: 2 additions & 2 deletions tests/audit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ set -x
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
PROJECT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"

mkdir -p /var/log/gha-agent
sudo mkdir -p /var/log/gha-agent

# Start the agent in audit mode
"$PROJECT_DIR/agent" \
sudo "$PROJECT_DIR/agent" \
--egress-policy=audit \
--dns-policy=allowed-domains-only \
--allowed-domains="*.google.com" \
Expand Down
4 changes: 2 additions & 2 deletions tests/block-dns-any.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ set -x
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
PROJECT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"

mkdir -p /var/log/gha-agent
sudo mkdir -p /var/log/gha-agent

# Start the agent with dns-policy=any
"$PROJECT_DIR/agent" \
sudo "$PROJECT_DIR/agent" \
--egress-policy=block \
--dns-policy=any \
--allowed-domains="*.google.com" \
Expand Down
18 changes: 9 additions & 9 deletions tests/block.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ set -x
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
PROJECT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"

mkdir -p /var/log/gha-agent
sudo mkdir -p /var/log/gha-agent

# Start the agent
"$PROJECT_DIR/agent" \
sudo "$PROJECT_DIR/agent" \
--egress-policy=block \
--dns-policy=allowed-domains-only \
--allowed-domains="*.google.com" \
Expand Down Expand Up @@ -69,15 +69,15 @@ if ! timeout 5 dig @1.1.1.1 www.google.com; then
exit 1
fi

# # === Sudo Tests ===
# echo "=== Sudo Tests ==="
# === Sudo Tests ===
echo "=== Sudo Tests ==="

# if sudo -n true 2>/dev/null; then
# echo "Expected sudo to fail, but it succeeded"
# exit 1
# fi
if sudo -n true 2>/dev/null; then
echo "Expected sudo to fail, but it succeeded"
exit 1
fi

echo ""
echo "=========================================="
echo "Block mode tests passed successfully!"
echo "=========================================="
echo "=========================================="
4 changes: 2 additions & 2 deletions tests/docker-block.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ set -x
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
PROJECT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"

mkdir -p /var/log/gha-agent
sudo mkdir -p /var/log/gha-agent

# Start the agent
"$PROJECT_DIR/agent" \
sudo "$PROJECT_DIR/agent" \
--egress-policy=block \
--dns-policy=allowed-domains-only \
--allowed-domains="*.docker.io,docker-images-prod.6aa30f8b08e16409b46e0173d6de2f56.r2.cloudflarestorage.com,production.cloudflare.docker.com,www.google.com" \
Expand Down