Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 31686a35d5 | |||
| 8769308dfd | |||
| f5848907f5 | |||
| f953fde2be |
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "dashboard/unifi",
|
"name": "dashboard/unifi",
|
||||||
"description": "UniFi network management, WiFi stats, and captive portal authentication for the Dashboard platform",
|
"description": "UniFi network management, WiFi stats, and captive portal authentication for the Dashboard platform",
|
||||||
"version": "1.6.3",
|
"version": "1.8.1",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
|||||||
@@ -84,12 +84,44 @@ class RotatePasswords extends Command
|
|||||||
// Synthetic ID is derived from the new passphrase, so update it too.
|
// Synthetic ID is derived from the new passphrase, so update it too.
|
||||||
$unifi->updateEmbeddedPpsk($ppsk->wlan_id, $ppsk->x_passphrase, $newPass);
|
$unifi->updateEmbeddedPpsk($ppsk->wlan_id, $ppsk->x_passphrase, $newPass);
|
||||||
$newUid = 'emb_' . substr(hash('sha256', $ppsk->wlan_id . ':' . $newPass), 0, 32);
|
$newUid = 'emb_' . substr(hash('sha256', $ppsk->wlan_id . ':' . $newPass), 0, 32);
|
||||||
|
$oldPass = $ppsk->x_passphrase;
|
||||||
$ppsk->update(['x_passphrase' => $newPass, 'unifi_id' => $newUid]);
|
$ppsk->update(['x_passphrase' => $newPass, 'unifi_id' => $newUid]);
|
||||||
|
|
||||||
|
// Sibling WLANs (same SSID name on a different band):
|
||||||
|
// their embedded PPSK with the same name also needs
|
||||||
|
// to rotate to the same new password so the SSID's
|
||||||
|
// 2.4/5GHz halves stay in sync.
|
||||||
|
foreach ($unifi->getWlanSiblings($ppsk->wlan_id) as $siblingWlanId) {
|
||||||
|
$sibling = UnifiPpsk::where('wlan_id', $siblingWlanId)
|
||||||
|
->where('name', $ppsk->name)
|
||||||
|
->where('state', 'active')
|
||||||
|
->first();
|
||||||
|
$siblingOldPass = $sibling?->x_passphrase ?? $oldPass;
|
||||||
|
try {
|
||||||
|
$unifi->updateEmbeddedPpsk($siblingWlanId, $siblingOldPass, $newPass);
|
||||||
|
if ($sibling) {
|
||||||
|
$sibling->update([
|
||||||
|
'x_passphrase' => $newPass,
|
||||||
|
'unifi_id' => 'emb_' . substr(hash('sha256', $siblingWlanId . ':' . $newPass), 0, 32),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
$this->error("Sibling rotate failed for wlan {$siblingWlanId}: {$e->getMessage()}");
|
||||||
|
$failedPpsks[] = ['name' => $ppsk->name . ' (sibling wlan ' . $siblingWlanId . ')', 'error' => $e->getMessage()];
|
||||||
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
$unifi->updatePpsk($ppsk->unifi_id, ['x_passphrase' => $newPass]);
|
$unifi->updatePpsk($ppsk->unifi_id, ['x_passphrase' => $newPass]);
|
||||||
$ppsk->update(['x_passphrase' => $newPass]);
|
$ppsk->update(['x_passphrase' => $newPass]);
|
||||||
}
|
}
|
||||||
$rotatedPpsks[] = $ppsk->name;
|
$rotatedPpsks[] = $ppsk->name;
|
||||||
|
|
||||||
|
// Save the active password every time a rotation
|
||||||
|
// succeeds — covers PPSK-only rotation setups where
|
||||||
|
// there's no whole-SSID rotation. Last successful
|
||||||
|
// password wins if multiple PPSKs rotate in one run.
|
||||||
|
Setting::set('unifi.password_rotation.last_password', $newPass);
|
||||||
|
Setting::set('unifi.password_rotation.last_rotated_at', now()->toIso8601String());
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
$this->error("Failed to rotate PPSK \"{$ppsk->name}\": {$e->getMessage()}");
|
$this->error("Failed to rotate PPSK \"{$ppsk->name}\": {$e->getMessage()}");
|
||||||
$failedPpsks[] = ['name' => $ppsk->name, 'error' => $e->getMessage()];
|
$failedPpsks[] = ['name' => $ppsk->name, 'error' => $e->getMessage()];
|
||||||
|
|||||||
@@ -40,6 +40,15 @@ class UnifiPagesAccessController extends Controller
|
|||||||
$grantedUserIds = $grants->flatten(1)->where('grantee_type', 'user')->pluck('grantee_id')->unique();
|
$grantedUserIds = $grants->flatten(1)->where('grantee_type', 'user')->pluck('grantee_id')->unique();
|
||||||
$users = User::whereIn('id', $grantedUserIds)->orderBy('name')->get(['id', 'name', 'email']);
|
$users = User::whereIn('id', $grantedUserIds)->orderBy('name')->get(['id', 'name', 'email']);
|
||||||
|
|
||||||
|
// Groups: always include super-admin groups (locked-on across all
|
||||||
|
// pages) plus any group with at least one grant. Other groups are
|
||||||
|
// added via searchGroups.
|
||||||
|
$grantedGroupIds = $grants->flatten(1)->where('grantee_type', 'group')->pluck('grantee_id')->unique();
|
||||||
|
$groups = Group::where(function ($q) use ($grantedGroupIds) {
|
||||||
|
$q->where('is_super', true)
|
||||||
|
->orWhereIn('id', $grantedGroupIds);
|
||||||
|
})->orderBy('name')->get(['id', 'name', 'is_super']);
|
||||||
|
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'pages' => $pages->map(fn ($p) => [
|
'pages' => $pages->map(fn ($p) => [
|
||||||
'id' => $p->id,
|
'id' => $p->id,
|
||||||
@@ -49,7 +58,7 @@ class UnifiPagesAccessController extends Controller
|
|||||||
'group_ids' => $grants->get($p->id, collect())->where('grantee_type', 'group')->pluck('grantee_id')->all(),
|
'group_ids' => $grants->get($p->id, collect())->where('grantee_type', 'group')->pluck('grantee_id')->all(),
|
||||||
])->values(),
|
])->values(),
|
||||||
'users' => $users,
|
'users' => $users,
|
||||||
'groups' => Group::orderBy('name')->get(['id', 'name', 'is_super']),
|
'groups' => $groups,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -76,6 +85,27 @@ class UnifiPagesAccessController extends Controller
|
|||||||
return response()->json(['users' => $users]);
|
return response()->json(['users' => $users]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Typeahead-style search for groups to add to the access matrix.
|
||||||
|
* Excludes super-admin groups (they're already in the matrix and
|
||||||
|
* locked-on across every page).
|
||||||
|
*/
|
||||||
|
public function searchGroups(Request $request)
|
||||||
|
{
|
||||||
|
$q = trim((string) $request->query('q', ''));
|
||||||
|
if (strlen($q) < 2) {
|
||||||
|
return response()->json(['groups' => []]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$groups = Group::where('name', 'like', '%' . $q . '%')
|
||||||
|
->where(function ($w) { $w->where('is_super', false)->orWhereNull('is_super'); })
|
||||||
|
->orderBy('name')
|
||||||
|
->limit(20)
|
||||||
|
->get(['id', 'name', 'is_super']);
|
||||||
|
|
||||||
|
return response()->json(['groups' => $groups]);
|
||||||
|
}
|
||||||
|
|
||||||
public function update(Request $request, NavItem $navItem)
|
public function update(Request $request, NavItem $navItem)
|
||||||
{
|
{
|
||||||
$app = DashboardApp::where('slug', 'unifi')->first();
|
$app = DashboardApp::where('slug', 'unifi')->first();
|
||||||
|
|||||||
@@ -293,9 +293,34 @@ class WifiController extends Controller
|
|||||||
if (! empty($unifiUpdate)) {
|
if (! empty($unifiUpdate)) {
|
||||||
if (str_starts_with($record->unifi_id, 'emb_') && isset($unifiUpdate['x_passphrase'])) {
|
if (str_starts_with($record->unifi_id, 'emb_') && isset($unifiUpdate['x_passphrase'])) {
|
||||||
// Embedded PPSK update path — modify the WLAN's embedded array.
|
// Embedded PPSK update path — modify the WLAN's embedded array.
|
||||||
$unifi->updateEmbeddedPpsk($record->wlan_id, $record->x_passphrase, $unifiUpdate['x_passphrase']);
|
$newPass = $unifiUpdate['x_passphrase'];
|
||||||
// Synthetic id is derived from the new passphrase.
|
$oldPass = $record->x_passphrase;
|
||||||
$data['unifi_id'] = 'emb_' . substr(hash('sha256', $record->wlan_id . ':' . $unifiUpdate['x_passphrase']), 0, 32);
|
$unifi->updateEmbeddedPpsk($record->wlan_id, $oldPass, $newPass);
|
||||||
|
$data['unifi_id'] = 'emb_' . substr(hash('sha256', $record->wlan_id . ':' . $newPass), 0, 32);
|
||||||
|
|
||||||
|
// Also update sibling WLANs (banded SSID — same name
|
||||||
|
// on 2.4 and 5GHz are separate wlanconf rows).
|
||||||
|
foreach ($unifi->getWlanSiblings($record->wlan_id) as $siblingWlanId) {
|
||||||
|
$sibling = UnifiPpsk::where('wlan_id', $siblingWlanId)
|
||||||
|
->where('name', $record->name)
|
||||||
|
->where('state', 'active')
|
||||||
|
->first();
|
||||||
|
$siblingOldPass = $sibling?->x_passphrase ?? $oldPass;
|
||||||
|
try {
|
||||||
|
$unifi->updateEmbeddedPpsk($siblingWlanId, $siblingOldPass, $newPass);
|
||||||
|
if ($sibling) {
|
||||||
|
$sibling->update([
|
||||||
|
'x_passphrase' => $newPass,
|
||||||
|
'unifi_id' => 'emb_' . substr(hash('sha256', $siblingWlanId . ':' . $newPass), 0, 32),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
\Illuminate\Support\Facades\Log::warning('unifi.ppsk_sibling_update_failed', [
|
||||||
|
'sibling_wlan' => $siblingWlanId,
|
||||||
|
'error' => $e->getMessage(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
$unifi->updatePpsk($record->unifi_id, $unifiUpdate);
|
$unifi->updatePpsk($record->unifi_id, $unifiUpdate);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,18 +29,20 @@ class UnifiPageGrant extends Model
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* True iff $user is allowed to access $navItem under this grant model.
|
* True iff $user is allowed to access $navItem under strict allowlist
|
||||||
* Super-admins always pass.
|
* semantics:
|
||||||
* If there are NO grants for the page, falls back to "open" (anyone
|
* * super-admins (the model-level flag) always pass
|
||||||
* who can reach the route can access — same as before grants existed).
|
* * otherwise the user must be a direct grantee, OR be in a group
|
||||||
|
* that is a grantee
|
||||||
|
*
|
||||||
|
* A page with NO grants saved is only visible to super-admins —
|
||||||
|
* the admin must explicitly authorize everyone else via the
|
||||||
|
* Access tab.
|
||||||
*/
|
*/
|
||||||
public static function userCanAccess(User $user, NavItem $navItem): bool
|
public static function userCanAccess(User $user, NavItem $navItem): bool
|
||||||
{
|
{
|
||||||
if ($user->is_super_admin) return true;
|
if ($user->is_super_admin) return true;
|
||||||
|
|
||||||
$hasGrants = static::where('nav_item_id', $navItem->id)->exists();
|
|
||||||
if (! $hasGrants) return true;
|
|
||||||
|
|
||||||
$groupIds = $user->groups()->pluck('groups.id');
|
$groupIds = $user->groups()->pluck('groups.id');
|
||||||
|
|
||||||
return static::where('nav_item_id', $navItem->id)
|
return static::where('nav_item_id', $navItem->id)
|
||||||
|
|||||||
@@ -312,6 +312,40 @@ class UnifiApiClient
|
|||||||
return $this->put("/rest/wlanconf/{$wlanId}", $data);
|
return $this->put("/rest/wlanconf/{$wlanId}", $data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find sibling WLAN configs — same SSID name, different _id. UniFi
|
||||||
|
* splits a "banded" SSID (band-steering disabled) into one wlanconf
|
||||||
|
* per band, each with its own _id and its own embedded PPSK array.
|
||||||
|
* A rotation that updates one band must also update the others, or
|
||||||
|
* the SSID's two halves drift out of sync.
|
||||||
|
*
|
||||||
|
* Returns an array of sibling wlan IDs (excludes $wlanId itself).
|
||||||
|
* Empty array if the target WLAN is unique or can't be found.
|
||||||
|
*/
|
||||||
|
public function getWlanSiblings(string $wlanId): array
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
$all = $this->get('/rest/wlanconf');
|
||||||
|
} catch (\Throwable) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$target = null;
|
||||||
|
foreach ($all as $w) {
|
||||||
|
if (($w['_id'] ?? null) === $wlanId) { $target = $w; break; }
|
||||||
|
}
|
||||||
|
if (! $target || empty($target['name'])) return [];
|
||||||
|
|
||||||
|
$siblings = [];
|
||||||
|
foreach ($all as $w) {
|
||||||
|
if (($w['_id'] ?? null) === $wlanId) continue;
|
||||||
|
if (($w['name'] ?? null) === $target['name']) {
|
||||||
|
$siblings[] = $w['_id'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return $siblings;
|
||||||
|
}
|
||||||
|
|
||||||
// ── PPSK ─────────────────────────────────────────────────────────────────
|
// ── PPSK ─────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -44,7 +44,9 @@ class UnifiServiceProvider extends ServiceProvider
|
|||||||
if (! $item) return;
|
if (! $item) return;
|
||||||
|
|
||||||
if (! UnifiPageGrant::userCanAccess($user, $item)) {
|
if (! UnifiPageGrant::userCanAccess($user, $item)) {
|
||||||
abort(403, 'You do not have access to this page.');
|
// 404 instead of 403 — don't leak that the page
|
||||||
|
// exists. The Access tab is the only way in.
|
||||||
|
abort(404);
|
||||||
}
|
}
|
||||||
} catch (\Throwable) {
|
} catch (\Throwable) {
|
||||||
// unifi_page_grants table may not exist yet on a fresh
|
// unifi_page_grants table may not exist yet on a fresh
|
||||||
|
|||||||
@@ -78,6 +78,7 @@ Route::middleware(['web', 'auth', 'app.access:unifi'])
|
|||||||
Route::middleware('super.admin')->group(function () {
|
Route::middleware('super.admin')->group(function () {
|
||||||
Route::get('/settings/pages-access', [UnifiPagesAccessController::class, 'index']) ->name('settings.pages-access.index');
|
Route::get('/settings/pages-access', [UnifiPagesAccessController::class, 'index']) ->name('settings.pages-access.index');
|
||||||
Route::get('/settings/pages-access/users/search', [UnifiPagesAccessController::class, 'searchUsers'])->name('settings.pages-access.users.search');
|
Route::get('/settings/pages-access/users/search', [UnifiPagesAccessController::class, 'searchUsers'])->name('settings.pages-access.users.search');
|
||||||
|
Route::get('/settings/pages-access/groups/search', [UnifiPagesAccessController::class, 'searchGroups'])->name('settings.pages-access.groups.search');
|
||||||
Route::put('/settings/pages-access/{navItem}', [UnifiPagesAccessController::class, 'update']) ->name('settings.pages-access.update');
|
Route::put('/settings/pages-access/{navItem}', [UnifiPagesAccessController::class, 'update']) ->name('settings.pages-access.update');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user