bitinflow/expose
1
0
Fork 0
mirror of https://github.com/bitinflow/expose.git synced 2026-03-17 23:45:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow users to specify custom hostnames

Browse Source
This commit is contained in:
Marcel Pociot
2020-11-01 22:40:17 +01:00
parent 5b7a80bb0c
commit cec52c4229
28 changed files with 913 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/Server/Connections/ConnectionConfiguration.php Normal file
View File

@@ -0,0 +1,35 @@
<?php
namespace App\Server\Connections;
class ConnectionConfiguration
{
protected $hostname;
protected $subdomain;
private function __construct($subdomain, $hostname)
{
$this->subdomain = $subdomain;
$this->hostname = $hostname;
}
public static function withSubdomain($subdomain)
{
return new static($subdomain, null);
}
public static function withHostname($hostname)
{
return new static(null, $hostname);
}
public function getSubdomain()
{
return $this->subdomain;
}
public function getHostname()
{
return $this->hostname;
}
}

18
app/Server/Connections/ConnectionManager.php
View File

@@ -43,16 +43,23 @@ class ConnectionManager implements ConnectionManagerContract
});
}
public function storeConnection(string $host, ?string $subdomain, ConnectionInterface $connection): ControlConnection
public function storeConnection(string $host, ?string $subdomain, ?string $hostname, ConnectionInterface $connection): ControlConnection
{
$clientId = (string) uniqid();
$connection->client_id = $clientId;
if (! is_null($hostname) && $hostname !== '') {
$subdomain = '';
} else {
$subdomain = $subdomain ?? $this->subdomainGenerator->generateSubdomain();
}
$storedConnection = new ControlConnection(
$connection,
$host,
$subdomain ?? $this->subdomainGenerator->generateSubdomain(),
$subdomain,
$hostname,
$clientId,
$this->getAuthTokenFromConnection($connection)
);
@@ -150,6 +157,13 @@ class ConnectionManager implements ConnectionManagerContract
});
}
public function findControlConnectionForHostname($hostname): ?ControlConnection
{
return collect($this->connections)->last(function ($connection) use ($hostname) {
return $connection->hostname == $hostname;
});
}
public function findControlConnectionForClientId(string $clientId): ?ControlConnection
{
return collect($this->connections)->last(function ($connection) use ($clientId) {

5
app/Server/Connections/ControlConnection.php
View File

@@ -14,15 +14,17 @@ class ControlConnection
public $host;
public $authToken;
public $subdomain;
public $hostname;
public $client_id;
public $proxies = [];
protected $shared_at;
public function __construct(ConnectionInterface $socket, string $host, string $subdomain, string $clientId, string $authToken = '')
public function __construct(ConnectionInterface $socket, string $host, string $subdomain, ?string $hostname, string $clientId, string $authToken = '')
{
$this->socket = $socket;
$this->host = $host;
$this->subdomain = $subdomain;
$this->hostname = $hostname;
$this->client_id = $clientId;
$this->authToken = $authToken;
$this->shared_at = now()->toDateTimeString();
@@ -64,6 +66,7 @@ class ControlConnection
'client_id' => $this->client_id,
'auth_token' => $this->authToken,
'subdomain' => $this->subdomain,
'hostname' => $this->hostname,
'shared_at' => $this->shared_at,
];
}