From d72f6fa784d72e32b817dac03f6a58766a5016b9 Mon Sep 17 00:00:00 2001 From: Corne Oppelaar Date: Fri, 2 Sep 2016 21:33:58 +0200 Subject: [PATCH] add config builder + fix server overview --- config/routes.yml | 14 ++-- public/css/main.css | 10 ++- public/css/main.css.map | 2 +- public/css/partials/_base.scss | 3 +- public/js/pages/servers/edit.js | 2 +- src/Handler/Panel.php | 4 ++ src/Handler/Panel/ConfigBuilder/Action.php | 83 ++++++++++++++++++++++ src/Handler/Panel/ConfigBuilder/Show.php | 23 ++++++ src/Handler/Panel/Servers/Show.php | 34 +++++++++ views/panel/config_builder.html.twig | 26 +++++++ views/panel/servers.html.twig | 10 ++- views/panel/servers/edit.html.twig | 4 +- views/panel/servers/show.html.twig | 49 +++++++++++++ 13 files changed, 250 insertions(+), 14 deletions(-) create mode 100644 src/Handler/Panel/ConfigBuilder/Action.php create mode 100644 src/Handler/Panel/ConfigBuilder/Show.php create mode 100644 src/Handler/Panel/Servers/Show.php create mode 100644 views/panel/config_builder.html.twig diff --git a/config/routes.yml b/config/routes.yml index bdf410f..03bf25a 100644 --- a/config/routes.yml +++ b/config/routes.yml @@ -37,14 +37,20 @@ routes: /sign: post: Panel\Servers\Sign /{fingerprint}: - get: Panel\Servers\Edit\Show - post: Panel\Servers\Edit\Action - /{fingerprint}/config: Panel\Servers\Config - /{fingerprint}/config/{cert}: Panel\Servers\Config + get: Panel\Servers\Show + /edit: + get: Panel\Servers\Edit\Show + post: Panel\Servers\Edit\Action + /config: + get: Panel\Servers\Config + /{cert}: Panel\Servers\Config /invites: get: Panel\Invites /create: post: Panel\Invites\Create + /config-builder: + get: Panel\ConfigBuilder\Show + post: Panel\ConfigBuilder\Action /server: /register: post: Server\Register \ No newline at end of file diff --git a/public/css/main.css b/public/css/main.css index 56613e5..472d2a0 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -250,31 +250,37 @@ body { .certificate-list li .actions .certificate-download-key:hover, .certificate-list li .actions .no:hover, .certificate-list li .actions .copy:hover, - .certificate-list li .actions .edit:hover, .certificate-list li .revoke-q .certificate-download:hover, + .certificate-list li .actions .edit:hover, + .certificate-list li .actions .details:hover, .certificate-list li .revoke-q .certificate-download:hover, .certificate-list li .revoke-q .certificate-download-key:hover, .certificate-list li .revoke-q .no:hover, .certificate-list li .revoke-q .copy:hover, .certificate-list li .revoke-q .edit:hover, + .certificate-list li .revoke-q .details:hover, .servers li .actions .certificate-download:hover, .servers li .actions .certificate-download-key:hover, .servers li .actions .no:hover, .servers li .actions .copy:hover, .servers li .actions .edit:hover, + .servers li .actions .details:hover, .servers li .revoke-q .certificate-download:hover, .servers li .revoke-q .certificate-download-key:hover, .servers li .revoke-q .no:hover, .servers li .revoke-q .copy:hover, .servers li .revoke-q .edit:hover, + .servers li .revoke-q .details:hover, .invites li .actions .certificate-download:hover, .invites li .actions .certificate-download-key:hover, .invites li .actions .no:hover, .invites li .actions .copy:hover, .invites li .actions .edit:hover, + .invites li .actions .details:hover, .invites li .revoke-q .certificate-download:hover, .invites li .revoke-q .certificate-download-key:hover, .invites li .revoke-q .no:hover, .invites li .revoke-q .copy:hover, - .invites li .revoke-q .edit:hover { + .invites li .revoke-q .edit:hover, + .invites li .revoke-q .details:hover { background: #aca4bc; } .certificate-list li .actions .no, .certificate-list li .revoke-q .no, .servers li .actions .no, diff --git a/public/css/main.css.map b/public/css/main.css.map index b3a49fb..88b77de 100644 --- a/public/css/main.css.map +++ b/public/css/main.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "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", +"mappings": "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", "sources": ["main.scss","modules/_modules.scss","partials/_base.scss","partials/_navigation.sass","partials/_messages.scss","partials/_menus.scss","partials/_forms.sass","partials/_fonts.scss","partials/_typography.scss","partials/_tooltips.scss","pages/certificates/new.scss"], "names": [], "file": "main.css" diff --git a/public/css/partials/_base.scss b/public/css/partials/_base.scss index 538f60c..d406e01 100644 --- a/public/css/partials/_base.scss +++ b/public/css/partials/_base.scss @@ -255,7 +255,8 @@ body { .certificate-download-key, .no, .copy, - .edit { + .edit, + .details { &:hover { background: #aca4bc; } diff --git a/public/js/pages/servers/edit.js b/public/js/pages/servers/edit.js index fb7400d..be4de13 100644 --- a/public/js/pages/servers/edit.js +++ b/public/js/pages/servers/edit.js @@ -20,7 +20,7 @@ $(function () { var data = $('.server-form input,.server-form select').serializeArray(); - $.post('/panel/server/' + fingerprint, data, function (data) { + $.post('/panel/server/' + fingerprint + '/edit', data, function (data) { if (!data.success) { error(data.error); return; diff --git a/src/Handler/Panel.php b/src/Handler/Panel.php index 0caa444..42b9558 100644 --- a/src/Handler/Panel.php +++ b/src/Handler/Panel.php @@ -43,6 +43,10 @@ class Panel extends Session 'name' => 'Invites', 'path' => '/panel/invites' ], + [ + 'name' => 'Config builder', + 'path' => '/panel/config-builder' + ], [ 'name' => 'Profile > ' . $this->getUser()->getUsername(), 'path' => '/panel/profile' diff --git a/src/Handler/Panel/ConfigBuilder/Action.php b/src/Handler/Panel/ConfigBuilder/Action.php new file mode 100644 index 0000000..8eaa816 --- /dev/null +++ b/src/Handler/Panel/ConfigBuilder/Action.php @@ -0,0 +1,83 @@ +open($zipFile, \ZipArchive::CREATE); + $server = ServerQuery::create()->findOneByFingerprint($this->post('fingerprint')); + $name = $server->getFqdn(); + + $this->fillZipWithCaAndConfig($zip, $server); + + $cert = $this->post('cert'); + + if ($cert !== null) { + $certModel = CertificateQuery::create()->findOneByUserAndName($this->getUser(), $cert); + $this->addClientCertificateData($zip, $certModel); + + $name .= '-' . $certModel->getName() . '.' . $certModel->getSerial(); + } + + $zip->close(); + + $zipContents = file_get_contents($zipFile); + unlink($zipFile); + + return $this->getResponse() + ->withHeader('Content-Type', 'application/zip') + ->withHeader('Content-Disposition', 'attachment; filename="' . $name . '.zip"') + ->write($zipContents); + } + + /** + * @param \ZipArchive $zip + * @param Server $server + */ + public function fillZipWithCaAndConfig($zip, $server) + { + $config = $this->getConfigForServerFingerprint($server); + $zip->addFromString('server.conf', $config); + $zip->addFromString('ca.crt', file_get_contents($this->getCore()->getBaseDir() . '/storage/ca/ca.crt')); + } + + /** + * @param Server $server + * @return string + */ + public function getConfigForServerFingerprint($server) + { + /** @var \Twig_Environment $twig */ + $twig = $this->get('twig'); + + $config = $twig->render('etc/openvpn-client.conf.twig', [ + 'server' => $server + ]); + + return $config; + } + + /** + * @param \ZipArchive $zip + * @param Certificate $cert + */ + public function addClientCertificateData($zip, $cert) + { + $zip->addFromString('client.crt', $cert->getCertificate()); + + if ($cert->hasPrivateKey()) { + $zip->addFromString('client.key', $cert->getPrivateKey()); + } + } +} \ No newline at end of file diff --git a/src/Handler/Panel/ConfigBuilder/Show.php b/src/Handler/Panel/ConfigBuilder/Show.php new file mode 100644 index 0000000..b2b82e7 --- /dev/null +++ b/src/Handler/Panel/ConfigBuilder/Show.php @@ -0,0 +1,23 @@ +filterByStatus('signed')->find(); + + return $this->render( + 'panel/config_builder.html.twig', + [ + 'servers' => $servers + ] + ); + } +} \ No newline at end of file diff --git a/src/Handler/Panel/Servers/Show.php b/src/Handler/Panel/Servers/Show.php new file mode 100644 index 0000000..8867c16 --- /dev/null +++ b/src/Handler/Panel/Servers/Show.php @@ -0,0 +1,34 @@ +findOneByFingerprint($this->attr('fingerprint')); + + if ($server === null) { + return $this->getResponse()->withStatus(404); + } + + return $this->render( + "panel/servers/show.html.twig", + [ + 'server' => $server + ] + ); + } +} \ No newline at end of file diff --git a/views/panel/config_builder.html.twig b/views/panel/config_builder.html.twig new file mode 100644 index 0000000..72fe298 --- /dev/null +++ b/views/panel/config_builder.html.twig @@ -0,0 +1,26 @@ +{% extends "panel.html.twig" %} + +{% block panel_contents %} +

Config builder

+
+
+ + +
+
+ + +
+
+ +
+
+{% endblock %} diff --git a/views/panel/servers.html.twig b/views/panel/servers.html.twig index f01e2ba..878333f 100644 --- a/views/panel/servers.html.twig +++ b/views/panel/servers.html.twig @@ -16,10 +16,14 @@ {% for server in servers %}
  • - {{ server.getName() }} + {{ server.getFQDN() }}
    - Details + download config + details + {% if user.isSuperUser() %} + edit + {% endif %}
    • {% else %} @@ -44,7 +48,7 @@ - edit + edit diff --git a/views/panel/servers/edit.html.twig b/views/panel/servers/edit.html.twig index 2ffdfc4..3b77228 100644 --- a/views/panel/servers/edit.html.twig +++ b/views/panel/servers/edit.html.twig @@ -47,8 +47,8 @@
    - - + +
    diff --git a/views/panel/servers/show.html.twig b/views/panel/servers/show.html.twig index e69de29..975ae45 100644 --- a/views/panel/servers/show.html.twig +++ b/views/panel/servers/show.html.twig @@ -0,0 +1,49 @@ +{% extends "panel.html.twig" %} + +{% block panel_contents %} +

    Server '{{ server.getFqdn() }}'

    +
    +
    + + +
    +
    + + +
    +

    Details

    +
    + + +
    +
    + + +
    +

    Config

    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +{% endblock %} \ No newline at end of file