Merge branch 'develop'

archey347 · Jun 20, 2018 · 471f257 · 471f257
2 parents 8b00128 + 58b5569
commit 471f257
Show file tree

Hide file tree

Showing 6 changed files with 342 additions and 98 deletions.
diff --git a/routes/admin.php b/routes/admin.php
@@ -4,7 +4,7 @@
   $app->get('', 'UserFrosting\Sprinkle\Dnsadmin\Controller\AdminController:pageZonesAdmin');
   $app->get('/zones/z/{id}', 'UserFrosting\Sprinkle\Dnsadmin\Controller\AdminController:pageZoneEntriesAdmin');
 
-});
+})->add('authGuard');
 
 $app->group('/modals/dnsadmin', function () use ($app) {
   $app->get('/create-zone', 'UserFrosting\Sprinkle\Dnsadmin\Controller\AdminController:modalCreateZone');
@@ -19,4 +19,4 @@
 
 
 
-});
+})->add('authGuard');
diff --git a/routes/api.php b/routes/api.php
@@ -17,4 +17,4 @@
 
 
 
-});
+})->add('authGuard');
diff --git a/src/Controller/AdminController.php b/src/Controller/AdminController.php
@@ -14,7 +14,8 @@
 use UserFrosting\Fortress\Adapter\JqueryValidationAdapter;
 use UserFrosting\Sprinkle\Dnsadmin\Database\Models\Zone;
 use UserFrosting\Sprinkle\Dnsadmin\Database\Models\ZoneEntry;
-
+use Badcow\DNS\Rdata\RdataException;
+use UserFrosting\Support\Exception\ForbiddenException;
 
 /**
   * Controller class that manages all of the DNS Admin front end UI
@@ -34,6 +35,16 @@ class AdminController extends SimpleController
     */
   public function pageZonesAdmin(Request $request, Response $response, $args)
   {
+    /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */
+    $authorizer = $this->ci->authorizer;
+
+    /** @var UserFrosting\Sprinkle\Account\Model\User $currentUser */
+    $currentUser = $this->ci->currentUser;
+
+    if (!$authorizer->checkAccess($currentUser, 'uri_dnsadmin')) {
+      throw new ForbiddenException();
+    }
+
     // Get the zone create validation rules
     $schema_create = new RequestSchema('schema://requests/zone-create.yaml');
     $validator_create = new JqueryValidationAdapter($schema_create, $this->ci->translator);
@@ -62,6 +73,16 @@ public function pageZonesAdmin(Request $request, Response $response, $args)
     */
   public function pageZoneEntriesAdmin(Request $request, Response $response, $args)
   {
+    /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */
+    $authorizer = $this->ci->authorizer;
+
+    /** @var UserFrosting\Sprinkle\Account\Model\User $currentUser */
+    $currentUser = $this->ci->currentUser;
+
+    if (!$authorizer->checkAccess($currentUser, 'uri_dnsadmin')) {
+      throw new ForbiddenException();
+    }
+
     $zone = Zone::find($args['id']);
 
     if(!$zone) {
@@ -98,6 +119,16 @@ public function pageZoneEntriesAdmin(Request $request, Response $response, $args
     */
   public function modalCreateZone(Request $request, Response $response, $args)
   {
+    /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */
+    $authorizer = $this->ci->authorizer;
+
+    /** @var UserFrosting\Sprinkle\Account\Model\User $currentUser */
+    $currentUser = $this->ci->currentUser;
+
+    if (!$authorizer->checkAccess($currentUser, 'uri_dnsadmin')) {
+      throw new ForbiddenException();
+    }
+
     return $this->ci->view->render($response, 'modals/zone.html.twig', [
       "form" => [
         "id" => "form-zone-create",
@@ -118,6 +149,16 @@ public function modalCreateZone(Request $request, Response $response, $args)
     */
   public function modalEditZone(Request $request, Response $response, $args)
   {
+    /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */
+    $authorizer = $this->ci->authorizer;
+
+    /** @var UserFrosting\Sprinkle\Account\Model\User $currentUser */
+    $currentUser = $this->ci->currentUser;
+
+    if (!$authorizer->checkAccess($currentUser, 'uri_dnsadmin')) {
+      throw new ForbiddenException();
+    }
+
     $ms = $this->ci->alerts;
 
     $zone_id = $request->getQueryParam('id');
@@ -155,6 +196,16 @@ public function modalEditZone(Request $request, Response $response, $args)
     */
   public function modalDeleteZone(Request $request, Response $response, $args)
   {
+    /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */
+    $authorizer = $this->ci->authorizer;
+
+    /** @var UserFrosting\Sprinkle\Account\Model\User $currentUser */
+    $currentUser = $this->ci->currentUser;
+
+    if (!$authorizer->checkAccess($currentUser, 'uri_dnsadmin')) {
+      throw new ForbiddenException();
+    }
+
     $ms = $this->ci->alerts;
 
     $zone_id = $request->getQueryParam('id');
@@ -189,6 +240,16 @@ public function modalDeleteZone(Request $request, Response $response, $args)
     */
   public function modalCreateZoneEntry(Request $request, Response $response, $args)
   {
+    /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */
+    $authorizer = $this->ci->authorizer;
+
+    /** @var UserFrosting\Sprinkle\Account\Model\User $currentUser */
+    $currentUser = $this->ci->currentUser;
+
+    if (!$authorizer->checkAccess($currentUser, 'uri_dnsadmin')) {
+      throw new ForbiddenException();
+    }
+
     $ms = $this->ci->alerts;
 
     $zone_id = $request->getQueryParam('id');
@@ -223,6 +284,16 @@ public function modalCreateZoneEntry(Request $request, Response $response, $args
     */
   public function modalEditZoneEntry(Request $request, Response $response, $args)
   {
+    /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */
+    $authorizer = $this->ci->authorizer;
+
+    /** @var UserFrosting\Sprinkle\Account\Model\User $currentUser */
+    $currentUser = $this->ci->currentUser;
+
+    if (!$authorizer->checkAccess($currentUser, 'uri_dnsadmin')) {
+      throw new ForbiddenException();
+    }
+
     $ms = $this->ci->alerts;
 
     $zone_entry_id = $request->getQueryParam('id');
@@ -258,6 +329,16 @@ public function modalEditZoneEntry(Request $request, Response $response, $args)
     */
   public function modalDeleteZoneEntry(Request $request, Response $response, $args)
   {
+    /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */
+    $authorizer = $this->ci->authorizer;
+
+    /** @var UserFrosting\Sprinkle\Account\Model\User $currentUser */
+    $currentUser = $this->ci->currentUser;
+
+    if (!$authorizer->checkAccess($currentUser, 'uri_dnsadmin')) {
+      throw new ForbiddenException();
+    }
+
     $ms = $this->ci->alerts;
 
     $zone_entry_id = $request->getQueryParam('id');
@@ -307,6 +388,16 @@ public function getEntryTypes($zone_type)
     */
   public function modalExportZoneEntry(Request $request, Response $response, $args)
   {
+    /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */
+    $authorizer = $this->ci->authorizer;
+
+    /** @var UserFrosting\Sprinkle\Account\Model\User $currentUser */
+    $currentUser = $this->ci->currentUser;
+
+    if (!$authorizer->checkAccess($currentUser, 'uri_dnsadmin')) {
+      throw new ForbiddenException();
+    }
+
     $ms = $this->ci->alerts;
 
     $zone_id = $request->getQueryParam('id');
@@ -316,11 +407,14 @@ public function modalExportZoneEntry(Request $request, Response $response, $args
       $ms->addMessage('danger', 'Invalid Zone ID.');
       return $response->withStatus(400);
     }
+    try {
+      $dnsConfigGenerator = $this->ci->dnsConfigGenerator;
 
-    $dnsConfigGenerator = $this->ci->dnsConfigGenerator;
-
-    $config = $dnsConfigGenerator->getZoneConfig($zone);
-
+      $config = $dnsConfigGenerator->getZoneConfig($zone);
+    } catch (RdataException $e) {
+      $ms->addMessage('danger', 'Error Generating Zone: '. $e->getMessage());
+      return $response->withStatus(400);
+    }
     $zone = $zone->toArray();
 
     $zone['config'] = $config;