diegods/homelabdspbx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Active calls dashboard widget (#7411)

Browse Source 
* Add context filter

* Add dashboard widget

* Add config for widget

* Add domain filter to service

* Fix websocket_service to get the class name

* Add new method get_service_name
This commit is contained in:
frytimo
2025-07-04 00:52:55 -03:00
committed by GitHub
parent e9fcc04d3f
commit a36e71ff2a
6 changed files with 609 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/websockets/resources/classes/subscriber.php
+19
View File
@@ -434,7 +434,13 @@ class subscriber {
return $this->authenticated;
}
/**
* Allows overriding the token authentication
* @param bool $authenticated
* @return self
*/
public function set_authenticated(bool $authenticated): self {
$this->authenticated = $authenticated;
return $this;
}
@@ -452,6 +458,14 @@ class subscriber {
return $this->service;
}
/**
* Alias of service_name without the parameters
* @return string
*/
public function get_service_name(): string {
return $this->service_name;
}
/**
* Get or set the service_name
* @param string|null $service_name
@@ -495,6 +509,11 @@ class subscriber {
return isset($this->services[$service_name]);
}
/**
* Subscribe to a service by ensuring this subscriber has the appropriate permissions
* @param string $service_name
* @return self
*/
public function subscribe(string $service_name): self {
$this->services[$service_name] = true;
return $this;
core/websockets/resources/classes/websocket_service.php
+12 -8
View File
@@ -193,24 +193,29 @@ class websocket_service extends service {
// Authenticate their token
if ($subscriber->authenticate_token($message->token)) {
$subscriber->send(websocket_message::request_authenticated($message->request_id, $message->service));
// Check for service authenticated
if ($subscriber->is_service()) {
$this->info("Service $subscriber->id authenticated");
$this->services[$subscriber->service_name()] = $subscriber;
} else {
// Subscriber authenticated
$this->info("Client $subscriber->id authenticated");
$this->info("Setting permissions on $subscriber->id");
$subscriptions = $subscriber->subscribed_to();
foreach ($subscriber->subscribed_to() as $subscribed_to) {
foreach ($subscriptions as $subscribed_to) {
if (isset($this->services[$subscribed_to])) {
$service = $this->services[$subscribed_to];
if (is_a($service, 'websocket_service_interface', true)) {
$class = $service->get_service_name();
$filter = $class::create_filter_chain_for($subscriber);
$subscriber_service = $this->services[$subscribed_to];
$class_name = $subscriber_service->service_class();
// Make sure we can call the 'create_filter_chain_for' method
if (is_a($class_name, 'websocket_service_interface', true)) {
// Call the service class method to validate the subscriber
$filter = $class_name::create_filter_chain_for($subscriber);
if ($filter !== null) {
// Log the filter has been set for the subscriber
$this->info("Set filter for " . $subscriber->id());
$subscriber->set_filter($filter);
}
}
$this->info("Set permissions for $subscriber->id for service " . $service->service_name());
$this->info("Set permissions for $subscriber->id for service " . $subscriber_service->service_name());
}
}
}
@@ -256,7 +261,6 @@ class websocket_service extends service {
try {
// Notify of the message we are broadcasting
$this->debug("Broadcasting message '" . $message->payload['event_name'] . "' for service '" . $message->service_name . "' to subscriber $subscriber->id");
$message->apply_filter($subscriber->get_filter());
$subscriber->send_message($message);
} catch (subscriber_token_expired_exception $ste) {
$this->info("Subscriber $ste->id token expired");