gistfile1.txt
· 4.7 KiB · Text
Sin formato
I did, just to confirm, is this the place where you'd put it?
# Create client config
peers::create_client_config "$full_name" "$effective_type" "$ip" "$allowed_ips" || return 1
# Store subtype in meta
if [[ -n "$subtype" ]]; then
peers::set_meta "$full_name" "subtype" "$subtype"
fi
# Add peer to server config
local public_key
public_key=$(keys::public "$full_name") || return 1
peers::add_to_server "$full_name" "$public_key" "$ip" || return 1
# Determine rule — explicit flag > type default
if [[ -z "$rule" ]]; then
if config::is_guest_type "$type"; then
rule="guest"
else
rule="user"
fi
fi
# Validate rule if specified
if [[ -n "$rule" ]] && ! rule::exists "$rule"; then
log::error "Rule not found: ${rule}"
return 1
fi
log::wg_add "Rule: ${rule:-none}"
# Apply presets
for preset in "${presets[@]}"; do
firewall::apply_preset "$preset" "${ip}" || return 1
done
# Apply rule
if [[ -n "$rule" ]]; then
rule::apply "$rule" "$ip" || return 1
fi
# Reload WireGuard
peers::reload || return 1
log::wg_success "Client added successfully: ${full_name} (${ip}) [${tunnel} tunnel]"
# Show QR for mobile by default, config for desktop/laptop
local display_type="${subtype:-$type}"
if cmd::add::is_mobile "$display_type"; then
keys::qr "$full_name"
else
log::section "Client Config"
cat "$(ctx::clients)/${full_name}.conf"
fi
}
wgctl rule list
────────────────────────────────────────────────
Firewall Rules
────────────────────────────────────────────────
NAME DESCRIPTION ALLOWS BLOCKS PEERS
/etc/wireguard/wgctl/commands/rule.command.sh: line 115: block_ips: command not found
wgctl list
root@wireguard:/# wgctl add --name test2 --type guest --subtype phone
────────────────────────────────────────────────
Adding client: guest-test2
────────────────────────────────────────────────
=> INFO: ➕ 🔒 Name: guest-test2
=> INFO: ➕ 🔒 Type: guest
=> INFO: ➕ 🔒 IP: 10.1.103.2
=> INFO: ➕ 🔒 Tunnel: split (10.1.0.0/16, 10.0.0.0/24)
=> INFO: 🔑 🔒 Generated key pair for: guest-test2
=> INFO: ➕ 🔒 Created client config: guest-test2 (10.1.103.2)
=> INFO: ➕ 🔒 Added peer to server config: guest-test2
=> INFO: ➕ 🔒 Rule: guest
=> INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.100/32
=> INFO: 🚫 🔒 Persisted block rule for: 10.1.103.2
=> INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.105/32
=> INFO: 🚫 🔒 Persisted block rule for: 10.1.103.2
=> INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.102/32
=> INFO: 🚫 🔒 Persisted block rule for: 10.1.103.2
=> INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.103/32
=> INFO: 🚫 🔒 Persisted block rule for: 10.1.103.2
=> INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.101/32
=> INFO: 🚫 🔒 Persisted block rule for: 10.1.103.2
=> INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.200/32
=> INFO: 🚫 🔒 Persisted block rule for: 10.1.103.2
=> INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.100:8006/tcp
=> INFO: 🚫 🔒 Persisted block rule for: guest
=> INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.100:22/tcp
=> INFO: 🚫 🔒 Persisted block rule for: guest
=> INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.105:8007/tcp
=> INFO: 🚫 🔒 Persisted block rule for: guest
=> INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.102:22/tcp
=> INFO: 🚫 🔒 Persisted block rule for: guest
=> INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.200:80/tcp
=> INFO: 🚫 🔒 Persisted block rule for: guest
=> INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.200:443/tcp
=> INFO: 🚫 🔒 Persisted block rule for: guest
=> INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.103:80/tcp
=> INFO: 🚫 🔒 Persisted block rule for: guest
=> INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.101:80/tcp
=> INFO: 🚫 🔒 Persisted block rule for: guest
=> INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.101:443/tcp
=> INFO: 🚫 🔒 Persisted block rule for: guest
=> INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.210:9000/tcp
=> INFO: 🚫 🔒 Persisted block rule for: guest
=> INFO: 📋 🔒 Applied rule 'guest' to: 10.1.103.2
=> SUCCESS: ✅ 🔒 WireGuard config reloaded
=> SUCCESS: ✅ 🔒 Client added successfully: guest-test2 () [split tunnel]
=> INFO: 📱 🔒 QR code for: guest-test2
| 1 | I did, just to confirm, is this the place where you'd put it? |
| 2 | |
| 3 | # Create client config |
| 4 | peers::create_client_config "$full_name" "$effective_type" "$ip" "$allowed_ips" || return 1 |
| 5 | |
| 6 | # Store subtype in meta |
| 7 | if [[ -n "$subtype" ]]; then |
| 8 | peers::set_meta "$full_name" "subtype" "$subtype" |
| 9 | fi |
| 10 | |
| 11 | # Add peer to server config |
| 12 | local public_key |
| 13 | public_key=$(keys::public "$full_name") || return 1 |
| 14 | peers::add_to_server "$full_name" "$public_key" "$ip" || return 1 |
| 15 | |
| 16 | # Determine rule — explicit flag > type default |
| 17 | if [[ -z "$rule" ]]; then |
| 18 | if config::is_guest_type "$type"; then |
| 19 | rule="guest" |
| 20 | else |
| 21 | rule="user" |
| 22 | fi |
| 23 | fi |
| 24 | |
| 25 | # Validate rule if specified |
| 26 | if [[ -n "$rule" ]] && ! rule::exists "$rule"; then |
| 27 | log::error "Rule not found: ${rule}" |
| 28 | return 1 |
| 29 | fi |
| 30 | |
| 31 | log::wg_add "Rule: ${rule:-none}" |
| 32 | |
| 33 | # Apply presets |
| 34 | for preset in "${presets[@]}"; do |
| 35 | firewall::apply_preset "$preset" "${ip}" || return 1 |
| 36 | done |
| 37 | |
| 38 | # Apply rule |
| 39 | if [[ -n "$rule" ]]; then |
| 40 | rule::apply "$rule" "$ip" || return 1 |
| 41 | fi |
| 42 | |
| 43 | # Reload WireGuard |
| 44 | peers::reload || return 1 |
| 45 | |
| 46 | log::wg_success "Client added successfully: ${full_name} (${ip}) [${tunnel} tunnel]" |
| 47 | |
| 48 | # Show QR for mobile by default, config for desktop/laptop |
| 49 | local display_type="${subtype:-$type}" |
| 50 | |
| 51 | if cmd::add::is_mobile "$display_type"; then |
| 52 | keys::qr "$full_name" |
| 53 | else |
| 54 | log::section "Client Config" |
| 55 | cat "$(ctx::clients)/${full_name}.conf" |
| 56 | fi |
| 57 | } |
| 58 | |
| 59 | wgctl rule list |
| 60 | |
| 61 | ──────────────────────────────────────────────── |
| 62 | |
| 63 | Firewall Rules |
| 64 | |
| 65 | ──────────────────────────────────────────────── |
| 66 | |
| 67 | NAME DESCRIPTION ALLOWS BLOCKS PEERS |
| 68 | |
| 69 | /etc/wireguard/wgctl/commands/rule.command.sh: line 115: block_ips: command not found |
| 70 | |
| 71 | |
| 72 | |
| 73 | wgctl list |
| 74 | |
| 75 | root@wireguard:/# wgctl add --name test2 --type guest --subtype phone |
| 76 | |
| 77 | ──────────────────────────────────────────────── |
| 78 | |
| 79 | Adding client: guest-test2 |
| 80 | |
| 81 | ──────────────────────────────────────────────── |
| 82 | |
| 83 | => INFO: ➕ 🔒 Name: guest-test2 |
| 84 | |
| 85 | => INFO: ➕ 🔒 Type: guest |
| 86 | |
| 87 | => INFO: ➕ 🔒 IP: 10.1.103.2 |
| 88 | |
| 89 | => INFO: ➕ 🔒 Tunnel: split (10.1.0.0/16, 10.0.0.0/24) |
| 90 | |
| 91 | => INFO: 🔑 🔒 Generated key pair for: guest-test2 |
| 92 | |
| 93 | => INFO: ➕ 🔒 Created client config: guest-test2 (10.1.103.2) |
| 94 | |
| 95 | => INFO: ➕ 🔒 Added peer to server config: guest-test2 |
| 96 | |
| 97 | => INFO: ➕ 🔒 Rule: guest |
| 98 | |
| 99 | => INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.100/32 |
| 100 | |
| 101 | => INFO: 🚫 🔒 Persisted block rule for: 10.1.103.2 |
| 102 | |
| 103 | => INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.105/32 |
| 104 | |
| 105 | => INFO: 🚫 🔒 Persisted block rule for: 10.1.103.2 |
| 106 | |
| 107 | => INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.102/32 |
| 108 | |
| 109 | => INFO: 🚫 🔒 Persisted block rule for: 10.1.103.2 |
| 110 | |
| 111 | => INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.103/32 |
| 112 | |
| 113 | => INFO: 🚫 🔒 Persisted block rule for: 10.1.103.2 |
| 114 | |
| 115 | => INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.101/32 |
| 116 | |
| 117 | => INFO: 🚫 🔒 Persisted block rule for: 10.1.103.2 |
| 118 | |
| 119 | => INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.200/32 |
| 120 | |
| 121 | => INFO: 🚫 🔒 Persisted block rule for: 10.1.103.2 |
| 122 | |
| 123 | => INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.100:8006/tcp |
| 124 | |
| 125 | => INFO: 🚫 🔒 Persisted block rule for: guest |
| 126 | |
| 127 | => INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.100:22/tcp |
| 128 | |
| 129 | => INFO: 🚫 🔒 Persisted block rule for: guest |
| 130 | |
| 131 | => INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.105:8007/tcp |
| 132 | |
| 133 | => INFO: 🚫 🔒 Persisted block rule for: guest |
| 134 | |
| 135 | => INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.102:22/tcp |
| 136 | |
| 137 | => INFO: 🚫 🔒 Persisted block rule for: guest |
| 138 | |
| 139 | => INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.200:80/tcp |
| 140 | |
| 141 | => INFO: 🚫 🔒 Persisted block rule for: guest |
| 142 | |
| 143 | => INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.200:443/tcp |
| 144 | |
| 145 | => INFO: 🚫 🔒 Persisted block rule for: guest |
| 146 | |
| 147 | => INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.103:80/tcp |
| 148 | |
| 149 | => INFO: 🚫 🔒 Persisted block rule for: guest |
| 150 | |
| 151 | => INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.101:80/tcp |
| 152 | |
| 153 | => INFO: 🚫 🔒 Persisted block rule for: guest |
| 154 | |
| 155 | => INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.101:443/tcp |
| 156 | |
| 157 | => INFO: 🚫 🔒 Persisted block rule for: guest |
| 158 | |
| 159 | => INFO: 🚫 🔒 Blocked 10.1.103.2 → 10.0.0.210:9000/tcp |
| 160 | |
| 161 | => INFO: 🚫 🔒 Persisted block rule for: guest |
| 162 | |
| 163 | => INFO: 📋 🔒 Applied rule 'guest' to: 10.1.103.2 |
| 164 | |
| 165 | => SUCCESS: ✅ 🔒 WireGuard config reloaded |
| 166 | |
| 167 | => SUCCESS: ✅ 🔒 Client added successfully: guest-test2 () [split tunnel] |
| 168 | |
| 169 | => INFO: 📱 🔒 QR code for: guest-test2 |