@@ -1,28 +1,13 @@

 package Gitprep::API;

 use Mojo::Base -base;

-use Carp ();

-use File::Basename ();

 use Encode qw/encode decode/;

 use Digest::MD5 'md5_hex';

-sub croak { Carp::croak(@_) }

-sub dirname { File::Basename::dirname(@_) }

-

 has 'cntl';

 sub app { shift->cntl->app }

-sub admin_user {

-  my $self = shift;

-  

-  # Admin user

-  my $admin_user = $self->app->dbi->model('user')

-    ->select('id', where => {admin => 1})->value;

-  

-  return $admin_user;

-}

-

 sub encrypt_password {

   my ($self, $password) = @_;

@@ -47,33 +32,6 @@ sub new {

   return $self;

 }

-sub exists_admin {

-  my $self = shift;

- 

-  my $row = $self->app->dbi->model('user')

-    ->select(where => {admin => 1})->one;

-

-  return $row ? 1 : 0;;

-}

-

-sub root_ns {

-  my ($self, $root) = @_;

-

-  $root =~ s/^\///;

-  

-  return $root;

-}

-

-sub is_admin {

-  my ($self, $user) = @_;

-  

-  # Check admin

-  my $is_admin = $self->app->dbi->model('user')

-    ->select('admin', id => $user)->value;

-  

-  return $is_admin;

-}

-

 sub logined_admin {

   my $self = shift;

@@ -83,7 +41,7 @@ sub logined_admin {

   # Check logined as admin

   my $user = $c->session('user');

-  return $self->is_admin($user) && $self->logined;

+  return $self->app->manager->is_admin($user) && $self->logined($user);

 }

 sub logined {

@@ -113,18 +71,6 @@ sub logined {

   return $logined;

 }

-sub users {

-  my $self = shift;

- 

-  my $users = $self->app->dbi->model('user')->select(

-    'id',

-    where => [':admin{<>}',{admin => 1}],

-    append => 'order by id'

-  )->all;

-  

-  return $users;

-}

-

 sub params {

   my $self = shift;

@@ -135,15 +81,5 @@ sub params {

   return \%params;

 }

-sub default_branch {

-  my ($self, $user, $project) = @_;

-  

-  my $default_branch = $self->app->dbi->model('project')

-    ->select('default_branch', id => [$user, $project])

-    ->value;

-  

-  return $default_branch;

-}

-

 1;

@@ -753,14 +753,6 @@ sub references {

   return \%refs;

 }

-sub root_ns {

-  my ($self, $root) = @_;

-

-  $root =~ s/^\///;

-  

-  return $root;

-}

-

 sub path_by_id {

   my ($self, $user, $project, $base, $hash) = @_;

@@ -1133,6 +1125,7 @@ sub get_commit {

   # Parse commit

   local $/ = "\0";

   my $content = $self->_dec(scalar <$fh>);

+  return unless defined $content;

   my $commit = $self->parse_commit_text($content, 1);

   close $fh;

@@ -9,6 +9,25 @@ use Encode 'encode';

 has 'app';

+sub admin_user {

+  my $self = shift;

+  

+  # Admin user

+  my $admin_user = $self->app->dbi->model('user')

+    ->select('id', where => {admin => 1})->value;

+  

+  return $admin_user;

+}

+

+sub exists_admin {

+  my $self = shift;

+ 

+  my $row = $self->app->dbi->model('user')

+    ->select(where => {admin => 1})->one;

+

+  return $row ? 1 : 0;;

+}

+

 sub default_branch {

   my ($self, $user, $project) = @_;

@@ -19,6 +38,16 @@ sub default_branch {

   return $default_branch;

 }

+sub is_admin {

+  my ($self, $user) = @_;

+  

+  # Check admin

+  my $is_admin = $self->app->dbi->model('user')

+    ->select('admin', id => $user)->value;

+  

+  return $is_admin;

+}

+

 sub members {

   my ($self, $user, $project) = @_;

@@ -151,6 +180,18 @@ sub original_user {

   return $original_user;

 }

+sub users {

+  my $self = shift;

+ 

+  my $users = $self->app->dbi->model('user')->select(

+    'id',

+    where => [':admin{<>}',{admin => 1}],

+    append => 'order by id'

+  )->all;

+  

+  return $users;

+}

+

 sub _delete_db_user {

   my ($self, $user) = @_;

@@ -27,8 +27,11 @@

   # Object type

   my $type = $git->object_type($user, $project, "$rev^{}");

-  if (!$type) { $api->croak('Object does not exist') }

-  elsif ($type eq 'blob') { $api->croak('Object is not a tree-ish') }

+  if (!$type || $type eq 'blob') {

+    $self->render_not_found;

+    $self->finish_rendering;

+    return;

+  }

   my $name = "$project-$rev";

   my $file = "$name.$ext";

@@ -52,8 +55,13 @@

   }

   $file =~ s/(["\\])/\\$1/g;

-  open my $fh, '-|', $cmd

-    or $api->croak('Execute git-archive failed');

+  my $success = open my $fh, '-|', $cmd;

+  

+  unless ($success) {

+    $self->render_exeption;

+    $self->finish_rendering;

+    return;

+  }

   # Write chunk

   $self->res->headers->content_type($content_type);

@@ -1,6 +1,5 @@

 <%

-  my $api = gitprep_api;

-  my $users = $api->users;

+  my $users = app->manager->users;

 %>

 % layout 'common';

@@ -12,7 +12,7 @@

     sleep 3;

     # Check existence admin user

-    my $admin_user = app->dbi->model('user')->select(id => 'admin')->one;

+    my $admin_user = app->manager->admin_user;

     if (defined $admin_user) { $errors = ['admin user already exists'] }

     else {

       # Validation

@@ -1,8 +1,8 @@

 <%

   my $api = gitprep_api;

-  my $users = $api->users;

+  my $users = app->manager->users;

-  unless ($api->exists_admin) {

+  unless (app->manager->exists_admin) {

     $self->redirect_to('/_start');

     return 1;

   }

@@ -15,7 +15,7 @@

   # Reset password

   my $reset_password_conf_on;

-  my $admin_user = $api->admin_user;

+  my $admin_user = app->manager->admin_user;

   # Reset password config

   if (app->config->{admin}{reset_password}) {

     $user = $admin_user;

@@ -44,9 +44,6 @@

     # Sleep to protect password atack

     sleep 3;

-    # Check existence admin user

-    my $admin_user = app->dbi->model('user')->select(id => $user)->one;

-    

     # Reset password

     if ($admin_user) {

       # Validation

@@ -12,8 +12,12 @@

   my $git = app->git;

   # Commit

-  my $commit = $git->get_commit($user, $project, $id)

-    or $api->croak('Unknown commit object');

+  my $commit = $git->get_commit($user, $project, $id);

+  unless ($commit) {

+    $self->render_not_found;

+    $self->finish_rendering;

+    return;

+  }

   my $author_date

     = $git->parse_date($commit->{author_epoch}, $commit->{author_tz});

   my $committer_date

@@ -29,8 +29,13 @@

   my $start_commit = $git->separated_commit($user, $project, $rev1, $rev2);

   # End commit

-  my $end_commit = $git->get_commit($user, $project, $rev2)

-    or $api->croak('Unknown commit revision');

+  my $end_commit = $git->get_commit($user, $project, $rev2);

+  

+  if (!$start_commit || !$end_commit) {

+    $self->render_not_found;

+    $self->finish_rendering;

+    return;

+  }

   # Diff tree

   my $difftrees = $git->difftree(

@@ -8,7 +8,11 @@

   my $op = param('op') || '';

-  $api->croak("Fobbiden") if !$user_is_valid;

+  unless ($user_is_valid) {

+    $self->render_exception('Forbidden');

+    $self->res->code(403);

+    return;

+  }

   if ($op eq 'rename-project') {