@@ -51,6 +70,9 @@
Auth-Token
|
+
+ Custom Subdomains
+ |
Created At
|
@@ -65,6 +87,14 @@
@{ user.auth_token }
|
+
+
+ No
+
+
+ Yes
+
+ |
@{ user.created_at }
|
@@ -113,6 +143,7 @@
data: {
userForm: {
name: '',
+ can_specify_subdomains: true,
errors: {},
},
paginated: {{ paginated|json_encode|raw }}
@@ -140,7 +171,7 @@
}).then((response) => {
return response.json();
}).then((data) => {
- this.users = this.users.filter(u => u.id !== user.id);
+ this.getUsers(1)
});
},
saveUser() {
@@ -155,6 +186,7 @@
}).then((data) => {
if (data.user) {
this.userForm.name = '';
+ this.userForm.can_specify_subdomains = 0;
this.userForm.errors = {};
this.users.unshift(data.user);
}
diff --git a/tests/Feature/Server/AdminTest.php b/tests/Feature/Server/AdminTest.php
index 1b8519a..e973891 100644
--- a/tests/Feature/Server/AdminTest.php
+++ b/tests/Feature/Server/AdminTest.php
@@ -8,6 +8,7 @@ use Clue\React\Buzz\Browser;
use Clue\React\Buzz\Message\ResponseException;
use GuzzleHttp\Psr7\Response;
use Illuminate\Support\Str;
+use Nyholm\Psr7\Request;
use Psr\Http\Message\ResponseInterface;
use Ratchet\Server\IoConnection;
use Tests\Feature\TestCase;
@@ -149,6 +150,8 @@ class AdminTest extends TestCase
$connectionManager = app(ConnectionManager::class);
$connection = \Mockery::mock(IoConnection::class);
+ $connection->httpRequest = new Request('GET', '/?authToken=some-token');
+
$connectionManager->storeConnection('some-host.text', 'fixed-subdomain', $connection);
/** @var Response $response */
diff --git a/tests/Feature/Server/ApiTest.php b/tests/Feature/Server/ApiTest.php
new file mode 100644
index 0000000..ad53dc8
--- /dev/null
+++ b/tests/Feature/Server/ApiTest.php
@@ -0,0 +1,201 @@
+browser = new Browser($this->loop);
+ $this->browser = $this->browser->withOptions([
+ 'followRedirects' => false,
+ ]);
+
+ $this->startServer();
+ }
+
+ public function tearDown(): void
+ {
+ $this->serverFactory->getSocket()->close();
+
+ parent::tearDown();
+ }
+
+ /** @test */
+ public function it_can_list_all_registered_users()
+ {
+ /** @var Response $response */
+ $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
+ 'Host' => 'expose.localhost',
+ 'Authorization' => base64_encode('username:secret'),
+ 'Content-Type' => 'application/json',
+ ], json_encode([
+ 'name' => 'Marcel',
+ ])));
+
+ /** @var Response $response */
+ $response = $this->await($this->browser->get('http://127.0.0.1:8080/api/users', [
+ 'Host' => 'expose.localhost',
+ 'Authorization' => base64_encode('username:secret'),
+ 'Content-Type' => 'application/json',
+ ]));
+
+ $body = json_decode($response->getBody()->getContents());
+ $users = $body->paginated->users;
+
+ $this->assertCount(1, $users);
+ $this->assertSame('Marcel', $users[0]->name);
+ $this->assertSame([], $users[0]->sites);
+ }
+
+ /** @test */
+ public function it_can_get_user_details()
+ {
+ /** @var Response $response */
+ $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
+ 'Host' => 'expose.localhost',
+ 'Authorization' => base64_encode('username:secret'),
+ 'Content-Type' => 'application/json',
+ ], json_encode([
+ 'name' => 'Marcel',
+ ])));
+
+ /** @var Response $response */
+ $response = $this->await($this->browser->get('http://127.0.0.1:8080/api/users/1', [
+ 'Host' => 'expose.localhost',
+ 'Authorization' => base64_encode('username:secret'),
+ 'Content-Type' => 'application/json',
+ ]));
+
+ $body = json_decode($response->getBody()->getContents());
+ $user = $body->user;
+
+ $this->assertSame('Marcel', $user->name);
+ $this->assertSame([], $user->sites);
+ }
+
+ /** @test */
+ public function it_can_list_all_currently_connected_sites_from_all_users()
+ {
+ /** @var Response $response */
+ $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
+ 'Host' => 'expose.localhost',
+ 'Authorization' => base64_encode('username:secret'),
+ 'Content-Type' => 'application/json',
+ ], json_encode([
+ 'name' => 'Marcel',
+ ])));
+
+ $createdUser = json_decode($response->getBody()->getContents())->user;
+
+ /** @var ConnectionManager $connectionManager */
+ $connectionManager = app(ConnectionManager::class);
+
+ $connection = \Mockery::mock(IoConnection::class);
+ $connection->httpRequest = new Request('GET', '/?authToken='.$createdUser->auth_token);
+ $connectionManager->storeConnection('some-host.test', 'fixed-subdomain', $connection);
+
+ $connection = \Mockery::mock(IoConnection::class);
+ $connection->httpRequest = new Request('GET', '/?authToken=some-other-token');
+ $connectionManager->storeConnection('some-different-host.test', 'different-subdomain', $connection);
+
+ /** @var Response $response */
+ $response = $this->await($this->browser->get('http://127.0.0.1:8080/api/users', [
+ 'Host' => 'expose.localhost',
+ 'Authorization' => base64_encode('username:secret'),
+ 'Content-Type' => 'application/json',
+ ]));
+
+ $body = json_decode($response->getBody()->getContents());
+ $users = $body->paginated->users;
+
+ $this->assertCount(1, $users[0]->sites);
+ $this->assertSame('some-host.test', $users[0]->sites[0]->host);
+ $this->assertSame('fixed-subdomain', $users[0]->sites[0]->subdomain);
+ }
+
+ /** @test */
+ public function it_can_list_all_currently_connected_sites()
+ {
+ /** @var ConnectionManager $connectionManager */
+ $connectionManager = app(ConnectionManager::class);
+
+ $connection = \Mockery::mock(IoConnection::class);
+ $connection->httpRequest = new Request('GET', '/?authToken=some-token');
+
+ $connectionManager->storeConnection('some-host.test', 'fixed-subdomain', $connection);
+
+ /** @var Response $response */
+ $response = $this->await($this->browser->get('http://127.0.0.1:8080/api/sites', [
+ 'Host' => 'expose.localhost',
+ 'Authorization' => base64_encode('username:secret'),
+ 'Content-Type' => 'application/json',
+ ]));
+
+ $body = json_decode($response->getBody()->getContents());
+ $sites = $body->sites;
+
+ $this->assertCount(1, $sites);
+ $this->assertSame('some-host.test', $sites[0]->host);
+ $this->assertSame('some-token', $sites[0]->auth_token);
+ $this->assertSame('fixed-subdomain', $sites[0]->subdomain);
+ }
+
+ /** @test */
+ public function it_can_list_all_currently_connected_sites_without_auth_tokens()
+ {
+ /** @var ConnectionManager $connectionManager */
+ $connectionManager = app(ConnectionManager::class);
+
+ $connection = \Mockery::mock(IoConnection::class);
+ $connection->httpRequest = new Request('GET', '/');
+
+ $connectionManager->storeConnection('some-host.test', 'fixed-subdomain', $connection);
+
+ /** @var Response $response */
+ $response = $this->await($this->browser->get('http://127.0.0.1:8080/api/sites', [
+ 'Host' => 'expose.localhost',
+ 'Authorization' => base64_encode('username:secret'),
+ 'Content-Type' => 'application/json',
+ ]));
+
+ $body = json_decode($response->getBody()->getContents());
+ $sites = $body->sites;
+
+ $this->assertCount(1, $sites);
+ $this->assertSame('some-host.test', $sites[0]->host);
+ $this->assertSame('', $sites[0]->auth_token);
+ $this->assertSame('fixed-subdomain', $sites[0]->subdomain);
+ }
+
+ protected function startServer()
+ {
+ $this->app['config']['expose.admin.subdomain'] = 'expose';
+ $this->app['config']['expose.admin.database'] = ':memory:';
+
+ $this->app['config']['expose.admin.users'] = [
+ 'username' => 'secret',
+ ];
+
+ $this->serverFactory = new Factory();
+
+ $this->serverFactory->setLoop($this->loop)
+ ->createServer();
+ }
+}
diff --git a/tests/Feature/Server/TunnelTest.php b/tests/Feature/Server/TunnelTest.php
index ed60749..cc612f6 100644
--- a/tests/Feature/Server/TunnelTest.php
+++ b/tests/Feature/Server/TunnelTest.php
@@ -27,6 +27,9 @@ class TunnelTest extends TestCase
parent::setUp();
$this->browser = new Browser($this->loop);
+ $this->browser = $this->browser->withOptions([
+ 'followRedirects' => false,
+ ]);
$this->startServer();
}
@@ -58,6 +61,8 @@ class TunnelTest extends TestCase
{
$this->createTestHttpServer();
+ $this->app['config']['expose.admin.validate_auth_tokens'] = false;
+
/**
* We create an expose client that connects to our server and shares
* the created test HTTP server.
@@ -98,22 +103,96 @@ class TunnelTest extends TestCase
{
$this->app['config']['expose.admin.validate_auth_tokens'] = true;
- $this->createTestHttpServer();
+ $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
+ 'Host' => 'expose.localhost',
+ 'Authorization' => base64_encode('username:secret'),
+ 'Content-Type' => 'application/json',
+ ], json_encode([
+ 'name' => 'Marcel',
+ 'can_specify_subdomains' => 1,
+ ])));
- $this->expectException(\UnexpectedValueException::class);
+ $user = json_decode($response->getBody()->getContents())->user;
+
+ $this->createTestHttpServer();
/**
* We create an expose client that connects to our server and shares
* the created test HTTP server.
*/
$client = $this->createClient();
- $this->await($client->connectToServer('127.0.0.1:8085', 'tunnel'));
+ $response = $this->await($client->connectToServer('127.0.0.1:8085', 'tunnel', $user->auth_token));
+
+ $this->assertSame('tunnel', $response->subdomain);
+ }
+
+ /** @test */
+ public function it_rejects_clients_to_specify_custom_subdomains()
+ {
+ $this->app['config']['expose.admin.validate_auth_tokens'] = true;
+
+ $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
+ 'Host' => 'expose.localhost',
+ 'Authorization' => base64_encode('username:secret'),
+ 'Content-Type' => 'application/json',
+ ], json_encode([
+ 'name' => 'Marcel',
+ 'can_specify_subdomains' => 0,
+ ])));
+
+ $this->expectException(\UnexpectedValueException::class);
+
+ $user = json_decode($response->getBody()->getContents())->user;
+
+ $this->createTestHttpServer();
+
+ /**
+ * We create an expose client that connects to our server and shares
+ * the created test HTTP server.
+ */
+ $client = $this->createClient();
+ $response = $this->await($client->connectToServer('127.0.0.1:8085', 'tunnel', $user->auth_token));
+
+ $this->assertSame('tunnel', $response->subdomain);
+ }
+
+ /** @test */
+ public function it_allows_clients_to_use_random_subdomains_if_custom_subdomains_are_forbidden()
+ {
+ $this->app['config']['expose.admin.validate_auth_tokens'] = true;
+
+ $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
+ 'Host' => 'expose.localhost',
+ 'Authorization' => base64_encode('username:secret'),
+ 'Content-Type' => 'application/json',
+ ], json_encode([
+ 'name' => 'Marcel',
+ 'can_specify_subdomains' => 0,
+ ])));
+
+ $user = json_decode($response->getBody()->getContents())->user;
+
+ $this->createTestHttpServer();
+
+ /**
+ * We create an expose client that connects to our server and shares
+ * the created test HTTP server.
+ */
+ $client = $this->createClient();
+ $response = $this->await($client->connectToServer('127.0.0.1:8085', '', $user->auth_token));
+
+ $this->assertInstanceOf(\stdClass::class, $response);
}
protected function startServer()
{
+ $this->app['config']['expose.admin.subdomain'] = 'expose';
$this->app['config']['expose.admin.database'] = ':memory:';
+ $this->app['config']['expose.admin.users'] = [
+ 'username' => 'secret',
+ ];
+
$this->serverFactory = new Factory();
$this->serverFactory->setLoop($this->loop)