@@ -469,7 +469,9 @@ sub update_authorized_keys_file {

     # Create authorized_keys_file

     unless (-f $authorized_keys_file) {

       open my $fh, '>', $authorized_keys_file

-        or croak "Can't create $authorized_keys_file";

+        or croak "Can't create authorized_keys file: $authorized_keys_file";

+      chmod 0600, $authorized_keys_file

+        or croak "Can't chmod authorized_keys file: $authorized_keys_file";

     }

     # Parse file

@@ -500,7 +502,7 @@ sub update_authorized_keys_file {

     }

     # Output tmp file

-    my $output = "$before_part\n\n$start_symbol\n\n$ssh_public_keys_str$end_symbol\n\n$after_part";

+    my $output = "$before_part$start_symbol\n\n$ssh_public_keys_str$end_symbol$after_part";

     my $output_file = "$authorized_keys_file.gitprep.tmp";

     open my $out_fh, '>', $output_file

       or croak "Can't create authorized_keys tmp file $output_file";

@@ -555,7 +557,7 @@ sub _parse_authorized_keys_file {

         croak qq/$error_prefix "$end_symbol" is found more than one/;

       }

       else {

-        $end_symbol++;

+        $end_symbol_count++;

       }

     }

     elsif ($start_symbol_count == 0 && $end_symbol_count == 0) {

@@ -47,7 +47,8 @@ $ssh_original_command_tmp =~ s/[\n\r]+/<<newline>>/g;

 die "I don't like newlines in the command: $ssh_original_command\n"

   if $ssh_original_command ne $ssh_original_command_tmp;

-my ($verb, $project) = parse_ssh_original_command($ssh_original_command);

+my ($verb, $user_url, $project) = parse_ssh_original_command($ssh_original_command);

+die "User don't match" if $user ne $user_url;

 sanity($project);

 my $rep_home = $git->rep_home;

@@ -66,10 +67,10 @@ sub parse_ssh_original_command {

   $ssh_original_command ||= '';

   my $git_commands = "git-upload-pack|git-receive-pack|git-upload-archive";

-  if ($ssh_original_command =~ m(^($git_commands) '/?(.*?)(?:\.git)?'$)) {

-    my ($verb, $project) = ($1, $2);

+  if ($ssh_original_command =~ m(^($git_commands) '/([a-zA-Z_]+)/?(.*?)(?:\.git)?'$)) {

+    my ($verb, $user, $project) = ($1, $2, $3);

     die "invalid repo name: '$project'" if $project !~ $project_re;

-    return ($verb, $project);

+    return ($verb, $user, $project);

   }

   else {

     die "Invalid command: $ssh_original_command";

@@ -51,8 +51,11 @@

   my $ssh_port = config->{basic}{ssh_port};

   my $rep_home = app->git->rep_home;

   my $execute_user = getpwuid($>);

-  my $ssh_rep_url = "ssh://$execute_user\@" . $url->host

+  my $ssh_rep_url_deprected = "ssh://$execute_user\@" . $url->host

     . ($ssh_port ? ":$ssh_port" : '') . "$rep_home/$user/$project.git";

+  my $ssh_rep_url = "ssh://$execute_user\@" . $url->host

+    . ($ssh_port ? ":$ssh_port" : '') . "/$user/$project.git";

+

 %>

 % layout 'common', title => "$user/$project";

@@ -66,8 +69,9 @@

       % my $ssh_port = config->{basic}{ssh_port} || '';

       var logined = <%= $logined ? 'true' : 'false' %>;

-      var ssh_rep_url = '';

+      var ssh_rep_url_deprecated = '';

       if (logined) {

+        ssh_rep_url_deprecated = '<%= $ssh_rep_url_deprected %>';

         ssh_rep_url = '<%= $ssh_rep_url %>';

       }

@@ -76,12 +80,18 @@

         $('#rep_url').val(http_rep_url);

         $('#access').text('Read-write');

       });

-      

+

       // Click SSH button

       $('#btn_ssh').on('click', function () {

         $('#rep_url').val(ssh_rep_url);

         $('#access').text('Read-write');

       });

+            

+      // Click SSH(old) button

+      $('#btn_ssh_deprecated').on('click', function () {

+        $('#rep_url').val(ssh_rep_url_deprecated);

+        $('#access').text('Read-write');

+      });

       // Initialize

       $('#btn_http').trigger('click');

@@ -119,6 +129,7 @@

             <button class="btn" id="btn_http" style="margin-left:5px;padding:3px 6px;border-top-right-radius:0px; border-bottom-right-radius:0px"><%= $self->req->is_secure ? 'HTTPS' : 'HTTP' %></button>

             % if ($logined) {

               <button class="btn" id="btn_ssh" style="padding:3px 7px;border-radius:0">SSH</button>

+              <button class="btn" id="btn_ssh_deprecated" style="padding:3px 7px;border-radius:0">SSH(old)</button>

             % }

           </div>

           <input id="rep_url" type="text" style="width:635px;border-radius:0;padding:3px 7px;border-top-right-radius:3px;border-bottom-right-radius:3px">

@@ -158,7 +169,7 @@ touch README

 git init

 git add README

 git commit -m "first commit"

-git remote add origin <%= $ssh_rep_url %>

+git remote add origin <%= $ssh_rep_url_deprected %>

 git push -u origin master</pre>

       <div class="text-center" style="margin-bottom:10px">

@@ -166,12 +177,35 @@ git push -u origin master</pre>

       </div>

       <pre style="margin-bottom:30px">

-git remote add origin <%= $ssh_rep_url %>

+git remote add origin <%= $ssh_rep_url_deprected %>

 git push -u origin master</pre>

       <hr>

-      % my $http_rep_url = url_for("$user/$project.git")->to_abs;

+      <h4>SSH(deprecated)</h4>

+      

+      <div class="text-center" style="margin-bottom:10px">

+        <b>Create a new repository on the command line via ssh</b>

+      </div>

+      

+      <pre style="margin-bottom:30px">

+touch README

+git init

+git add README

+git commit -m "first commit"

+git remote add origin <%= $ssh_rep_url_deprected %>

+git push -u origin master</pre>

+      

+      <div class="text-center" style="margin-bottom:10px">

+        <b>Push an existing repository from the command line via ssh</b>

+      </div>

+      

+      <pre style="margin-bottom:30px">

+git remote add origin <%= $ssh_rep_url_deprected %>

+git push -u origin master</pre>

+

+      <hr>

+      % my $http_rep_url = url_for("$user/$project.git")->to_abs;

       <h4><%= uc url_for->to_abs->scheme %></h4>

       <div class="text-center" style="margin-bottom:10px">