grahamc/hydra2 - Change XJRJ4J7M6BC433TBLWHHKX7UYYCFX6M7ZQLUEYYTREPCSM6M3RDQC

Add user registration

Created by Eelco Dolstra on February 27, 2013

XJRJ4J7M6BC433TBLWHHKX7UYYCFX6M7ZQLUEYYTREPCSM6M3RDQC

Dependencies

In channels

main

Change contents

Insertion in deps.nix at line 8 [8.1]
[7.150]
[7.150]
```
  perlPackages.CatalystPluginCaptcha
```
Insertion in src/lib/Hydra/Controller/Admin.pm at line 90 [11.1]
[9.132]
[10.102]

Replacement in src/lib/Hydra/Controller/Root.pm at line 23 [14.804]

∅:D[12.80] → [13.0:51]

∅:D[15.100] → [13.0:51]

B:BD[16.84] → [13.0:51]

    $c->stash->{tracker} = $ENV{"HYDRA_TRACKER"} ;

[12.80]

[13.51]

    $c->stash->{tracker} = $ENV{"HYDRA_TRACKER"};
    $c->stash->{flashMsg} = $c->flash->{flashMsg};
    $c->stash->{successMsg} = $c->flash->{successMsg};

Deletion in src/lib/Hydra/Controller/Root.pm at line 39 [14.804]

∅:D[17.91] → [18.52:54]

∅:D[19.399] → [18.52:54]

∅:D[11.2335] → [18.52:54]

B:BD[20.604] → [18.52:54]

B:BD[18.54] → [21.430:431]

∅:D[21.431] → [18.54:55]

B:BD[18.54] → [18.54:55]

B:BD[18.55] → [21.432:476]

B:BD[21.476] → [22.491:492]

∅:D[22.492] → [21.481:597]

B:BD[21.481] → [21.481:597]

∅:D[21.597] → [18.55:56]

B:BD[18.55] → [18.55:56]

B:BD[18.56] → [4.0:79]

∅:D[4.79] → [23.80:232]

B:BD[23.80] → [23.80:232]

∅:D[23.232] → [24.209:216]

B:BD[24.209] → [24.209:216]

∅:D[24.216] → [21.598:712]

B:BD[18.56] → [21.598:712]

B:BD[21.712] → [23.233:353]

∅:D[24.262] → [21.920:940]

∅:D[23.353] → [21.920:940]

B:BD[21.920] → [21.920:940]

B:BD[21.940] → [25.73:83]

∅:D[25.83] → [21.955:1022]

B:BD[21.955] → [21.955:1022]

B:BD[21.1022] → [4.80:112]

∅:D[4.112] → [22.493:494]

B:BD[21.1022] → [22.493:494]

∅:D[22.494] → [21.1027:1132]

B:BD[21.1027] → [21.1027:1132]

B:BD[21.1132] → [23.354:424]

}
sub login :Local {
    my ($self, $c) = @_;
    my $username = $c->request->params->{username} || "";
    my $password = $c->request->params->{password} || "";
    if ($username eq "" && $password eq "" && !defined $c->flash->{referer}) {
        my $baseurl = $c->uri_for('/');
        my $refurl = $c->request->referer;
        $c->flash->{referer} = $refurl if $refurl =~ m/^($baseurl)/;
    }
    if ($username && $password) {
        if ($c->authenticate({username => $username, password => $password})) {
            $c->response->redirect($c->flash->{referer} || $c->uri_for('/'));
            $c->flash->{referer} = undef;
            return;
        }
        $c->stash->{errorMsg} = "Bad username or password.";
    }
    $c->keep_flash("referer");
    $c->stash->{template} = 'login.tt';
}
sub logout :Local {
    my ($self, $c) = @_;
    $c->logout;
    $c->response->redirect($c->request->referer || $c->uri_for('/'));

Replacement in src/lib/Hydra/Controller/Root.pm at line 47 [14.804]
∅:D[26.280] → [27.558:609]
∅:D[28.546] → [27.558:609]
∅:D[29.2822] → [27.558:609]
B:BD[18.299] → [27.558:609]
```
    $c->stash->{flashMsg} = $c->flash->{buildMsg};
```
[28.546]
[30.2120]
```
    $c->stash->{flashMsg} //= $c->flash->{buildMsg};
```

File addition: User.pm (----------)

[31.188]

package Hydra::Controller::User;
use strict;
use warnings;
use base 'Catalyst::Controller';
use Digest::SHA1 qw(sha1_hex);
use Hydra::Helper::Nix;
use Hydra::Helper::CatalystUtils;
__PACKAGE__->config->{namespace} = '';
sub login :Local {
    my ($self, $c) = @_;
    my $username = $c->request->params->{username} || "";
    my $password = $c->request->params->{password} || "";
    if ($username eq "" && $password eq "" && !defined $c->flash->{referer}) {
        my $baseurl = $c->uri_for('/');
        my $refurl = $c->request->referer;
        $c->flash->{referer} = $refurl if $refurl =~ m/^($baseurl)/;
    }
    if ($username && $password) {
        if ($c->authenticate({username => $username, password => $password})) {
            $c->response->redirect($c->flash->{referer} || $c->uri_for('/'));
            $c->flash->{referer} = undef;
            return;
        }
        $c->stash->{errorMsg} = "Bad username or password.";
    }
    $c->keep_flash("referer");
    $c->stash->{template} = 'login.tt';
}
sub logout :Local {
    my ($self, $c) = @_;
    $c->logout;
    $c->response->redirect($c->request->referer || $c->uri_for('/'));
}
sub captcha :Local Args(0) {
    my ($self, $c) = @_;
    $c->create_captcha();
}
sub register :Local Args(0) {
    my ($self, $c) = @_;
    $c->stash->{template} = 'user.tt';
    $c->stash->{create} = 1;
    return if $c->request->method ne "POST";
    my $userName = trim $c->req->params->{username};
    my $fullName = trim $c->req->params->{fullname};
    my $password = trim $c->req->params->{password};
    $c->stash->{username} = $userName;
    $c->stash->{fullname} = $fullName;
    sub fail {
        my ($c, $msg) = @_;
        $c->stash->{errorMsg} = $msg;
    }
    return fail($c, "You did not enter the correct digits from the security image.")
        unless $c->validate_captcha($c->req->param('captcha'));
    return fail($c, "Your user name is invalid. It must start with a lower-case letter followed by lower-case letters, digits, dots or underscores.")
        if $userName !~ /^$userNameRE$/;
    return fail($c, "Your user name is already taken.")
        if $c->find_user({ username => $userName });
    return fail($c, "Your must specify your full name.") if $fullName eq "";
    return fail($c, "You must specify a password of at least 6 characters.")
        if length($password) < 6;
    return fail($c, "The passwords you specified did not match.")
        if $password ne trim $c->req->params->{password2};
    txn_do($c->model('DB')->schema, sub {
        my $user = $c->model('DB::Users')->create(
            { username => $userName
            , fullname => $fullName
            , password => sha1_hex($password)
            , emailaddress => "",
            });
    });
    $c->authenticate({username => $userName, password => $password})
        or error($c, "Unable to authenticate the new user!");
    $c->flash->{successMsg} = "User <tt>$userName</tt> has been created.";
    $c->response->redirect($c->flash->{referer} || $c->uri_for('/'));
}
sub preferences :Local Args(0) {
    my ($self, $c) = @_;
    error($c, "Not implemented.");
}
1;

Replacement in src/lib/Hydra/Helper/CatalystUtils.pm at line 18 [33.3469]

∅:D[6.1657] → [32.1467:1555]

B:BD[34.187] → [32.1467:1555]

    $pathCompRE $relPathRE $relNameRE $projectNameRE $jobsetNameRE $jobNameRE $systemRE

[6.1657]

[28.547]

    $pathCompRE $relPathRE $relNameRE $projectNameRE $jobsetNameRE $jobNameRE $systemRE $userNameRE

Insertion in src/lib/Hydra/Helper/CatalystUtils.pm at line 174 [33.3469]
[32.2077]
[6.1658]
```
Readonly our $userNameRE    => "(?:[a-z][a-z0-9_\.]*)";
```

Replacement in src/lib/Hydra.pm at line 16 [14.6954]

B:BD[21.4331] → [3.1445:1473]

                AccessLog/,

[21.4331]

[3.1473]

                AccessLog
                Captcha/,

Insertion in src/lib/Hydra.pm at line 60 [14.6954]

[2.150]

[35.1042]

    'Plugin::Captcha' => {
        session_name => 'hydra-captcha',
        new => {
            width => 270,
            height => 80,
            ptsize => 20,
            lines => 30,
            thickness => 1,
            rndmax => 5,
            scramble => 1,
            #send_ctobg => 1,
            bgcolor => '#ffffff',
            font => '/home/eelco/Dev/hydra/ttf/StayPuft.ttf',
        },
        create => [ qw/ttf circle/ ],
        particle => [ 3500 ],
        out => { force => 'jpeg' }
    },

Insertion in src/root/layout.tt at line 122 [14.11219]

[36.3143]

[37.114]

      [% IF successMsg %]
        <br />
        <p class="btn-success btn-large">[% successMsg %]</p>
      [% END %]

Insertion in src/root/login.tt at line 11 [25.4453]

[9.9805]

<p>Don't have an account yet? Please <a href="[%
c.uri_for('/register') %]">register</a> first.</p>
<br/>

Insertion in src/root/topbar.tt at line 205 [38.6671]

[5.3012]

      [% INCLUDE makeLink uri = c.uri_for(c.controller('Root').action_for('preferences')) title = "Preferences" %]

Replacement in src/root/user.tt at line 1 [39.4561]

B:BD[39.4561] → [36.5554:5630]

[% WRAPPER layout.tt title=(create ? "New user" : "User $user.username") %]

[39.4561]

[39.4648]

[% WRAPPER layout.tt title=(create ? "Register new user" : "User $user.username") %]

Replacement in src/root/user.tt at line 5 [39.4561]

B:BD[39.4696] → [39.4696:4901]

B:BD[39.4901] → [40.37531:37553]

∅:D[40.37553] → [39.4924:5033]

B:BD[39.4924] → [39.4924:5033]

            <option value="[% role %]"
            [% checked = false %]
            [% FOREACH r IN user.userroles %]
                [% checked = r.role == role %]
                [% BREAK IF checked %]
            [% END %]
            [% IF checked %]
                SELECTED
            [% END %]
            >[% role %]</option>

[39.4696]

[39.5033]

  <option value="[% role %]"
    [% checked = false %]
    [% FOREACH r IN user.userroles %]
      [% checked = r.role == role %]
      [% BREAK IF checked %]
    [% END %]
    [% IF checked %]
      SELECTED
    [% END %]
    >[% role %]</option>

Replacement in src/root/user.tt at line 17 [39.4561]

B:BD[39.5207] → [9.17325:17511]

<form class="form-horizontal" action="[% IF create %][% c.uri_for('/admin/create-user/submit') %][% ELSE %][% c.uri_for('/admin/user' user.username 'submit') %][% END %]" method="post">

[39.5207]

[40.37554]

<form class="form-horizontal" method="post">
  <fieldset>

Replacement in src/root/user.tt at line 21 [39.4561]

∅:D[40.37555] → [9.17514:17525]

B:BD[9.17514] → [9.17514:17525]

∅:D[9.17525] → [39.5298:5316]

B:BD[39.5298] → [39.5298:5316]

B:BD[39.5316] → [9.17526:17707]

<fieldset>
  [% IF create %]
  <div class="control-group">
    <label class="control-label">User name</label>
    <div class="controls">
      <input type="text" class="span3" name="username" value=""></input>

[40.37555]

[9.17707]

    [% IF create %]
    <div class="control-group">
      <label class="control-label">User name</label>
      <div class="controls">
        <input type="text" class="span3" name="username" [% HTML.attributes(value => username) %]></input>
      </div>

Replacement in src/root/user.tt at line 28 [39.4561]

B:BD[9.17718] → [9.17718:17727]

∅:D[9.17727] → [39.5434:5446]

B:BD[39.5434] → [39.5434:5446]

B:BD[39.5446] → [9.17728:17946]

  </div>
  [% END %]
  <div class="control-group">
    <label class="control-label">Full name</label>
    <div class="controls">
      <input type="text" class="span3" name="fullname" [% HTML.attributes(value => user.fullname) %]></input>

[9.17718]

[9.17946]

    [% END %]
    <div class="control-group">
      <label class="control-label">Full name</label>
      <div class="controls">
        <input type="text" class="span3" name="fullname" [% HTML.attributes(value => fullname) %]></input>
      </div>
    </div>
    <div class="control-group">
      <label class="control-label">Password</label>
      <div class="controls">
        <input type="password" class="span3" name="password" value=""></input>
      </div>

Replacement in src/root/user.tt at line 43 [39.4561]

B:BD[9.17957] → [9.17957:18188]

  </div>
  <div class="control-group">
    <label class="control-label">Email</label>
    <div class="controls">
      <input type="text" class="span3" name="emailaddress" [% HTML.attributes(value => user.emailaddress) %]></input>

[9.17957]

[9.18188]


    <div class="control-group">
      <label class="control-label">Confirm password</label>
      <div class="controls">
        <input type="password" class="span3" name="password2" value=""></input>
      </div>

Replacement in src/root/user.tt at line 50 [39.4561]

B:BD[9.18199] → [9.18199:18722]

  </div>
  <div class="control-group">
    <label class="control-label">Evaluation error notifications</label>
    [% INCLUDE renderSelection param="emailonerror" curValue=user.emailonerror radiobuttons=1 options={"1" = "Yes", "0" = "No"} %]
  </div>
  <div class="control-group">
    <label class="control-label">Roles</label>
    <div class="controls">
      <select multiple name="roles" class="span3">
        [% INCLUDE roleoption role="admin" %]
        [% INCLUDE roleoption role="create-project" %]
      </select>

[9.18199]

[9.18722]


    <!--
    <div class="control-group">
      <label class="control-label">Email</label>
      <div class="controls">
        <input type="text" class="span3" name="emailaddress" [% HTML.attributes(value => user.emailaddress) %]></input>
      </div>

Replacement in src/root/user.tt at line 58 [39.4561]
B:BD[9.18733] → [9.18733:18742]
```
  </div>
```
[9.18733]
[39.6137]
```
    -->
```

Deletion in src/root/user.tt at line 60 [39.4561]

B:BD[39.6138] → [9.18743:18937]

  <div class="form-actions">
    <button type="submit" class="btn btn-primary">
      <i class="icon-ok icon-white"></i>
      [%IF create %]Create[% ELSE %]Apply changes[% END %]
    </button>

Replacement in src/root/user.tt at line 61 [39.4561]

B:BD[9.18958] → [9.18958:19326]

      <button id="delete-user" type="submit" class="btn btn-danger" name="submit" value="delete">
        <i class="icon-trash icon-white"></i>
        Delete this user
      </button>
      <script type="text/javascript">
        $("#delete-user").click(function() {
          return confirm("Are you sure you want to delete this user?");
        });
      </script>

[9.18958]

[9.19326]

      <div class="control-group">
        <div class="controls">
          <label class="checkbox">
            <input type="checkbox" name="enabled" [% IF 1; 'checked="checked"'; END %]></input>Receive evaluation error notifications
          </label>
        </div>
      </div>
    [% END %]
    [% IF !create && c.check_user_roles('admin') %]
      <div class="control-group">
        <label class="control-label">Roles</label>
        <div class="controls">
          <select multiple name="roles" class="span3">
            [% INCLUDE roleoption role="admin" %]
            [% INCLUDE roleoption role="create-project" %]
          </select>
        </div>
      </div>
    [% END %]
    [% IF create %]
      <div class="control-group">
        <div class="controls">
          <img src="[% c.uri_for('/captcha') %]" alt="CAPTCHA"/>
        </div>
      </div>
      <div class="control-group">
        <label class="control-label">Type the digits shown in the image above</label>
        <div class="controls">
          <input type="text" class="span3" name="captcha" value=""></input>
        </div>
      </div>

Insertion in src/root/user.tt at line 96 [39.4561]

[9.19340]


    <div class="form-actions">
      <button type="submit" class="btn btn-primary">
        <i class="icon-ok icon-white"></i>
        [%IF create %]Create[% ELSE %]Apply changes[% END %]
      </button>
      [% IF !create %]
        <button id="delete-user" type="submit" class="btn btn-danger" name="submit" value="delete">
          <i class="icon-trash icon-white"></i>
          Delete this user
        </button>
        <script type="text/javascript">
          $("#delete-user").click(function() {
            return confirm("Are you sure you want to delete this user?");
          });
        </script>
      [% END %]